changeset 696:121e2d265e85 stable

alias: add a grab alias Its a valid replacement for graft -O
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 08 Feb 2013 20:45:18 +0000
parents 7daf42959b72
children 9d9210ee4d06
files hgext/evolve.py tests/test-stabilize-result.t tests/test-tutorial.t
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Feb 08 20:18:40 2013 +0000
+++ b/hgext/evolve.py	Fri Feb 08 20:45:18 2013 +0000
@@ -380,6 +380,9 @@
         ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
     if ui.config('alias', 'odiff', None) is None:
         ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
+    if ui.config('alias', 'grab', None) is None:
+        ui.setconfig('alias', 'grab', "rebase --dest . --rev $1")
+
 
 ### Troubled revset symbol
 
--- a/tests/test-stabilize-result.t	Fri Feb 08 20:18:40 2013 +0000
+++ b/tests/test-stabilize-result.t	Fri Feb 08 20:45:18 2013 +0000
@@ -120,8 +120,7 @@
 
 Get a successors of 8 on it
 
-  $ hg graft -O 8
-  grafting revision 8
+  $ hg grab 8
 
 Add real change to the successors
 
--- a/tests/test-tutorial.t	Fri Feb 08 20:18:40 2013 +0000
+++ b/tests/test-tutorial.t	Fri Feb 08 20:45:18 2013 +0000
@@ -335,7 +335,7 @@
 totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of
 "bathroom stuff"
 
-You can use 'rebase -r' or 'graft -O' for that:
+You can use 'rebase -r' or 'grab' for that:
 
   $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved