# HG changeset patch # User Anton Shestakov # Date 1614740229 -28800 # Node ID a1dad44fe3da7c6790bfcf2bf6c71e753c074d5e # Parent 44dd0e2a28bf27e39e15b34138a4b20e19855c21 tests: remove some unnecessary config Some of these tests were originally split from a single file that had (and used) these options, and some of the tests were later created by just mindlessly copypasting the same set of options that aren't applicable to the newly written tests. Things removed by this patch: - web section from tests that don't use hg serve and don't push - phases.publish from tests that don't exchange changesets between repos - diff section from tests that don't have any diffs - defaults section that sets the date The defaults section that only adds -d '0 0' to commands should no longer be necessary because run-tests.py sets devel.default-date='0 0' since 4.3, and all command in evolve should respect this config option. diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-corrupt.t --- a/tests/test-corrupt.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-corrupt.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,17 +1,9 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * > [phases] > publish = False > [alias] > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' - > [diff] - > git = 1 - > unified = 0 > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-content-divergent-basic.t --- a/tests/test-evolve-content-divergent-basic.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-content-divergent-basic.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,14 +8,6 @@ $ cat >> $HGRCPATH < [alias] > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0 diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-content-divergent-corner-cases.t --- a/tests/test-evolve-content-divergent-corner-cases.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,14 +8,6 @@ $ cat >> $HGRCPATH < [alias] > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0 diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-order.t --- a/tests/test-evolve-order.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-order.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,17 +2,6 @@ ----------------------- $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [experimental] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-serveronly-bundle2.t --- a/tests/test-evolve-serveronly-bundle2.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-serveronly-bundle2.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ . ${TESTDIR}/testlib/pythonpath.sh $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [web] > push_ssl = false > allow_push = * diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-serveronly-legacy.t --- a/tests/test-evolve-serveronly-legacy.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-serveronly-legacy.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ . ${TESTDIR}/testlib/pythonpath.sh $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [web] > push_ssl = false > allow_push = * diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-split.t --- a/tests/test-evolve-split.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-split.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,17 +1,6 @@ Check that evolve shows error while handling split commits -------------------------------------- $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve-topic.t --- a/tests/test-evolve-topic.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-topic.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,16 +2,8 @@ Check we can find the topic extensions $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [phases] - > publish = False > [ui] > logtemplate = {rev} - \{{get(namespaces, "topics")}} {node|short} {desc} ({phase})\n - > [diff] - > git = 1 - > unified = 0 > [extensions] > rebase = > EOF diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-evolve.t --- a/tests/test-evolve.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,11 +1,4 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > metaedit=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * > [phases] > publish = False > [alias] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-fold.t --- a/tests/test-fold.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-fold.t Wed Mar 03 10:57:09 2021 +0800 @@ -3,8 +3,6 @@ setup $ cat >> $HGRCPATH < [defaults] - > fold=-d "0 0" > [extensions] > evolve= > [alias] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-obsolete-push.t --- a/tests/test-obsolete-push.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-obsolete-push.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,6 +1,4 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-oldconvert.t --- a/tests/test-oldconvert.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-oldconvert.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,11 +1,4 @@ $ cat >> $HGRCPATH < [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish=False - > [alias] - > odiff=diff --rev 'limit(obsparents(.),1)' --rev . > [extensions] > EOF $ mkcommit() { diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-split.t --- a/tests/test-split.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-split.t Wed Mar 03 10:57:09 2021 +0800 @@ -6,16 +6,6 @@ $ cat >> $HGRCPATH < [alias] > glog = log -G -T "{rev}:{node|short} {desc|firstline} ({phase})\n" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0 diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-stabilize-conflict.t Wed Mar 03 10:57:09 2021 +0800 @@ -9,8 +9,6 @@ > interactive=false > merge=internal:merge > promptecho = True - > [defaults] - > amend=-d "0 0" > [merge-tools] > touch.checkchanged=true > touch.gui=true diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-stabilize-order.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,6 +1,4 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-topic-fold.t --- a/tests/test-topic-fold.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-topic-fold.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,19 +2,6 @@ ------------------------ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > interactive = true > [extensions] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-topic-rebase.t --- a/tests/test-topic-rebase.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-topic-rebase.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,19 +2,6 @@ -------------------------- $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > interactive = true > [extensions] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-touch.t --- a/tests/test-touch.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-touch.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ cat >> $HGRCPATH < [ui] > logtemplate={rev}:{node|short} {desc}\n - > [defaults] - > amend=-d "0 0" > [alias] > glog = log -GT "{rev}: {desc}" > [extensions] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-tutorial.t --- a/tests/test-tutorial.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-tutorial.t Wed Mar 03 10:57:09 2021 +0800 @@ -13,11 +13,6 @@ > [diff] > # use "git" diff format, clearer and smarter format > git = 1 - > [alias] - > # "-d '0 0'" means that the new commit will be at January 1st 1970. - > # This is used for stable hash during test - > # (this tutorial is automatically tested.) - > amend = amend -d '0 0' > EOF $ hg init local diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-unstability-resolution-result.t --- a/tests/test-unstability-resolution-result.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-unstability-resolution-result.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,8 +8,6 @@ XXX dispatching each these test case in appropriate file would make sense. $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [extensions] > hgext.rebase= > EOF diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-unstable-orphan.t --- a/tests/test-unstable-orphan.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-unstable-orphan.t Wed Mar 03 10:57:09 2021 +0800 @@ -6,17 +6,6 @@ instability happens when a changesets has obsolete ancestors. $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-wireproto-bundle1.t --- a/tests/test-wireproto-bundle1.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-wireproto-bundle1.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,7 +1,5 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [ui] > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [phases] diff -r 44dd0e2a28bf -r a1dad44fe3da tests/test-wireproto.t --- a/tests/test-wireproto.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-wireproto.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,7 +1,5 @@ $ cat >> $HGRCPATH < [defaults] - > amend=-d "0 0" > [experimental] > obsmarkers-exchange-debug=true > bundle2-exp=true