Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 15801 bfd3ce759682
parent 15777 12309c09d19a
parent 15800 e4fc0f0b4f7e
child 15874 2305baff673f 
--- a/hgext/rebase.py	Sun Jan 08 15:23:26 2012 +0100
+++ b/hgext/rebase.py	Mon Jan 09 20:16:57 2012 -0600
@@ -15,7 +15,7 @@
 '''
 
 from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks
-from mercurial import extensions, patch
+from mercurial import extensions, patch, scmutil
 from mercurial.commands import templateopts
 from mercurial.node import nullrev
 from mercurial.lock import release
@@ -187,10 +187,12 @@
             if revf:
                 rebaseset = repo.revs('%lr', revf)
             elif srcf:
-                rebaseset = repo.revs('(%r)::', srcf)
+                src = scmutil.revrange(repo, [srcf])
+                rebaseset = repo.revs('(%ld)::', src)
             else:
-                base = basef or '.'
-                rebaseset = repo.revs('(children(ancestor(%r, %d)) & ::%r)::',
+                base = scmutil.revrange(repo, [basef or '.'])
+                rebaseset = repo.revs(
+                    '(children(ancestor(%ld, %d)) and ::(%ld))::',
                     base, dest, base)
 
             if rebaseset:
Mercurial