D1150: config: use 'experimental.evolution.allowunstable'
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Tue Oct 17 15:05:23 UTC 2017
lothiraldan created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Extract 'experimental.evolution' = allowunstable as
'experimental.evolution.allowunstable'.
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.allowunstable'.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1150
AFFECTED FILES
tests/test-amend.t
tests/test-check-commit.t
tests/test-commit-amend.t
tests/test-histedit-arguments.t
tests/test-histedit-obsolete.t
tests/test-rebase-brute-force.t
tests/test-rebase-obsolete.t
tests/test-rebase-partial.t
tests/test-uncommit.t
CHANGE DETAILS
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -2,8 +2,8 @@
$ cat >> $HGRCPATH <<EOF
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> [extensions]
> uncommit =
> drawdag=$TESTDIR/drawdag.py
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,8 +7,8 @@
> drawdag=$TESTDIR/drawdag.py
>
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
>
> [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,8 +8,8 @@
> [ui]
> logtemplate= {rev}:{node|short} {desc|firstline}
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> [phases]
> publish=False
> [extensions]
diff --git a/tests/test-rebase-brute-force.t b/tests/test-rebase-brute-force.t
--- a/tests/test-rebase-brute-force.t
+++ b/tests/test-rebase-brute-force.t
@@ -3,8 +3,8 @@
> drawdag=$TESTDIR/drawdag.py
> bruterebase=$TESTDIR/bruterebase.py
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> EOF
$ init() {
> N=`expr ${N:-0} + 1`
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,8 +8,8 @@
> [phases]
> publish=False
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> [extensions]
> histedit=
> rebase=
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
@@ -496,8 +496,8 @@
$ cat >>$HGRCPATH <<EOF
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> EOF
$ hg commit --amend -m 'allow this fold'
$ hg histedit --continue
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,8 +519,8 @@
$ cat >> $HGRCPATH << EOF
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> EOF
Amend with no files changes
diff --git a/tests/test-check-commit.t b/tests/test-check-commit.t
--- a/tests/test-check-commit.t
+++ b/tests/test-check-commit.t
@@ -19,4 +19,3 @@
> fi
> done
-
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -180,8 +180,8 @@
$ cat >> $HGRCPATH <<EOF
> [experimental]
- > evolution=allowunstable
> evolution.createmarkers=True
+ > evolution.allowunstable=True
> EOF
$ hg amend
To: lothiraldan, durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list