config: use 'experimental.evolution.create-markers'
Extract 'experimental.evolution' = createmarkers as
'experimental.evolution.createmarkers'.
We keep the new option in the 'experimental.evolution' namespace in order to
stay coherent with other options ('experimental.evolution.bundle-obsmarker'
and 'experimental.evolution.track-operation') ease the renaming as possibly
'evolution.createmarkers'.
Differential Revision: https://phab.mercurial-scm.org/D1149
--- a/tests/test-amend.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-amend.t Thu Sep 28 18:19:06 2017 +0100
@@ -11,7 +11,7 @@
#if obsstore-on
$ cat << EOF >> $HGRCPATH
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
#endif
@@ -180,7 +180,8 @@
$ cat >> $HGRCPATH <<EOF
> [experimental]
- > stabilization=createmarkers, allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> EOF
$ hg amend
--- a/tests/test-bisect.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-bisect.t Thu Sep 28 18:19:06 2017 +0100
@@ -574,7 +574,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
tip is obsolete
--- a/tests/test-bookmarks-pushpull.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-bookmarks-pushpull.t Thu Sep 28 18:19:06 2017 +0100
@@ -6,7 +6,8 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=exchange
+ > evolution.createmarkers=True
> EOF
$ TESTHOOK='hooks.txnclose-bookmark.test=echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"'
--- a/tests/test-bundle2-exchange.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-bundle2-exchange.t Thu Sep 28 18:19:06 2017 +0100
@@ -15,7 +15,8 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=exchange
+ > evolution.createmarkers=True
> bundle2-output-capture=True
> [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh"
--- a/tests/test-bundle2-format.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-bundle2-format.t Thu Sep 28 18:19:06 2017 +0100
@@ -230,7 +230,7 @@
> [extensions]
> bundle2=$TESTTMP/bundle2.py
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> [ui]
> ssh=$PYTHON "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
--- a/tests/test-cache-abuse.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-cache-abuse.t Thu Sep 28 18:19:06 2017 +0100
@@ -2,7 +2,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> [phases]
> publish=False
> EOF
--- a/tests/test-clone.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-clone.t Thu Sep 28 18:19:06 2017 +0100
@@ -712,7 +712,7 @@
$ cd filteredrev0
$ cat >> .hg/hgrc << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ echo initial1 > foo
$ hg -q commit -A -m initial0
--- a/tests/test-command-template.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-command-template.t Thu Sep 28 18:19:06 2017 +0100
@@ -3784,7 +3784,7 @@
$ cd hashcollision
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution.createmarkers=True
> EOF
$ echo 0 > a
$ hg ci -qAm 0
--- a/tests/test-commandserver.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-commandserver.t Thu Sep 28 18:19:06 2017 +0100
@@ -509,7 +509,7 @@
$ cat >> .hg/hgrc << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
>>> import os
--- a/tests/test-commit-amend.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-commit-amend.t Thu Sep 28 18:19:06 2017 +0100
@@ -519,7 +519,8 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> EOF
Amend with no files changes
--- a/tests/test-glog.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-glog.t Thu Sep 28 18:19:06 2017 +0100
@@ -2297,7 +2297,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ hg debugobsolete `hg id --debug -i -r 8`
--- a/tests/test-histedit-arguments.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-histedit-arguments.t Thu Sep 28 18:19:06 2017 +0100
@@ -496,7 +496,8 @@
$ cat >>$HGRCPATH <<EOF
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> EOF
$ hg commit --amend -m 'allow this fold'
$ hg histedit --continue
--- a/tests/test-histedit-obsolete.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-histedit-obsolete.t Thu Sep 28 18:19:06 2017 +0100
@@ -8,7 +8,8 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> [extensions]
> histedit=
> rebase=
--- a/tests/test-lfconvert.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-lfconvert.t Thu Sep 28 18:19:06 2017 +0100
@@ -326,7 +326,7 @@
$ cd largefiles-repo-hg
$ cat >> .hg/hgrc <<EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ hg debugobsolete `hg log -r tip -T "{node}"`
obsoleted 1 changesets
--- a/tests/test-log.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-log.t Thu Sep 28 18:19:06 2017 +0100
@@ -1702,7 +1702,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ hg log --template='{rev}:{node}\n'
@@ -2284,7 +2284,7 @@
$ hg init issue4490
$ cd issue4490
$ echo '[experimental]' >> .hg/hgrc
- $ echo 'stabilization=createmarkers' >> .hg/hgrc
+ $ echo 'evolution.createmarkers=True' >> .hg/hgrc
$ echo a > a
$ hg ci -Am0
adding a
--- a/tests/test-obsolete-bounds-checking.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete-bounds-checking.t Thu Sep 28 18:19:06 2017 +0100
@@ -7,7 +7,8 @@
> [extensions]
> amend =
> [experimental]
- > stabilization=createmarkers,exchange
+ > stabilization=exchange
+ > evolution.createmarkers=True
> EOF
$ hg init tmpa
$ cd tmpa
--- a/tests/test-obsolete-changeset-exchange.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete-changeset-exchange.t Thu Sep 28 18:19:06 2017 +0100
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
Push does not corrupt remote
--- a/tests/test-obsolete-checkheads.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete-checkheads.t Thu Sep 28 18:19:06 2017 +0100
@@ -6,7 +6,7 @@
> [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n'
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ mkcommit() {
> echo "$1" > "$1"
--- a/tests/test-obsolete-divergent.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete-divergent.t Thu Sep 28 18:19:06 2017 +0100
@@ -9,7 +9,7 @@
> [ui]
> logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> [alias]
--- a/tests/test-obsolete-tag-cache.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete-tag-cache.t Thu Sep 28 18:19:06 2017 +0100
@@ -5,7 +5,7 @@
> mock=$TESTDIR/mockblackbox.py
>
> [experimental]
- > stabilization = createmarkers
+ > evolution.createmarkers=True
> EOF
Create a repo with some tags
--- a/tests/test-obsolete.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-obsolete.t Thu Sep 28 18:19:06 2017 +0100
@@ -39,7 +39,8 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=exchange
+ > evolution.createmarkers=True
> EOF
Killing a single changeset without replacement
@@ -899,15 +900,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=exchange" >> $HGRCPATH
+ $ echo "evolution.createmarkers=True" >> $HGRCPATH
$ rm hg.pid access.log errors.log
#endif
@@ -1311,7 +1312,7 @@
$ hg ci -m '2'
$ echo bar > f2
- $ hg commit --amend --config experimetnal.stabilization=createmarkers
+ $ hg commit --amend --config experimental.evolution.createmarkers=True
$ hg log -G
@ 3:b0551702f918 (draft) [tip ] 2
|
--- a/tests/test-phases.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-phases.t Thu Sep 28 18:19:06 2017 +0100
@@ -630,7 +630,7 @@
(enabling evolution)
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
(making a changeset hidden; H in that case)
--- a/tests/test-rebase-brute-force.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-rebase-brute-force.t Thu Sep 28 18:19:06 2017 +0100
@@ -3,7 +3,8 @@
> drawdag=$TESTDIR/drawdag.py
> bruterebase=$TESTDIR/bruterebase.py
> [experimental]
- > evolution=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> EOF
$ init() {
> N=`expr ${N:-0} + 1`
--- a/tests/test-rebase-obsolete.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-rebase-obsolete.t Thu Sep 28 18:19:06 2017 +0100
@@ -8,7 +8,8 @@
> [ui]
> logtemplate= {rev}:{node|short} {desc|firstline}
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> [phases]
> publish=False
> [extensions]
--- a/tests/test-rebase-partial.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-rebase-partial.t Thu Sep 28 18:19:06 2017 +0100
@@ -7,7 +7,8 @@
> drawdag=$TESTDIR/drawdag.py
>
> [experimental]
- > stabilization=createmarkers,allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
>
> [alias]
> tglog = log -G --template "{rev}: {desc}"
--- a/tests/test-revset.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-revset.t Thu Sep 28 18:19:06 2017 +0100
@@ -1794,7 +1794,7 @@
$ cd wdir-hashcollision
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution.createmarkers=True
> EOF
$ echo 0 > a
$ hg ci -qAm 0
--- a/tests/test-revset2.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-revset2.t Thu Sep 28 18:19:06 2017 +0100
@@ -1626,7 +1626,7 @@
$ cd repo1
$ cat <<EOF >> .hg/hgrc
> [experimental]
- > stabilization = createmarkers
+ > evolution.createmarkers=True
> EOF
$ hg debugdrawdag <<'EOS'
--- a/tests/test-shelve.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-shelve.t Thu Sep 28 18:19:06 2017 +0100
@@ -696,7 +696,7 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
$ hg shelve
shelved as default
--- a/tests/test-subrepo-missing.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-subrepo-missing.t Thu Sep 28 18:19:06 2017 +0100
@@ -76,7 +76,7 @@
> [phases]
> publish=False
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
check that we can update parent repo with missing (amended) subrepo revision
--- a/tests/test-tag.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-tag.t Thu Sep 28 18:19:06 2017 +0100
@@ -415,7 +415,8 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > stabilization=createmarkers,exchange
+ > evolution=exchange
+ > evolution.createmarkers=True
> EOF
$ hg up e4d483960b9b --quiet
$ echo aaa >>a
--- a/tests/test-uncommit.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-uncommit.t Thu Sep 28 18:19:06 2017 +0100
@@ -2,7 +2,8 @@
$ cat >> $HGRCPATH <<EOF
> [experimental]
- > evolution=createmarkers, allowunstable
+ > evolution=allowunstable
+ > evolution.createmarkers=True
> [extensions]
> uncommit =
> drawdag=$TESTDIR/drawdag.py
--- a/tests/test-update-branches.t Tue Oct 17 11:29:26 2017 +0200
+++ b/tests/test-update-branches.t Thu Sep 28 18:19:06 2017 +0100
@@ -473,7 +473,7 @@
> [ui]
> logtemplate={rev}:{node|short} {desc|firstline}
> [experimental]
- > stabilization=createmarkers
+ > evolution.createmarkers=True
> EOF
Test no-argument update to a successor of an obsoleted changeset