##// END OF EJS Templates
rebase: use ctx.rev() instead of %d % ctx...
Gregory Szorc -
r36423:0b575962 default
parent child Browse files
Show More
@@ -924,7 +924,7 b' def _definedestmap(ui, repo, rbsrt, dest'
924 roots = [] # selected children of branching points
924 roots = [] # selected children of branching points
925 bpbase = {} # {branchingpoint: [origbase]}
925 bpbase = {} # {branchingpoint: [origbase]}
926 for b in base: # group bases by branching points
926 for b in base: # group bases by branching points
927 bp = repo.revs('ancestor(%d, %d)', b, dest).first()
927 bp = repo.revs('ancestor(%d, %d)', b, dest.rev()).first()
928 bpbase[bp] = bpbase.get(bp, []) + [b]
928 bpbase[bp] = bpbase.get(bp, []) + [b]
929 if None in bpbase:
929 if None in bpbase:
930 # emulate the old behavior, showing "nothing to rebase" (a better
930 # emulate the old behavior, showing "nothing to rebase" (a better
@@ -946,7 +946,7 b' def _definedestmap(ui, repo, rbsrt, dest'
946 else:
946 else:
947 ui.status(_('nothing to rebase - working directory '
947 ui.status(_('nothing to rebase - working directory '
948 'parent is also destination\n'))
948 'parent is also destination\n'))
949 elif not repo.revs('%ld - ::%d', base, dest):
949 elif not repo.revs('%ld - ::%d', base, dest.rev()):
950 if basef:
950 if basef:
951 ui.status(_('nothing to rebase - "base" %s is '
951 ui.status(_('nothing to rebase - "base" %s is '
952 'already an ancestor of destination '
952 'already an ancestor of destination '
General Comments 0
You need to be logged in to leave comments. Login now