Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 37376:25940470c7e6
rebase: make "destnode" consistently a revnum and rename it to "destrev"
Differential Revision: https://phab.mercurial-scm.org/D3138
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 05 Apr 2018 10:12:10 -0700 |
| parents | b48b7b130d08 |
| children | 3dfd7f018c69 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Apr 05 08:28:12 2018 -0700 +++ b/hgext/rebase.py Thu Apr 05 10:12:10 2018 -0700 @@ -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