# HG changeset patch # User Pierre-Yves David # Date 1500864091 -7200 # Node ID 4dd84054ebbb644ddf46cb43f5cec7d7ee13a6e2 # Parent 1d16c9dcb8255cae09662c61dcf267289b020f0d test: remove reference to the graphlog extension The feature is in core for ages. diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-amend.t --- a/tests/test-amend.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-amend.t Mon Jul 24 04:41:31 2017 +0200 @@ -1,11 +1,10 @@ $ cat >> $HGRCPATH < [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ glog() { - > hg glog --template '{rev}@{branch}({phase}) {desc|firstline}\n' "$@" + > hg log -G --template '{rev}@{branch}({phase}) {desc|firstline}\n' "$@" > } $ hg init repo --traceback diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-corrupt.t --- a/tests/test-corrupt.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-corrupt.t Mon Jul 24 04:41:31 2017 +0200 @@ -13,7 +13,6 @@ > git = 1 > unified = 0 > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { @@ -30,7 +29,7 @@ $ mkcommit A $ mkcommit B $ mkcommit C - $ hg glog + $ hg log -G @ changeset: 2:829b19580856 | tag: tip | user: test @@ -67,7 +66,7 @@ $ hg up -q .^^ $ hg revert -r tip -a -q $ hg ci -m 'coin' -q - $ hg glog + $ hg log -G @ changeset: 5:8313a6afebbb | tag: tip | parent: 2:829b19580856 diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-divergent.t --- a/tests/test-divergent.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-divergent.t Mon Jul 24 04:41:31 2017 +0200 @@ -15,7 +15,6 @@ > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{troubles}]\n > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-drop.t --- a/tests/test-drop.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-drop.t Mon Jul 24 04:41:31 2017 +0200 @@ -1,7 +1,6 @@ $ cat >> $HGRCPATH < [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/drophack.py" >> $HGRCPATH diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-evolve-order.t --- a/tests/test-evolve-order.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-evolve-order.t Mon Jul 24 04:41:31 2017 +0200 @@ -16,7 +16,6 @@ > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-evolve-split.t --- a/tests/test-evolve-split.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-evolve-split.t Mon Jul 24 04:41:31 2017 +0200 @@ -15,7 +15,6 @@ > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-evolve.t --- a/tests/test-evolve.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-evolve.t Mon Jul 24 04:41:31 2017 +0200 @@ -14,7 +14,6 @@ > git = 1 > unified = 0 > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { @@ -31,7 +30,7 @@ > } $ glog() { - > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" + > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" > } $ shaof() { @@ -372,7 +371,7 @@ all solving bumped troubled - $ hg glog + $ hg log -G @ 8 feature-B: another feature that rox - test | | o 7 : another feature (child of ba0ec09b1bab) - test @@ -387,7 +386,7 @@ computing new diff committed as 6707c5e1c49d working directory is now at 6707c5e1c49d - $ hg glog + $ hg log -G @ 9 feature-B: bumped update to 99833d22b0c6: - test | o 7 : another feature (child of ba0ec09b1bab) - test @@ -446,7 +445,7 @@ atop:[14] dansk 2! merging main-file-1 working directory is now at 68557e4f0048 - $ hg glog + $ hg log -G @ 15 : dansk 3! - test | o 14 : dansk 2! - test @@ -984,7 +983,7 @@ $ hg commit -m "add new file bumped" -o 11 $ hg phase --public --hidden 11 1 new bumped changesets - $ hg glog + $ hg log -G @ 12 : add new file bumped - test | | o 11 : a2 - test @@ -1003,7 +1002,7 @@ Now we have a bumped and an unstable changeset, we solve the bumped first normally the unstable changeset would be solve first - $ hg glog + $ hg log -G @ 12 : add new file bumped - test | | o 11 : a2 - test @@ -1039,7 +1038,7 @@ $ hg up 14 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ printf "newline\nnewline\n" >> a - $ hg glog + $ hg log -G o 16 : add gh - test | | o 15 : add gg - test @@ -1056,7 +1055,7 @@ $ hg amend 2 new unstable changesets - $ hg glog + $ hg log -G @ 18 : a3 - test | | o 16 : add gh - test @@ -1089,7 +1088,7 @@ move:[16] add gh atop:[18] a3 working directory is now at e02107f98737 - $ hg glog + $ hg log -G @ 20 : add gh - test | | o 19 : add gg - test diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-metaedit.t --- a/tests/test-metaedit.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-metaedit.t Mon Jul 24 04:41:31 2017 +0200 @@ -14,7 +14,6 @@ > git = 1 > unified = 0 > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { @@ -31,7 +30,7 @@ > } $ glog() { - > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" + > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" > } $ shaof() { diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-obsolete-push.t --- a/tests/test-obsolete-push.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-obsolete-push.t Mon Jul 24 04:41:31 2017 +0200 @@ -2,13 +2,12 @@ > [defaults] > amend=-d "0 0" > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' $ glog() { - > hg glog --template "$template" "$@" + > hg log -G --template "$template" "$@" > } Test outgoing, common A is suspended, B unstable and C secret, remote diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-oldconvert.t --- a/tests/test-oldconvert.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-oldconvert.t Mon Jul 24 04:41:31 2017 +0200 @@ -7,7 +7,6 @@ > [alias] > odiff=diff --rev 'limit(obsparents(.),1)' --rev . > [extensions] - > hgext.graphlog= > EOF $ mkcommit() { > echo "$1" > "$1" @@ -34,13 +33,13 @@ $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/legacy.py" >> $HGRCPATH - $ hg glog + $ hg log -G abort: old format of obsolete marker detected! run `hg debugconvertobsolete` once. [255] $ hg debugconvertobsolete --traceback 1 obsolete marker converted - $ hg glog + $ hg log -G @ changeset: 2:d67cd0334eee | tag: tip | parent: 0:1f0dee641bb7 @@ -101,7 +100,7 @@ > } > ] > EOF - $ hg glog + $ hg log -G abort: old format of obsolete marker detected! run `hg debugconvertobsolete` once. [255] diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-prev-next.t --- a/tests/test-prev-next.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-prev-next.t Mon Jul 24 04:41:31 2017 +0200 @@ -1,6 +1,5 @@ $ cat >> $HGRCPATH < [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-split.t --- a/tests/test-split.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-split.t Mon Jul 24 04:41:31 2017 +0200 @@ -20,7 +20,6 @@ > [ui] > interactive = true > [extensions] - > hgext.graphlog= > evolve = > EOF $ mkcommit() { @@ -96,7 +95,7 @@ 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob) d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) - $ hg glog + $ hg log -G @ changeset: 7:033b3f5ae73d | tag: tip | user: test @@ -214,7 +213,7 @@ move:[11] split2 atop:[14] split1 working directory is now at d74c6715e706 - $ hg glog + $ hg log -G @ changeset: 15:d74c6715e706 | tag: tip | user: test @@ -257,7 +256,7 @@ $ hg book bookA 17:7a6b35779b85 * bookB 17:7a6b35779b85 - $ hg glog -r "14::" + $ hg log -G -r "14::" @ changeset: 17:7a6b35779b85 | bookmark: bookA | bookmark: bookB @@ -298,7 +297,7 @@ created new head Done splitting? [yN] y - $ hg glog -r "14::" + $ hg log -G -r "14::" @ changeset: 19:452a26648478 | bookmark: bookA | bookmark: bookB diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-stabilize-order.t Mon Jul 24 04:41:31 2017 +0200 @@ -2,12 +2,11 @@ > [defaults] > amend=-d "0 0" > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ glog() { - > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" + > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" > } $ hg init repo diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-stabilize-result.t Mon Jul 24 04:41:31 2017 +0200 @@ -3,12 +3,11 @@ > amend=-d "0 0" > [extensions] > hgext.rebase= - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ glog() { - > hg glog --template \ + > hg log -G --template \ > '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@" > } diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-topic-fold.t --- a/tests/test-topic-fold.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-topic-fold.t Mon Jul 24 04:41:31 2017 +0200 @@ -18,7 +18,6 @@ > [ui] > interactive = true > [extensions] - > hgext.graphlog= > EOF $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-topic-rebase.t --- a/tests/test-topic-rebase.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-topic-rebase.t Mon Jul 24 04:41:31 2017 +0200 @@ -18,7 +18,6 @@ > [ui] > interactive = true > [extensions] - > hgext.graphlog= > rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-uncommit.t --- a/tests/test-uncommit.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-uncommit.t Mon Jul 24 04:41:31 2017 +0200 @@ -1,11 +1,10 @@ $ cat >> $HGRCPATH < [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ glog() { - > hg glog --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@" + > hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@" > } $ hg init repo diff -r 1d16c9dcb825 -r 4dd84054ebbb tests/test-unstable.t --- a/tests/test-unstable.t Mon Jul 24 00:11:02 2017 +0200 +++ b/tests/test-unstable.t Mon Jul 24 04:41:31 2017 +0200 @@ -13,7 +13,6 @@ > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions] - > hgext.graphlog= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() {