This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3139

rebase: convert "oldrev" to revnum earlier
ClosedPublic

Authored by martinvonz on Apr 5 2018, 1:46 PM.

Details

Reviewers
quark
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3dfd7f018c69: rebase: convert "oldrev" to revnum earlier
Summary

It was done in 3 places before, now just 1.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 5 2018, 1:46 PM
quark accepted this revision.Apr 5 2018, 1:57 PM
quark added a subscriber: quark.

Nice catch. I guess my initial consideration was oldrev was not always a valid node. But it seems no longer a concern.

pulkit accepted this revision.Apr 5 2018, 3:07 PM
Closed by commit rHG3dfd7f018c69: rebase: convert "oldrev" to revnum earlier (authored by martinvonz). · Explain WhyApr 5 2018, 3:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)

Diff 7740

hgext/rebase.py

keepbranches = bool(int(l)) keepbranches = bool(int(l))
elif i == 6 and not (len(l) == 81 and ':' in l): elif i == 6 and not (len(l) == 81 and ':' in l):
# line 6 is a recent addition, so for backwards # line 6 is a recent addition, so for backwards
# compatibility check that the line doesn't look like the # compatibility check that the line doesn't look like the
# oldrev:newrev lines # oldrev:newrev lines
activebookmark = l activebookmark = l
else: else:
args = l.split(':') args = l.split(':')
oldrev = args[0] oldrev = repo[args[0]].rev()
newrev = args[1] newrev = args[1]
if newrev in legacystates: if newrev in legacystates:
continue continue
if len(args) > 2: if len(args) > 2:
destrev = repo[args[2]].rev() destrev = repo[args[2]].rev()
else: else:
destrev = legacydest destrev = legacydest
destmap[repo[oldrev].rev()] = destrev destmap[oldrev] = destrev
if newrev in (nullid, revtodostr): if newrev in (nullid, revtodostr):
state[repo[oldrev].rev()] = revtodo state[oldrev] = revtodo
# Legacy compat special case # Legacy compat special case
else: else:
state[repo[oldrev].rev()] = repo[newrev].rev() state[oldrev] = repo[newrev].rev()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
cmdutil.wrongtooltocontinue(repo, _('rebase')) cmdutil.wrongtooltocontinue(repo, _('rebase'))
if keepbranches is None: if keepbranches is None:
raise error.Abort(_('.hg/rebasestate is incomplete')) raise error.Abort(_('.hg/rebasestate is incomplete'))