Mercurial > evolve
changeset 570:1c45a07dda51 stable
test-obsolete: clean up useless inlined option
rebase is enabled globally and graphlog is into core
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 19 Sep 2012 14:53:24 +0200 |
| parents | 9ff2c5ad1df7 |
| children | 31efc36f3aac |
| files | tests/test-obsolete.t |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete.t Wed Sep 19 18:07:07 2012 +0200 +++ b/tests/test-obsolete.t Wed Sep 19 14:53:24 2012 +0200 @@ -7,7 +7,6 @@ > [alias] > odiff=diff --rev 'limit(precursors(.),1)' --rev . > [extensions] - > hgext.graphlog= > hgext.rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH @@ -141,7 +140,7 @@ Test obsolete keyword - $ hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ + $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ > --hidden @ 5:a7a6f2b5d8a5@default(unstable/draft) add d | @@ -458,7 +457,7 @@ check rebase compat - $ hg glog -r 'not extinct()' --template='{rev} - {node|short}\n' + $ hg log -G -r 'not extinct()' --template='{rev} - {node|short}\n' o 8 - 159dfc9fa5d3 | | o 4 - 725c380fe99b @@ -470,7 +469,7 @@ o 0 - 1f0dee641bb7 - $ hg glog --template='{rev} - {node|short}\n' --hidden + $ hg log -G --template='{rev} - {node|short}\n' --hidden x 9 - 83b5778897ad o 8 - 159dfc9fa5d3 @@ -494,12 +493,12 @@ should not rebase extinct changeset - $ hg --config extensions.hgext.rebase= rebase -s 7 -d 4 + $ hg rebase -s 7 -d 4 whole rebase set is extinct and ignored. nothing to rebase [1] - $ hg --config extensions.hgext.rebase= rebase -b 3 -d 4 --traceback - $ hg --config extensions.graphlog= glog -r 'not extinct()' --template='{rev} - {node|short}\n' + $ hg rebase -b 3 -d 4 --traceback + $ hg log -G -r 'not extinct()' --template='{rev} - {node|short}\n' @ 11 - 9468a5f5d8b2 | o 10 - 2033b4e49474 @@ -539,7 +538,7 @@ $ cd local $ hg phase --public 11 1 new latecomer changesets - $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n' + $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' @ 12 - (draft) 6db5e282cb91 add obsol_d''' | | o 11 - (public) 9468a5f5d8b2 add obsol_d'' @@ -575,7 +574,7 @@ created new head $ echo 42 >> f $ hg commit --amend --traceback --quiet - $ hg glog + $ hg log -G @ changeset: 1[35]:3734a65252e6 (re) | tag: tip | parent: 10:2033b4e49474