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

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 7:17 p.m.
Message ID <ecab06bfc31a8b87d8a113fee3209d0f@localhost.localdomain>
Download mbox | patch
Permalink /patch/30401/
State Not Applicable
Headers show

Comments

phabricator - April 5, 2018, 7:17 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG25940470c7e6: rebase: make &quot;destnode&quot; consistently a revnum and rename it to &quot;destrev&quot; (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




To: martinvonz, #hg-reviewers, quark, pulkit
Cc: quark, mercurial-devel

Patch

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