# HG changeset patch # User Martin von Zweigbergk # Date 2018-04-05 17:12:10 # Node ID 25940470c7e64e9678ef91fc02c914850d3f7640 # Parent a973bb92ab71dbf97f90892e5e731630cd94e9c8 rebase: make "destnode" consistently a revnum and rename it to "destrev" Differential Revision: https://phab.mercurial-scm.org/D3138 diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -248,10 +248,10 @@ class rebaseruntime(object): 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