Mercurial > evolve
changeset 895:17ac69db9329
evolve: deprecate gup and gdown aliases
This is done in an effort to clean up the UI of evolve.
| author | Olle Lundberg <geek@nerd.sh> |
|---|---|
| date | Fri, 04 Apr 2014 00:58:15 +0200 |
| parents | 4f21a3279a60 |
| children | 484886a2712d |
| files | hgext/evolve.py tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-stabilize-result.t |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Apr 04 00:30:56 2014 +0200 +++ b/hgext/evolve.py Fri Apr 04 00:58:15 2014 +0200 @@ -905,6 +905,10 @@ cmdwrapper = command(oldalias, opts, synopsis) cmdwrapper(newfn) +@eh.extsetup +def deprecatealiases(ui): + _deprecatealias('gup', 'next') + _deprecatealias('gdown', 'previous') @command('debugrecordpruneparents', [], '') def cmddebugrecordpruneparents(ui, repo): @@ -1518,7 +1522,7 @@ shorttemplate = '[{rev}] {desc|firstline}\n' -@command('^gdown|previous', +@command('^previous', [], '') def cmdprevious(ui, repo): @@ -1541,7 +1545,7 @@ ui.warn(_('multiple parents, explicitly update to one\n')) return 1 -@command('^gup|next', +@command('^next', [], '') def cmdnext(ui, repo):
--- a/tests/test-stabilize-conflict.t Fri Apr 04 00:30:56 2014 +0200 +++ b/tests/test-stabilize-conflict.t Fri Apr 04 00:58:15 2014 +0200 @@ -59,6 +59,7 @@ ---------------------------------- $ hg gdown + gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [1] babar count up to ten $ safesed 's/huit/eight/' babar @@ -105,6 +106,7 @@ -------------------------------------------------- $ hg gdown + gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [4] babar count up to ten $ safesed 's/dix/ten/' babar @@ -189,6 +191,7 @@ $ safesed 's/merge=.*/merge=touch/' $HGRCPATH $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH $ hg gdown + gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [7] babar count up to ten $ safesed 's/ten/zehn/' babar
--- a/tests/test-stabilize-order.t Fri Apr 04 00:30:56 2014 +0200 +++ b/tests/test-stabilize-order.t Fri Apr 04 00:58:15 2014 +0200 @@ -35,12 +35,14 @@ o 0:c471ef929e6a@default(draft) addroot $ hg gdown + gdown have been deprecated in favor of previous 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [2] addb $ echo b >> b $ hg amend 1 new unstable changesets $ hg gdown + gdown have been deprecated in favor of previous 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [1] adda $ echo a >> a
--- a/tests/test-stabilize-result.t Fri Apr 04 00:30:56 2014 +0200 +++ b/tests/test-stabilize-result.t Fri Apr 04 00:58:15 2014 +0200 @@ -64,6 +64,7 @@ $ echo 'newer a' >> a $ hg ci -m 'newer a' $ hg gdown + gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [4] changea $ echo 'a' > a @@ -111,6 +112,7 @@ Add another commit $ hg gdown + gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [7] changea $ echo 'c' > c