# HG changeset patch # User Matt Harbison # Date 1409793913 14400 # Node ID 212f24013455bf29e8dd97be0028c7eff73b9f30 # Parent 6b0cf1b73693e775b219f2e74bc871c20a30f52c 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) @@ -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',