# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1378235555 14400
# Node ID 5528c31c629cbf48c2b043b44c9db3534eba349b
# Parent  472fa3b782b1d33d12738c288beac6f7a78e0514
rebase: handle bookmarks matching revset function names (issue3950)

We handled these correctly with all rev-specifying options except,
somehow, -r/--rev.

diff -r 472fa3b782b1 -r 5528c31c629c hgext/rebase.py
--- a/hgext/rebase.py	Thu Jul 25 22:28:34 2013 -0500
+++ b/hgext/rebase.py	Tue Sep 03 15:12:35 2013 -0400
@@ -186,7 +186,7 @@
                 dest = scmutil.revsingle(repo, destf)
 
             if revf:
-                rebaseset = repo.revs('%lr', revf)
+                rebaseset = scmutil.revrange(repo, revf)
             elif srcf:
                 src = scmutil.revrange(repo, [srcf])
                 rebaseset = repo.revs('(%ld)::', src)
diff -r 472fa3b782b1 -r 5528c31c629c tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t	Thu Jul 25 22:28:34 2013 -0500
+++ b/tests/test-rebase-bookmarks.t	Tue Sep 03 15:12:35 2013 -0400
@@ -159,4 +159,18 @@
   o  0: 'A' bookmarks:
   
 
-  $ cd ..
+ensure that bookmarks given the names of revset functions can be used
+as --rev arguments (issue3950)
+
+  $ hg update -q 3
+  $ echo bimble > bimble
+  $ hg add bimble
+  $ hg commit -q -m 'bisect'
+  $ echo e >> bimble
+  $ hg ci -m bisect2
+  $ echo e >> bimble
+  $ hg ci -m bisect3
+  $ hg book bisect
+  $ hg update -q Y
+  $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
+  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob)