[PATCH 1 of 2 evolve-ext] evolve: really fix the 'grab' alias on Windows
Matt Harbison
matt_harbison at yahoo.com
Wed Sep 3 21:18:58 CDT 2014
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1409793913 14400
# Wed Sep 03 21:25:13 2014 -0400
# Node ID 85f4f4f6c403f61c9add2bb54ffff1988efaaa4e
# Parent 1c227ecb744d3252b0ac173e171a44e701deeb40
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 $@.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -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)
@@ -381,7 +380,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',
More information about the Mercurial-devel
mailing list