comparison hgext/evolve.py @ 1109:212f24013455 stable

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 $@.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 03 Sep 2014 21:25:13 -0400
parents 6b0cf1b73693
children 6328e005b6c8 cc19b6400dae
comparison
equal deleted inserted replaced
1106:6b0cf1b73693 1109:212f24013455
69 from mercurial.node import nullid 69 from mercurial.node import nullid
70 from mercurial import wireproto 70 from mercurial import wireproto
71 from mercurial import localrepo 71 from mercurial import localrepo
72 from mercurial.hgweb import hgweb_mod 72 from mercurial.hgweb import hgweb_mod
73 from mercurial import bundle2 73 from mercurial import bundle2
74 from mercurial import util
75 74
76 cmdtable = {} 75 cmdtable = {}
77 command = cmdutil.command(cmdtable) 76 command = cmdutil.command(cmdtable)
78 77
79 _pack = struct.pack 78 _pack = struct.pack
506 ui.setconfig('alias', 'odiff', 505 ui.setconfig('alias', 'odiff',
507 "diff --hidden --rev 'limit(precursors(.),1)' --rev .") 506 "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
508 if ui.config('alias', 'grab', None) is None: 507 if ui.config('alias', 'grab', None) is None:
509 if os.name == 'nt': 508 if os.name == 'nt':
510 ui.setconfig('alias', 'grab', 509 ui.setconfig('alias', 'grab',
511 "! " + util.hgexecutable() + " rebase --dest . --rev && " 510 "! " + util.hgexecutable() + " rebase --dest . --rev $@ && "
512 + util.hgexecutable() + " up tip") 511 + util.hgexecutable() + " up tip")
513 else: 512 else:
514 ui.setconfig('alias', 'grab', 513 ui.setconfig('alias', 'grab',
515 "! $HG rebase --dest . --rev $@ && $HG up tip") 514 "! $HG rebase --dest . --rev $@ && $HG up tip")
516 515