This is an archive of the discontinued Mercurial Phabricator instance.

config: use 'experimental.evolution.allowunstable'
ClosedPublic

Authored by lothiraldan on Oct 17 2017, 11:04 AM.

Download Raw Diff

Details

Reviewers

durin42
indygreg

Group Reviewers

hg-reviewers

Commits

rHG7f183c643eb6: config: use 'experimental.evolution.allowunstable'

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'.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Oct 17 2017, 11:04 AM

Herald added a reviewer: durin42. · View Herald TranscriptOct 17 2017, 11:04 AM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-devel. · View Herald Transcript

lothiraldan added a child revision: D1151: config: use 'experimental.evolution.exchange'.Oct 17 2017, 11:04 AM

ryanmce added a subscriber: ryanmce.Oct 17 2017, 5:41 PM

ryanmce added inline comments.

tests/test-check-commit.t
22	Please avoid unrelated changes

ryanmce requested changes to this revision.Oct 17 2017, 6:00 PM

This revision now requires changes to proceed.Oct 17 2017, 6:00 PM

lothiraldan added inline comments.Oct 18 2017, 2:43 AM

tests/test-check-commit.t
22	Woops, sorry will remove it

lothiraldan updated this revision to Diff 2962.Oct 18 2017, 2:48 AM

indygreg accepted this revision.Oct 18 2017, 11:59 AM

indygreg removed a reviewer: ryanmce.Oct 18 2017, 12:08 PM

This revision is now accepted and ready to land.Oct 18 2017, 12:08 PM

Closed by commit rHG7f183c643eb6: config: use 'experimental.evolution.allowunstable' (authored by lothiraldan). · Explain WhyOct 18 2017, 12:08 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-amend.t (2 lines)
M			tests/test-check-commit.t (1 line)
M			tests/test-commit-amend.t (2 lines)
M			tests/test-histedit-arguments.t (2 lines)
M			tests/test-histedit-obsolete.t (2 lines)
M			tests/test-rebase-brute-force.t (2 lines)
M			tests/test-rebase-obsolete.t (2 lines)
M			tests/test-rebase-partial.t (2 lines)
M			tests/test-uncommit.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2923		Oct 17 2017, 11:04 AM	★	★
Diff 2	2962		Oct 18 2017, 2:48 AM	★	★
Diff 3	2984	rHG7f183c643eb696383961091f8703fc0f0bb81098	Sep 28 2017, 1:56 PM	★	★

Status	Author	Revision
Closed	lothiraldan	D1155 config: gather allowdivergence under the evolution namespace
Closed	lothiraldan	D1154 config: remove stabilization.* aliases
Closed	lothiraldan	D1153 config: rename stabilization.track-operation
Closed	lothiraldan	D1152 config: rename stabilization.bundle-obsmarker
Closed	lothiraldan	D1151 config: use 'experimental.evolution.exchange'
Closed	lothiraldan	D1150 config: use 'experimental.evolution.allowunstable'
Closed	lothiraldan	D1149 config: use 'experimental.evolution.create-markers'
Closed	lothiraldan	D1148 config: replace experimental.stabilization by experimental.evolution
Closed	lothiraldan	D1147 config: update evolution-related config
Closed	lothiraldan	D1146 config: invert evolution-related configuration aliases

Diff 2923

tests/test-amend.t

	[255]			[255]

	#if obsstore-on			#if obsstore-on

	With allowunstable, amend could work in the middle of a stack			With allowunstable, amend could work in the middle of a stack

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> EOF			> EOF

	$ hg amend			$ hg amend
	$ hg log -T '{rev} {node\|short} {desc}\n' -G			$ hg log -T '{rev} {node\|short} {desc}\n' -G
	@ 3 be169c7e8dbe B			@ 3 be169c7e8dbe B
	\|			\|
	\| o 2 26805aba1e60 C			\| o 2 26805aba1e60 C
	\| \|			\| \|

tests/test-check-commit.t

	> if [ $? -ne 0 ]; then			> if [ $? -ne 0 ]; then
	> echo "Revision $node does not comply with rules"			> echo "Revision $node does not comply with rules"
	> echo '------------------------------------------------------'			> echo '------------------------------------------------------'
	> cat ${TESTTMP}/check-commit.out			> cat ${TESTTMP}/check-commit.out
	> echo			> echo
	> fi			> fi
	> done			> done


	ryanmceUnsubmitted Not Done Please avoid unrelated changes ryanmce: Please avoid unrelated changes
	lothiraldanAuthorUnsubmitted Not Done Woops, sorry will remove it lothiraldan: Woops, sorry will remove it

tests/test-commit-amend.t


	Test amend with obsolete			Test amend with obsolete
	---------------------------			---------------------------

	Enable obsolete			Enable obsolete

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> EOF			> EOF

	Amend with no files changes			Amend with no files changes

	$ hg id -n			$ hg id -n
	13			13
	$ hg ci --amend -m 'babar'			$ hg ci --amend -m 'babar'
	$ hg id -n			$ hg id -n

tests/test-histedit-arguments.t

	(use 'hg histedit --continue' or 'hg histedit --abort')			(use 'hg histedit --continue' or 'hg histedit --abort')
	[255]			[255]

	With markers enabled, histedit does not get confused, and			With markers enabled, histedit does not get confused, and
	amend should not be blocked by the ongoing histedit.			amend should not be blocked by the ongoing histedit.

	$ cat >>$HGRCPATH <<EOF			$ cat >>$HGRCPATH <<EOF
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> EOF			> EOF
	$ hg commit --amend -m 'allow this fold'			$ hg commit --amend -m 'allow this fold'
	$ hg histedit --continue			$ hg histedit --continue

	$ cd ..			$ cd ..

	Test autoverb feature			Test autoverb feature

tests/test-histedit-obsolete.t

	$ . "$TESTDIR/histedit-helpers.sh"			$ . "$TESTDIR/histedit-helpers.sh"

	Enable obsolete			Enable obsolete

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [ui]			> [ui]
	> logtemplate= {rev}:{node\|short} {desc\|firstline}			> logtemplate= {rev}:{node\|short} {desc\|firstline}
	> [phases]			> [phases]
	> publish=False			> publish=False
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> [extensions]			> [extensions]
	> histedit=			> histedit=
	> rebase=			> rebase=
	> EOF			> EOF

	Test that histedit learns about obsolescence not stored in histedit state			Test that histedit learns about obsolescence not stored in histedit state
	$ hg init boo			$ hg init boo
	$ cd boo			$ cd boo

tests/test-rebase-brute-force.t

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> bruterebase=$TESTDIR/bruterebase.py			> bruterebase=$TESTDIR/bruterebase.py
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> EOF			> EOF
	$ init() {			$ init() {
	> N=`expr ${N:-0} + 1`			> N=`expr ${N:-0} + 1`
	> cd $TESTTMP && hg init repo$N && cd repo$N			> cd $TESTTMP && hg init repo$N && cd repo$N
	> hg debugdrawdag			> hg debugdrawdag
	> }			> }

	Source looks like "N"			Source looks like "N"

tests/test-rebase-obsolete.t

	==========================			==========================
	Test rebase with obsolete			Test rebase with obsolete
	==========================			==========================

	Enable obsolete			Enable obsolete

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [ui]			> [ui]
	> logtemplate= {rev}:{node\|short} {desc\|firstline}			> logtemplate= {rev}:{node\|short} {desc\|firstline}
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> [phases]			> [phases]
	> publish=False			> publish=False
	> [extensions]			> [extensions]
	> rebase=			> rebase=
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> EOF			> EOF

	Setup rebase canonical repo			Setup rebase canonical repo

tests/test-rebase-partial.t

	Tests rebasing with part of the rebase set already in the			Tests rebasing with part of the rebase set already in the
	destination (issue5422)			destination (issue5422)

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> rebase=			> rebase=
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	>			>
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	>			>
	> [alias]			> [alias]
	> tglog = log -G --template "{rev}: {desc}"			> tglog = log -G --template "{rev}: {desc}"
	> EOF			> EOF

	$ rebasewithdag() {			$ rebasewithdag() {
	> N=`$PYTHON -c "print($N+1)"`			> N=`$PYTHON -c "print($N+1)"`
	> hg init repo$N && cd repo$N			> hg init repo$N && cd repo$N

tests/test-uncommit.t

	Test uncommit - set up the config			Test uncommit - set up the config

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [experimental]			> [experimental]
	> evolution=allowunstable
	> evolution.createmarkers=True			> evolution.createmarkers=True
				> evolution.allowunstable=True
	> [extensions]			> [extensions]
	> uncommit =			> uncommit =
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> EOF			> EOF

	Build up a repo			Build up a repo

	$ hg init repo			$ hg init repo