This is an archive of the discontinued Mercurial Phabricator instance.

rebase: rerun a rebase on-disk if IMM merge conflicts arise
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Oct 26 2017, 12:48 AM
phillco updated this revision to Diff 4195.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4214.Dec 7 2017, 4:45 PM
durin42 accepted this revision.Dec 7 2017, 5:02 PM
This revision is now accepted and ready to land.Dec 7 2017, 5:02 PM
phillco updated this revision to Diff 4238.Dec 8 2017, 1:38 AM
phillco updated this revision to Diff 4240.Dec 8 2017, 1:54 AM
dlax requested changes to this revision.Dec 8 2017, 4:40 AM
dlax added a subscriber: dlax.
dlax added inline comments.
hgext/rebase.py
667

Do we need to make another function? Can't we call rebase again with options modified?

This revision now requires changes to proceed.Dec 8 2017, 4:40 AM
durin42 added inline comments.Dec 8 2017, 1:44 PM
hgext/rebase.py
667

Avoiding the recursion seems like a nice thing to me. I prefer what Phil has to just doing recursion...

dlax added inline comments.Dec 8 2017, 2:29 PM
hgext/rebase.py
667

Why would that be nice? Do you foresee any problem?
It just makes the code harder to follow, IMHO.

Besides, now the rebase() no longer has a docstring, meaning that help is broken.

durin42 accepted this revision.Dec 8 2017, 2:30 PM
durin42 added inline comments.
hgext/rebase.py
667

It's just a style thing. I find avoiding recursion to generally be clearer.

@phillco dlax is right, the docstring needs fixed here (I'm surprised tests passed...)

phillco added inline comments.Dec 8 2017, 2:56 PM
hgext/rebase.py
667

huh, weird. not sure how they did.

phillco updated this revision to Diff 4261.Dec 8 2017, 3:15 PM

I've moved the comment back to rebase() to fix the help issue. I'm mostly neutral on using recursion or using this approach, though I think having to pass a flag to prevent infinite recursion would be messy.

durin42 accepted this revision.Dec 8 2017, 3:19 PM
This revision was automatically updated to reflect the committed changes.