D3138: rebase: make "destnode" consistently a revnum and rename it to "destrev"
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Apr 5 15:17:44 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG25940470c7e6: rebase: make "destnode" consistently a revnum and rename it to "destrev" (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3138?vs=7739&id=7748
REVISION DETAIL
https://phab.mercurial-scm.org/D3138
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -248,10 +248,10 @@
if newrev in legacystates:
continue
if len(args) > 2:
- destnode = args[2]
+ destrev = repo[args[2]].rev()
else:
- destnode = legacydest
- destmap[repo[oldrev].rev()] = repo[destnode].rev()
+ destrev = legacydest
+ destmap[repo[oldrev].rev()] = destrev
if newrev in (nullid, revtodostr):
state[repo[oldrev].rev()] = revtodo
# Legacy compat special case
To: martinvonz, #hg-reviewers, quark, pulkit
Cc: quark, mercurial-devel
More information about the Mercurial-devel
mailing list