Mercurial > hg-stable
changeset 36435:0b57596253b8
rebase: use ctx.rev() instead of %d % ctx
Weaning away from basectx.__int__.
Differential Revision: https://phab.mercurial-scm.org/D2427
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 24 Feb 2018 11:07:07 -0800 |
| parents | 6905c4ec312c |
| children | fd2191d870ff |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Feb 24 10:53:47 2018 -0800 +++ b/hgext/rebase.py Sat Feb 24 11:07:07 2018 -0800 @@ -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 '