equal
deleted
inserted
replaced
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 |
379 ui.setconfig('alias', 'odiff', |
378 ui.setconfig('alias', 'odiff', |
380 "diff --hidden --rev 'limit(precursors(.),1)' --rev .") |
379 "diff --hidden --rev 'limit(precursors(.),1)' --rev .") |
381 if ui.config('alias', 'grab', None) is None: |
380 if ui.config('alias', 'grab', None) is None: |
382 if os.name == 'nt': |
381 if os.name == 'nt': |
383 ui.setconfig('alias', 'grab', |
382 ui.setconfig('alias', 'grab', |
384 "! " + util.hgexecutable() + " rebase --dest . --rev && " |
383 "! " + util.hgexecutable() + " rebase --dest . --rev $@ && " |
385 + util.hgexecutable() + " up tip") |
384 + util.hgexecutable() + " up tip") |
386 else: |
385 else: |
387 ui.setconfig('alias', 'grab', |
386 ui.setconfig('alias', 'grab', |
388 "! $HG rebase --dest . --rev $@ && $HG up tip") |
387 "! $HG rebase --dest . --rev $@ && $HG up tip") |
389 |
388 |