D761: test: backout update evolution config
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Thu Sep 21 10:53:45 UTC 2017
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The concept is still call "Changeset Evolution". The "troubles" got renamed to
"instability", so the action can be renamed from "evolve troubles" to
"stabilize instability". However, the concept itself is still "Changeset
Evolution" so associated configuration should still live under "evolution".
Revert https://phab.mercurial-scm.org/rHG6c1a9fd8361bfc2a47ba017bbbf5d46cf17afa73 first then the config renaming.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D761
AFFECTED FILES
tests/test-amend.t
tests/test-bisect.t
tests/test-bookmarks-pushpull.t
tests/test-bundle2-exchange.t
tests/test-bundle2-format.t
tests/test-cache-abuse.t
tests/test-clone.t
tests/test-command-template.t
tests/test-commandserver.t
tests/test-commit-amend.t
tests/test-drawdag.t
tests/test-glog.t
tests/test-histedit-arguments.t
tests/test-histedit-obsolete.t
tests/test-lfconvert.t
tests/test-log.t
tests/test-obsmarker-template.t
tests/test-obsolete-bundle-strip.t
tests/test-obsolete-changeset-exchange.t
tests/test-obsolete-checkheads.t
tests/test-obsolete-divergent.t
tests/test-obsolete-tag-cache.t
tests/test-obsolete.t
tests/test-phases.t
tests/test-push-race.t
tests/test-rebase-conflicts.t
tests/test-rebase-dest.t
tests/test-rebase-obsolete.t
tests/test-rebase-partial.t
tests/test-rebase-scenario-global.t
tests/test-revset.t
tests/test-revset2.t
tests/test-shelve.t
tests/test-strip.t
tests/test-subrepo-missing.t
tests/test-tag.t
tests/test-update-branches.t
CHANGE DETAILS
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -473,7 +473,7 @@
> [ui]
> logtemplate={rev}:{node|short} {desc|firstline}
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
Test no-argument update to a successor of an obsoleted changeset
diff --git a/tests/test-tag.t b/tests/test-tag.t
--- a/tests/test-tag.t
+++ b/tests/test-tag.t
@@ -415,7 +415,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=createmarkers,exchange
> EOF
$ hg up e4d483960b9b --quiet
$ echo aaa >>a
diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t
--- a/tests/test-subrepo-missing.t
+++ b/tests/test-subrepo-missing.t
@@ -76,7 +76,7 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
check that we can update parent repo with missing (amended) subrepo revision
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -1064,8 +1064,8 @@
$ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF
> [experimental]
- > stabilization=all
- > stabilization.track-operation=1
+ > evolution=all
+ > evolution.track-operation=1
> EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -696,7 +696,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ hg shelve
shelved as default
diff --git a/tests/test-revset2.t b/tests/test-revset2.t
--- a/tests/test-revset2.t
+++ b/tests/test-revset2.t
@@ -1626,7 +1626,7 @@
$ cd repo1
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution = createmarkers
> EOF
$ hg debugdrawdag <<'EOS'
diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -1794,7 +1794,7 @@
$ cd wdir-hashcollision
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution = createmarkers
> EOF
$ echo 0 > a
$ hg ci -qAm 0
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -966,7 +966,7 @@
> [extensions]
> wraprebase=$TESTTMP/wraprebase.py
> [experimental]
- > stabilization=all
+ > evolution=all
> EOF
$ hg debugdrawdag <<'EOS'
diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@@ -7,7 +7,7 @@
> drawdag=$TESTDIR/drawdag.py
>
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=createmarkers,allowunstable
>
> [alias]
> tglog = log -G --template "{rev}: {desc}"
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -8,7 +8,7 @@
> [ui]
> logtemplate= {rev}:{node|short} {desc|firstline}
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=createmarkers,allowunstable
> [phases]
> publish=False
> [extensions]
@@ -733,7 +733,7 @@
|
o 0:4a2df7238c3b A
- $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all
+ $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all
obsoleted 1 changesets
$ hg rebase -d 6 -r "4::"
rebasing 4:ff2c4d47b71d "C"
@@ -761,7 +761,7 @@
$ hg add nonrelevant
$ hg commit -m nonrelevant
created new head
- $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all
+ $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
obsoleted 1 changesets
$ hg rebase -r . -d 10
note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
@@ -884,7 +884,7 @@
$ printf "dummy" > L
$ hg add L
$ hg commit -m "dummy change"
- $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.stabilization=all
+ $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=all
obsoleted 1 changesets
$ hg log -G -r 16::
@@ -1203,7 +1203,7 @@
equivalents in destination
$ hg init rbsrepo && cd rbsrepo
$ echo "[experimental]" > .hg/hgrc
- $ echo "stabilization=all" >> .hg/hgrc
+ $ echo "evolution=all" >> .hg/hgrc
$ echo "rebaseskipobsolete=on" >> .hg/hgrc
$ echo root > root && hg ci -Am root
adding root
@@ -1222,7 +1222,7 @@
$ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2:1e9a3c00cbe9 b (no-eol)
- $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
+ $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
Check that working directory and bookmark was updated to rev 3 although rev 2
was skipped
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -116,7 +116,7 @@
> maprevset=$TESTTMP/maprevset.py
> [experimental]
> rebase.multidest=true
- > stabilization=all
+ > evolution=all
> EOF
$ rebasewithdag() {
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -396,7 +396,7 @@
$ hg update E -q
$ echo 3 > B
$ hg commit --amend -m E -A B -q
- $ hg rebase -r B+D -d . --config experimental.stabilization=all
+ $ hg rebase -r B+D -d . --config experimental.evolution=all
rebasing 1:112478962961 "B" (B)
merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
@@ -407,7 +407,7 @@
$ hg resolve -m
(no more unresolved files)
continue: hg rebase --continue
- $ hg rebase --continue --config experimental.stabilization=none
+ $ hg rebase --continue --config experimental.evolution=none
rebasing 1:112478962961 "B" (B)
rebasing 3:f585351a92f8 "D" (D)
warning: orphaned descendants detected, not stripping 112478962961
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -98,7 +98,7 @@
> [phases]
> publish = no
> [experimental]
- > stabilization = all
+ > evolution = all
> [alias]
> graph = log -G --rev 'sort(all(), "topo")'
> EOF
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -588,7 +588,7 @@
(enabling evolution)
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
(making a changeset hidden; H in that case)
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -39,7 +39,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=createmarkers,exchange
> EOF
Killing a single changeset without replacement
@@ -892,15 +892,15 @@
Checking _enable=False warning if obsolete marker exists
$ echo '[experimental]' >> $HGRCPATH
- $ echo "stabilization=" >> $HGRCPATH
+ $ echo "evolution=" >> $HGRCPATH
$ hg log -r tip
obsolete feature not enabled but 68 markers found!
68:c15e9edfca13 (draft) [tip ] add celestine
reenable for later test
$ echo '[experimental]' >> $HGRCPATH
- $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH
+ $ echo "evolution=createmarkers,exchange" >> $HGRCPATH
$ rm hg.pid access.log errors.log
#endif
@@ -1300,7 +1300,7 @@
$ hg ci -m '2'
$ echo bar > f2
- $ hg commit --amend --config experimetnal.stabilization=createmarkers
+ $ hg commit --amend --config experimetnal.evolution=createmarkers
$ hg log -G
@ 3:b0551702f918 (draft) [tip ] 2
|
@@ -1429,7 +1429,7 @@
$ echo d > d
$ hg ci -Am d
adding d
- $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1
+ $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
$ hg debugobsolete --index --rev "3+7"
1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
diff --git a/tests/test-obsolete-tag-cache.t b/tests/test-obsolete-tag-cache.t
--- a/tests/test-obsolete-tag-cache.t
+++ b/tests/test-obsolete-tag-cache.t
@@ -5,7 +5,7 @@
> mock=$TESTDIR/mockblackbox.py
>
> [experimental]
- > stabilization = createmarkers
+ > evolution = createmarkers
> EOF
Create a repo with some tags
diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -9,7 +9,7 @@
> [ui]
> logtemplate = {rev}:{node|short} {desc}\n
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> [alias]
diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t
+++ b/tests/test-obsolete-checkheads.t
@@ -6,7 +6,7 @@
> [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n'
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ mkcommit() {
> echo "$1" > "$1"
diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t
--- a/tests/test-obsolete-changeset-exchange.t
+++ b/tests/test-obsolete-changeset-exchange.t
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
Push does not corrupt remote
@@ -87,7 +87,7 @@
check-that bundle can contain markers:
- $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.stabilization.bundle-obsmarker=1
+ $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1
1 changesets found
$ hg debugbundle ../f89bcc95eba5.hg
Stream params: {Compression: BZ}
diff --git a/tests/test-obsolete-bundle-strip.t b/tests/test-obsolete-bundle-strip.t
--- a/tests/test-obsolete-bundle-strip.t
+++ b/tests/test-obsolete-bundle-strip.t
@@ -15,10 +15,10 @@
>
> [experimental]
> # enable evolution
- > stabilization = all
+ > evolution = all
>
> # include obsmarkers in bundle
- > stabilization.bundle-obsmarker = yes
+ > evolution.bundle-obsmarker = yes
>
> [extensions]
> # needed for some tests
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -10,7 +10,7 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=all
+ > evolution=all
> [templates]
> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
> obsfateverb = "{obsfateverb(successors)}"
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -1700,7 +1700,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ hg log --template='{rev}:{node}\n'
@@ -2282,7 +2282,7 @@
$ hg init issue4490
$ cd issue4490
$ echo '[experimental]' >> .hg/hgrc
- $ echo 'stabilization=createmarkers' >> .hg/hgrc
+ $ echo 'evolution=createmarkers' >> .hg/hgrc
$ echo a > a
$ hg ci -Am0
adding a
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -326,7 +326,7 @@
$ cd largefiles-repo-hg
$ cat >> .hg/hgrc <<EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ hg debugobsolete `hg log -r tip -T "{node}"`
obsoleted 1 changesets
diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -8,7 +8,7 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=createmarkers,allowunstable
> [extensions]
> histedit=
> rebase=
@@ -543,7 +543,7 @@
|
o 0:cb9a9f314b8b (public) a
- $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.stabilization.track-operation=1
+ $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1
> pick b449568bf7fc 13 f
> pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g
@@ -554,7 +554,7 @@
Editing (ee118ab9fa44), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
- $ hg histedit --continue --config experimental.stabilization.track-operation=1
+ $ hg histedit --continue --config experimental.evolution.track-operation=1
$ hg log -G
@ 23:175d6b286a22 (secret) k
|
diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -494,7 +494,7 @@
$ cat >>$HGRCPATH <<EOF
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=createmarkers,allowunstable
> EOF
$ hg commit --amend -m 'allow this fold'
$ hg histedit --continue
diff --git a/tests/test-glog.t b/tests/test-glog.t
--- a/tests/test-glog.t
+++ b/tests/test-glog.t
@@ -2296,7 +2296,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ hg debugobsolete `hg id --debug -i -r 8`
diff --git a/tests/test-drawdag.t b/tests/test-drawdag.t
--- a/tests/test-drawdag.t
+++ b/tests/test-drawdag.t
@@ -2,7 +2,7 @@
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> [experimental]
- > stabilization=all
+ > evolution=all
> EOF
$ reinit () {
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -519,7 +519,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=createmarkers,allowunstable
> EOF
Amend with no files changes
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -509,7 +509,7 @@
$ cat >> .hg/hgrc << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
>>> import os
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -3665,7 +3665,7 @@
$ cd hashcollision
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution = createmarkers
> EOF
$ echo 0 > a
$ hg ci -qAm 0
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -706,7 +706,7 @@
$ cd filteredrev0
$ cat >> .hg/hgrc << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
$ echo initial1 > foo
$ hg -q commit -A -m initial0
diff --git a/tests/test-cache-abuse.t b/tests/test-cache-abuse.t
--- a/tests/test-cache-abuse.t
+++ b/tests/test-cache-abuse.t
@@ -2,7 +2,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> [phases]
> publish=False
> EOF
diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t
--- a/tests/test-bundle2-format.t
+++ b/tests/test-bundle2-format.t
@@ -230,7 +230,7 @@
> [extensions]
> bundle2=$TESTTMP/bundle2.py
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> [ui]
> ssh=$PYTHON "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -15,7 +15,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=createmarkers,exchange
> bundle2-output-capture=True
> [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh"
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -6,7 +6,7 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=createmarkers,exchange
> EOF
initialize
diff --git a/tests/test-bisect.t b/tests/test-bisect.t
--- a/tests/test-bisect.t
+++ b/tests/test-bisect.t
@@ -574,7 +574,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
tip is obsolete
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -11,7 +11,7 @@
#if obsstore-on
$ cat << EOF >> $HGRCPATH
> [experimental]
- > stabilization=createmarkers
+ > evolution=createmarkers
> EOF
#endif
@@ -180,7 +180,7 @@
$ cat >> $HGRCPATH <<EOF
> [experimental]
- > stabilization=createmarkers, allowunstable
+ > evolution=createmarkers, allowunstable
> EOF
$ hg amend
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list