[PATCH 2 of 2] rebase: make --dest understand revsets
Patrick Mezard
patrick at mezard.eu
Sun Apr 29 09:40:31 CDT 2012
# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1335709239 -7200
# Branch stable
# Node ID 932189927093ea84d7ee27ce7d65d263ce599e99
# Parent 50fdb29eca0f5d8d39ae7bab90fc733ffc2f2063
rebase: make --dest understand revsets
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -182,7 +182,7 @@
branch = repo[None].branch()
dest = repo[branch]
else:
- dest = repo[destf]
+ dest = scmutil.revsingle(repo, destf)
if revf:
rebaseset = repo.revs('%lr', revf)
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -158,12 +158,12 @@
$ cd ..
-Rebase with dest == `hg branch` => same as no arguments (from 3 onto 8):
+Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
$ hg clone -q -u 3 a a3
$ cd a3
- $ hg rebase --dest `hg branch`
+ $ hg rebase --dest 'branch(.)'
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
More information about the Mercurial-devel
mailing list