This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3138

rebase: make "destnode" consistently a revnum and rename it to "destrev"
ClosedPublic

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

Details

Reviewers
quark
pulkit
Group Reviewers
hg-reviewers
Commits
rHG25940470c7e6: rebase: make "destnode" consistently a revnum and rename it to "destrev"

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

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

Thanks. I was not too happy about the old code using rev as nodes. But I didn't spend much time changing them.

pulkit accepted this revision.Apr 5 2018, 3:08 PM
Closed by commit rHG25940470c7e6: rebase: make "destnode" consistently a revnum and rename it to "destrev" (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 (6 lines)

Diff 7748

hgext/rebase.py

activebookmark = l activebookmark = l
else: else:
args = l.split(':') args = l.split(':')
oldrev = args[0] oldrev = args[0]
newrev = args[1] newrev = args[1]
if newrev in legacystates: if newrev in legacystates:
continue continue
if len(args) > 2: if len(args) > 2:
destnode = args[2] destrev = repo[args[2]].rev()
else: else:
destnode = legacydest destrev = legacydest
destmap[repo[oldrev].rev()] = repo[destnode].rev() destmap[repo[oldrev].rev()] = destrev
if newrev in (nullid, revtodostr): if newrev in (nullid, revtodostr):
state[repo[oldrev].rev()] = revtodo state[repo[oldrev].rev()] = revtodo
# Legacy compat special case # Legacy compat special case
else: else:
state[repo[oldrev].rev()] = repo[newrev].rev() state[repo[oldrev].rev()] = repo[newrev].rev()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT: