facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

rebase: handle bookmarks matching revset function names (issue3950)

Browse Source 
We handled these correctly with all rev-specifying options except,
somehow, -r/--rev.
This commit is contained in:
Bryan O'Sullivan 2013-09-03 15:12:35 -04:00
parent 8e759a3be5
commit 3967183235
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/rebase.py
View File

@ -186,7 +186,7 @@ def rebase(ui, repo, **opts):
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)

16
tests/test-rebase-bookmarks.t
View File

@ -159,4 +159,18 @@ rebase --continue with bookmarks present (issue3802)
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)