This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7905

rebase: move some variables after an error cases where they're not needed
ClosedPublic

Authored by martinvonz on Jan 16 2020, 3:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1cb7ae9b0071: rebase: move some variables after an error cases where they're not needed

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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (17 lines)

Diff 19579

hgext/rebase.py

) )
# Choose a merge base that has a minimal number of unwanted revs. # Choose a merge base that has a minimal number of unwanted revs.
l, i = min( l, i = min(
(len(revs), i) (len(revs), i)
for i, revs in enumerate(unwanted) for i, revs in enumerate(unwanted)
if revs is not None if revs is not None
) )
base = bases[i]
# newps[0] should match merge base if possible. Currently, if newps[i]
# is nullrev, the only case is newps[i] and newps[j] (j < i), one is
# the other's ancestor. In that case, it's fine to not swap newps here.
# (see CASE-1 and CASE-2 above)
if i != 0 and newps[i] != nullrev:
newps[0], newps[i] = newps[i], newps[0]
# The merge will include unwanted revisions. Abort now. Revisit this if # The merge will include unwanted revisions. Abort now. Revisit this if
# we have a more advanced merge algorithm that handles multiple bases. # we have a more advanced merge algorithm that handles multiple bases.
if l > 0: if l > 0:
unwanteddesc = _(b' or ').join( unwanteddesc = _(b' or ').join(
( (
b', '.join(b'%d:%s' % (r, repo[r]) for r in revs) b', '.join(b'%d:%s' % (r, repo[r]) for r in revs)
for revs in unwanted for revs in unwanted
if revs is not None if revs is not None
) )
) )
raise error.Abort( raise error.Abort(
_(b'rebasing %d:%s will include unwanted changes from %s') _(b'rebasing %d:%s will include unwanted changes from %s')
% (rev, repo[rev], unwanteddesc) % (rev, repo[rev], unwanteddesc)
) )
base = bases[i]
# newps[0] should match merge base if possible. Currently, if newps[i]
# is nullrev, the only case is newps[i] and newps[j] (j < i), one is
# the other's ancestor. In that case, it's fine to not swap newps here.
# (see CASE-1 and CASE-2 above)
if i != 0 and newps[i] != nullrev:
newps[0], newps[i] = newps[i], newps[0]
repo.ui.debug(b" future parents are %d and %d\n" % tuple(newps)) repo.ui.debug(b" future parents are %d and %d\n" % tuple(newps))
return newps[0], newps[1], base return newps[0], newps[1], base
def isagitpatch(repo, patchname): def isagitpatch(repo, patchname):
"""Return true if the given patch is in git format""" """Return true if the given patch is in git format"""
mqpatch = os.path.join(repo.mq.path, patchname) mqpatch = os.path.join(repo.mq.path, patchname)