evolve: really fix the 'grab' alias on Windows stable
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 03 Sep 2014 21:25:13 -0400
branchstable
changeset 1109 212f24013455
parent 1106 6b0cf1b73693
child 1110 875e671c3cd8
evolve: really fix the 'grab' alias on Windows Something seems to have happened when importing cb36a4eb0157- it dropped the $@ argument to --rev, and it picked up a bunch of test changes for the obsolete sha1 replacement patch. Instead of backing it out and breaking the tests for the sha1 replacement, this just fixes the missing $@.
hgext/evolve.py
--- a/hgext/evolve.py	Sat Aug 09 19:12:16 2014 -0400
+++ b/hgext/evolve.py	Wed Sep 03 21:25:13 2014 -0400
@@ -71,7 +71,6 @@
 from mercurial import localrepo
 from mercurial.hgweb import hgweb_mod
 from mercurial import bundle2
-from mercurial import util
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
@@ -508,7 +507,7 @@
     if ui.config('alias', 'grab', None) is None:
         if os.name == 'nt':
             ui.setconfig('alias', 'grab',
-                "! " + util.hgexecutable() + " rebase --dest . --rev  && "
+                "! " + util.hgexecutable() + " rebase --dest . --rev $@ && "
                  + util.hgexecutable() + " up tip")
         else:
             ui.setconfig('alias', 'grab',