D3139: rebase: convert "oldrev" to revnum earlier
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Apr 5 15:17:51 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3dfd7f018c69: rebase: convert "oldrev" to revnum earlier (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3139?vs=7740&id=7749
REVISION DETAIL
https://phab.mercurial-scm.org/D3139
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
@@ -243,20 +243,20 @@
activebookmark = l
else:
args = l.split(':')
- oldrev = args[0]
+ oldrev = repo[args[0]].rev()
newrev = args[1]
if newrev in legacystates:
continue
if len(args) > 2:
destrev = repo[args[2]].rev()
else:
destrev = legacydest
- destmap[repo[oldrev].rev()] = destrev
+ destmap[oldrev] = destrev
if newrev in (nullid, revtodostr):
- state[repo[oldrev].rev()] = revtodo
+ state[oldrev] = revtodo
# Legacy compat special case
else:
- state[repo[oldrev].rev()] = repo[newrev].rev()
+ state[oldrev] = repo[newrev].rev()
except IOError as err:
if err.errno != errno.ENOENT:
To: martinvonz, #hg-reviewers, quark, pulkit
Cc: quark, mercurial-devel
More information about the Mercurial-devel
mailing list