Patchwork D1148: config: replace experimental.stabilization by experimental.evolution

login
register
mail settings
Submitter phabricator
Date Oct. 18, 2017, 4:09 p.m.
Message ID <4b460c0cdd1cba088b67140d4e8b7cbe@localhost.localdomain>
Download mbox | patch
Permalink /patch/25178/
State Not Applicable
Headers show

Comments

phabricator - Oct. 18, 2017, 4:09 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa0100f34e20b: config: replace experimental.stabilization by experimental.evolution (authored by lothiraldan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1148?vs=2921&id=2982

REVISION DETAIL
  https://phab.mercurial-scm.org/D1148

AFFECTED FILES
  tests/test-drawdag.t
  tests/test-obsmarker-template.t
  tests/test-obsolete-bundle-strip.t
  tests/test-push-race.t
  tests/test-rebase-conflicts.t
  tests/test-rebase-dest.t
  tests/test-rebase-obsolete.t
  tests/test-rebase-scenario-global.t
  tests/test-strip.t
  tests/testlib/exchange-obsmarker-util.sh

CHANGE DETAILS




To: lothiraldan, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/tests/testlib/exchange-obsmarker-util.sh b/tests/testlib/exchange-obsmarker-util.sh
--- a/tests/testlib/exchange-obsmarker-util.sh
+++ b/tests/testlib/exchange-obsmarker-util.sh
@@ -26,7 +26,7 @@ 
 # reduce output changes
 bundle2-output-capture=True
 # enable evolution
-evolution=all
+evolution=true
 
 [extensions]
 # we need to strip some changeset for some test cases
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -1280,7 +1280,7 @@ 
   $ cd $TESTTMP/scmutilcleanup.obsstore
   $ cat >> .hg/hgrc <<EOF
   > [experimental]
-  > stabilization=all
+  > evolution=true
   > stabilization.track-operation=1
   > EOF
 
@@ -1322,7 +1322,7 @@ 
   $ cd issue5678
   $ cat >> .hg/hgrc <<EOF
   > [experimental]
-  > evolution=all
+  > evolution=true
   > EOF
   $ echo a > a
   $ hg ci -Aqm a
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
@@ -968,7 +968,7 @@ 
   > [extensions]
   > wraprebase=$TESTTMP/wraprebase.py
   > [experimental]
-  > stabilization=all
+  > evolution=true
   > EOF
 
   $ hg debugdrawdag <<'EOS'
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
@@ -735,7 +735,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=true
   obsoleted 1 changesets
   $ hg rebase -d 6 -r "4::"
   rebasing 4:ff2c4d47b71d "C"
@@ -763,7 +763,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=true
   obsoleted 1 changesets
   $ hg rebase -r . -d 10
   note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
@@ -886,7 +886,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=true
   obsoleted 1 changesets
 
   $ hg log -G -r 16::
@@ -1205,7 +1205,7 @@ 
 equivalents in destination
   $ hg init rbsrepo && cd rbsrepo
   $ echo "[experimental]" > .hg/hgrc
-  $ echo "stabilization=all" >> .hg/hgrc
+  $ echo "evolution=true" >> .hg/hgrc
   $ echo "rebaseskipobsolete=on" >> .hg/hgrc
   $ echo root > root && hg ci -Am root
   adding root
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=true
   > 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
@@ -397,7 +397,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=true
   rebasing 1:112478962961 "B" (B)
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
@@ -408,7 +408,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
@@ -108,7 +108,7 @@ 
   > [phases]
   > publish = no
   > [experimental]
-  > stabilization = all
+  > evolution=true
   > [alias]
   > graph = log -G --rev 'sort(all(), "topo")'
   > EOF
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,7 +15,7 @@ 
   > 
   > [experimental]
   > # enable evolution
-  > stabilization = all
+  > evolution=true
   > 
   > # include obsmarkers in bundle
   > stabilization.bundle-obsmarker = yes
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=true
   > [templates]
   > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
   > obsfateverb = "{obsfateverb(successors)}"
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=true
   > EOF
 
   $ reinit () {