Patchwork D2427: rebase: use ctx.rev() instead of %d % ctx

login
register
mail settings
Submitter phabricator
Date Feb. 25, 2018, 1:53 a.m.
Message ID <7705706401c3ad6b6b7a5f983f4b9141@localhost.localdomain>
Download mbox | patch
Permalink /patch/28346/
State Not Applicable
Headers show

Comments

phabricator - Feb. 25, 2018, 1:53 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0b57596253b8: rebase: use ctx.rev() instead of %d % ctx (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2427?vs=6059&id=6072

REVISION DETAIL
  https://phab.mercurial-scm.org/D2427

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: indygreg, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -924,7 +924,7 @@ 
         roots = [] # selected children of branching points
         bpbase = {} # {branchingpoint: [origbase]}
         for b in base: # group bases by branching points
-            bp = repo.revs('ancestor(%d, %d)', b, dest).first()
+            bp = repo.revs('ancestor(%d, %d)', b, dest.rev()).first()
             bpbase[bp] = bpbase.get(bp, []) + [b]
         if None in bpbase:
             # emulate the old behavior, showing "nothing to rebase" (a better
@@ -946,7 +946,7 @@ 
                 else:
                     ui.status(_('nothing to rebase - working directory '
                                 'parent is also destination\n'))
-            elif not repo.revs('%ld - ::%d', base, dest):
+            elif not repo.revs('%ld - ::%d', base, dest.rev()):
                 if basef:
                     ui.status(_('nothing to rebase - "base" %s is '
                                 'already an ancestor of destination '