This is an archive of the discontinued Mercurial Phabricator instance.

test: backout update evolution config
AbandonedPublic

Authored by lothiraldan on Sep 21 2017, 6:52 AM.

Download Raw Diff

Details

Reviewers

pulkit
quark

Group Reviewers

hg-reviewers

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 6c1a9fd8361b first then the config renaming.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Sep 21 2017, 6:52 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 21 2017, 6:52 AM

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

lothiraldan added a child revision: D762: config: backout rename evolution config into stabilization.Sep 21 2017, 6:52 AM

The evolution config name makes sense. stabilization was ambiguous.

Although "stabilization" may be controversial, but I don't think "evolution" is a better choice.

Since we are here, I think we should come up with formal names. It makes more sense to me to split the giant config into different smaller ones, like:

[experimental]
obsstore = bool
allowunstable = bool
obsexchange = bool
...

That's at least more consistent with expermental.allowdivergence, and is more flexible.

The reason experimental.stabilization is bad can not result in the conclusion that experimental.evolution is good. So @pulkit's +1 is questionable. Therefore requested changes to remove this from 2nd Pass queue. Feel free to request review again to move it back to 1st Pass queue if you believe this patch is still a good approach.

This revision now requires changes to proceed.Sep 21 2017, 3:18 PM

quark mentioned this in D762: config: backout rename evolution config into stabilization.Sep 21 2017, 3:24 PM

I concur with @quark: if we're going to bother renaming this again, we should just use the [experimental] namespace.

Sorry for the lag, I was at a conference.

I didn't planned for such changes, but I think it's a very good idea! I'm gonna send patches soon. Do you think I should start a new series of patch or add new patch on top of the backout?

I would bias towards just having one change that advances to using [experimental] if we want to rename this again. I don't think we need to take the rollback-then-forward approach, seems like unnecessary ceremony. Let's just talk this over at the sprint?

@durin42 Good for me, I don't have strong opinion on the matter. I will have a patch ready for the sprint.

In D761#13848, @lothiraldan wrote:

@durin42 Good for me, I don't have strong opinion on the matter. I will have a patch ready for the sprint.

What's the story with this revision? Should we close it and D762? Or do we have some revised versions I should look at?

I've started splitting the configuration, need to finish it before the freeze. As the stack will be unrelated to D761 and D762, I think we can close this stack.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-amend.t (4 lines)
M			tests/test-bisect.t (2 lines)
M			tests/test-bookmarks-pushpull.t (2 lines)
M			tests/test-bundle2-exchange.t (2 lines)
M			tests/test-bundle2-format.t (2 lines)
M			tests/test-cache-abuse.t (2 lines)
M			tests/test-clone.t (2 lines)
M			tests/test-command-template.t (2 lines)
M			tests/test-commandserver.t (2 lines)
M			tests/test-commit-amend.t (2 lines)
M			tests/test-drawdag.t (2 lines)
M			tests/test-glog.t (2 lines)
M			tests/test-histedit-arguments.t (2 lines)
M			tests/test-histedit-obsolete.t (6 lines)
M			tests/test-lfconvert.t (2 lines)
M			tests/test-log.t (4 lines)
M			tests/test-obsmarker-template.t (2 lines)
M			tests/test-obsolete-bundle-strip.t (4 lines)
M			tests/test-obsolete-changeset-exchange.t (4 lines)
M			tests/test-obsolete-checkheads.t (2 lines)
M			tests/test-obsolete-divergent.t (2 lines)
M			tests/test-obsolete-tag-cache.t (2 lines)
M			tests/test-obsolete.t (10 lines)
M			tests/test-phases.t (2 lines)
M			tests/test-push-race.t (2 lines)
M			tests/test-rebase-conflicts.t (4 lines)
M			tests/test-rebase-dest.t (2 lines)
M			tests/test-rebase-obsolete.t (12 lines)
M			tests/test-rebase-partial.t (2 lines)
M			tests/test-rebase-scenario-global.t (2 lines)
M			tests/test-revset.t (2 lines)
M			tests/test-revset2.t (2 lines)
M			tests/test-shelve.t (2 lines)
M			tests/test-strip.t (4 lines)
M			tests/test-subrepo-missing.t (2 lines)
M			tests/test-tag.t (2 lines)
M			tests/test-update-branches.t (2 lines)

	Status	Author	Revision
	Abandoned	lothiraldan	D762 config: backout rename evolution config into stabilization
	Abandoned	lothiraldan	D761 test: backout update evolution config

Diff 1957

tests/test-amend.t

	#testcases obsstore-off obsstore-on			#testcases obsstore-off obsstore-on

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [extensions]			> [extensions]
	> amend=			> amend=
	> debugdrawdag=$TESTDIR/drawdag.py			> debugdrawdag=$TESTDIR/drawdag.py
	> [diff]			> [diff]
	> git=1			> git=1
	> EOF			> EOF

	#if obsstore-on			#if obsstore-on
	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF
	#endif			#endif

	Basic amend			Basic amend

	$ hg init repo1			$ hg init repo1
	$ cd repo1			$ cd repo1
	$ hg debugdrawdag <<'EOS'			$ hg debugdrawdag <<'EOS'
	[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]
	> stabilization=createmarkers, allowunstable			> evolution=createmarkers, allowunstable
	> 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-bisect.t

	$ hg up -C .			$ hg up -C .
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Check that bisect does not break on obsolete changesets			Check that bisect does not break on obsolete changesets
	=========================================================			=========================================================

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	tip is obsolete			tip is obsolete
	---------------------			---------------------

	$ hg debugobsolete `hg id --debug -i -r tip`			$ hg debugobsolete `hg id --debug -i -r tip`
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg bisect --reset			$ hg bisect --reset

tests/test-bookmarks-pushpull.t

	#require serve			#require serve

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [ui]			> [ui]
	> logtemplate={rev}:{node\|short} {desc\|firstline}			> logtemplate={rev}:{node\|short} {desc\|firstline}
	> [phases]			> [phases]
	> publish=False			> publish=False
	> [experimental]			> [experimental]
	> stabilization=createmarkers,exchange			> evolution=createmarkers,exchange
	> EOF			> EOF

	initialize			initialize

	$ hg init a			$ hg init a
	$ cd a			$ cd a
	$ echo 'test' > test			$ echo 'test' > test
	$ hg commit -Am'test'			$ hg commit -Am'test'

tests/test-bundle2-exchange.t

	$ cp $HGRCPATH $TESTTMP/hgrc.orig			$ cp $HGRCPATH $TESTTMP/hgrc.orig
	$ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF			$ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF
	> echo pushkey: lock state after \"\$HG_NAMESPACE\"			> echo pushkey: lock state after \"\$HG_NAMESPACE\"
	> hg debuglock			> hg debuglock
	> EOF			> EOF

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers,exchange			> evolution=createmarkers,exchange
	> bundle2-output-capture=True			> bundle2-output-capture=True
	> [ui]			> [ui]
	> ssh="$PYTHON" "$TESTDIR/dummyssh"			> ssh="$PYTHON" "$TESTDIR/dummyssh"
	> logtemplate={rev}:{node\|short} {phase} {author} {bookmarks} {desc\|firstline}			> logtemplate={rev}:{node\|short} {phase} {author} {bookmarks} {desc\|firstline}
	> [web]			> [web]
	> push_ssl = false			> push_ssl = false
	> allow_push = *			> allow_push = *
	> [phases]			> [phases]

tests/test-bundle2-format.t

	> ui.write(b' advisory: %i\n' % len(p.advisoryparams))			> ui.write(b' advisory: %i\n' % len(p.advisoryparams))
	> ui.write(b' payload: %i bytes\n' % len(p.read()))			> ui.write(b' payload: %i bytes\n' % len(p.read()))
	> ui.write(b'parts count: %i\n' % count)			> ui.write(b'parts count: %i\n' % count)
	> EOF			> EOF
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [extensions]			> [extensions]
	> bundle2=$TESTTMP/bundle2.py			> bundle2=$TESTTMP/bundle2.py
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> [ui]			> [ui]
	> ssh=$PYTHON "$TESTDIR/dummyssh"			> ssh=$PYTHON "$TESTDIR/dummyssh"
	> logtemplate={rev}:{node\|short} {phase} {author} {bookmarks} {desc\|firstline}			> logtemplate={rev}:{node\|short} {phase} {author} {bookmarks} {desc\|firstline}
	> [web]			> [web]
	> push_ssl = false			> push_ssl = false
	> allow_push = *			> allow_push = *
	> [phases]			> [phases]
	> publish=False			> publish=False

tests/test-cache-abuse.t

	Enable obsolete markers			Enable obsolete markers

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> [phases]			> [phases]
	> publish=False			> publish=False
	> EOF			> EOF

	Build a repo with some cacheable bits:			Build a repo with some cacheable bits:

	$ hg init a			$ hg init a
	$ cd a			$ cd a

tests/test-clone.t

	$ echo second > foo			$ echo second > foo
	$ hg commit -m second			$ hg commit -m second
	$ cd ..			$ cd ..

	$ hg init filteredrev0			$ hg init filteredrev0
	$ cd filteredrev0			$ cd filteredrev0
	$ cat >> .hg/hgrc << EOF			$ cat >> .hg/hgrc << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF
	$ echo initial1 > foo			$ echo initial1 > foo
	$ hg -q commit -A -m initial0			$ hg -q commit -A -m initial0
	$ hg -q up -r null			$ hg -q up -r null
	$ echo initial2 > foo			$ echo initial2 > foo
	$ hg -q commit -A -m initial1			$ hg -q commit -A -m initial1
	$ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8			$ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
	obsoleted 1 changesets			obsoleted 1 changesets

tests/test-command-template.t

	$ cd ..			$ cd ..

	Test shortest(node) with the repo having short hash collision:			Test shortest(node) with the repo having short hash collision:

	$ hg init hashcollision			$ hg init hashcollision
	$ cd hashcollision			$ cd hashcollision
	$ cat <<EOF >> .hg/hgrc			$ cat <<EOF >> .hg/hgrc
	> [experimental]			> [experimental]
	> stabilization = createmarkers			> evolution = createmarkers
	> EOF			> EOF
	$ echo 0 > a			$ echo 0 > a
	$ hg ci -qAm 0			$ hg ci -qAm 0
	$ for i in 17 129 248 242 480 580 617 1057 2857 4025; do			$ for i in 17 129 248 242 480 580 617 1057 2857 4025; do
	> hg up -q 0			> hg up -q 0
	> echo $i > a			> echo $i > a
	> hg ci -qm $i			> hg ci -qm $i
	> done			> done

tests/test-commandserver.t

	checking manifests			checking manifests
	crosschecking files in changesets and manifests			crosschecking files in changesets and manifests
	checking files			checking files
	1 files, 2 changesets, 2 total revisions			1 files, 2 changesets, 2 total revisions
	$ hg revert --no-backup -aq			$ hg revert --no-backup -aq

	$ cat >> .hg/hgrc << EOF			$ cat >> .hg/hgrc << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	>>> import os			>>> import os
	>>> from hgclient import check, readchannel, runcommand			>>> from hgclient import check, readchannel, runcommand
	>>> @check			>>> @check
	... def obsolete(server):			... def obsolete(server):
	... readchannel(server)			... readchannel(server)
	...			...

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]
	> stabilization=createmarkers,allowunstable			> evolution=createmarkers,allowunstable
	> 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-drawdag.t

	$ cat >> $HGRCPATH<<EOF			$ cat >> $HGRCPATH<<EOF
	> [extensions]			> [extensions]
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> [experimental]			> [experimental]
	> stabilization=all			> evolution=all
	> EOF			> EOF

	$ reinit () {			$ reinit () {
	> rm -rf .hg && hg init			> rm -rf .hg && hg init
	> }			> }

	$ hg init			$ hg init

tests/test-glog.t

	(string 'b'))))			(string 'b'))))
	$ cd ..			$ cd ..

	Test --hidden			Test --hidden
	(enable obsolete)			(enable obsolete)

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	$ hg debugobsolete `hg id --debug -i -r 8`			$ hg debugobsolete `hg id --debug -i -r 8`
	obsoleted 1 changesets			obsoleted 1 changesets
	$ testlog			$ testlog
	[]			[]
	[]			[]
	$ testlog --hidden			$ testlog --hidden

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]
	> stabilization=createmarkers,allowunstable			> evolution=createmarkers,allowunstable
	> 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]
	> stabilization=createmarkers,allowunstable			> evolution=createmarkers,allowunstable
	> [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
	o 14:6b70183d2492 (draft) g			o 14:6b70183d2492 (draft) g
	\|			\|
	o 13:b449568bf7fc (draft) f			o 13:b449568bf7fc (draft) f
	\|			\|
	o 12:40db8afa467b (public) c			o 12:40db8afa467b (public) c
	\|			\|
	o 0:cb9a9f314b8b (public) a			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 b449568bf7fc 13 f
	> pick 7395e1ff83bd 15 h			> pick 7395e1ff83bd 15 h
	> pick 6b70183d2492 14 g			> pick 6b70183d2492 14 g
	> pick b605fb7503f2 16 i			> pick b605fb7503f2 16 i
	> pick 3a6c53ee7f3d 17 j			> pick 3a6c53ee7f3d 17 j
	> edit ee118ab9fa44 18 k			> edit ee118ab9fa44 18 k
	> EOF			> EOF
	Editing (ee118ab9fa44), you may commit or record as needed now.			Editing (ee118ab9fa44), you may commit or record as needed now.
	(hg histedit --continue to resume)			(hg histedit --continue to resume)
	[1]			[1]
	$ hg histedit --continue --config experimental.stabilization.track-operation=1			$ hg histedit --continue --config experimental.evolution.track-operation=1
	$ hg log -G			$ hg log -G
	@ 23:175d6b286a22 (secret) k			@ 23:175d6b286a22 (secret) k
	\|			\|
	o 22:44ca09d59ae4 (secret) j			o 22:44ca09d59ae4 (secret) j
	\|			\|
	o 21:31747692a644 (secret) i			o 21:31747692a644 (secret) i
	\|			\|
	o 20:9985cd4f21fa (draft) g			o 20:9985cd4f21fa (draft) g

tests/test-lfconvert.t

	o 0:d4892ec57ce2 add large, normal1			o 0:d4892ec57ce2 add large, normal1

	Verify will fail (for now) if the usercache is purged before converting, since			Verify will fail (for now) if the usercache is purged before converting, since
	largefiles are not cached in the converted repo's local store by the conversion			largefiles are not cached in the converted repo's local store by the conversion
	process.			process.
	$ cd largefiles-repo-hg			$ cd largefiles-repo-hg
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF
	$ hg debugobsolete `hg log -r tip -T "{node}"`			$ hg debugobsolete `hg log -r tip -T "{node}"`
	obsoleted 1 changesets			obsoleted 1 changesets
	$ cd ..			$ cd ..

	$ hg -R largefiles-repo-hg verify --large --lfa			$ hg -R largefiles-repo-hg verify --large --lfa
	checking changesets			checking changesets
	checking manifests			checking manifests

tests/test-log.t

	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a

	enable obsolete to test hidden feature			enable obsolete to test hidden feature

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	$ hg log --template='{rev}:{node}\n'			$ hg log --template='{rev}:{node}\n'
	1:a765632148dc55d38c35c4f247c618701886cb2f			1:a765632148dc55d38c35c4f247c618701886cb2f
	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05			0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
	$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f			$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg up null -q			$ hg up null -q

	$ cd ..			$ cd ..

	Even when the file revision is missing from some head:			Even when the file revision is missing from some head:

	$ hg init issue4490			$ hg init issue4490
	$ cd issue4490			$ cd issue4490
	$ echo '[experimental]' >> .hg/hgrc			$ echo '[experimental]' >> .hg/hgrc
	$ echo 'stabilization=createmarkers' >> .hg/hgrc			$ echo 'evolution=createmarkers' >> .hg/hgrc
	$ echo a > a			$ echo a > a
	$ hg ci -Am0			$ hg ci -Am0
	adding a			adding a
	$ echo b > b			$ echo b > b
	$ hg ci -Am1			$ hg ci -Am1
	adding b			adding b
	$ echo B > b			$ echo B > b
	$ hg ci --amend -m 1			$ hg ci --amend -m 1

tests/test-obsmarker-template.t

	This test file test the various templates related to obsmarkers.			This test file test the various templates related to obsmarkers.

	Global setup			Global setup
	============			============

	$ . $TESTDIR/testlib/obsmarker-common.sh			$ . $TESTDIR/testlib/obsmarker-common.sh
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [ui]			> [ui]
	> interactive = true			> interactive = true
	> [phases]			> [phases]
	> publish=False			> publish=False
	> [experimental]			> [experimental]
	> stabilization=all			> evolution=all
	> [templates]			> [templates]
	> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"			> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
	> obsfateverb = "{obsfateverb(successors)}"			> obsfateverb = "{obsfateverb(successors)}"
	> obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"			> obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
	> obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"			> obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
	> obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))\|isodate})", " (between {min(obsfatedate(markers))\|isodate} and {max(obsfatedate(markers))\|isodate})")}")}"			> obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))\|isodate})", " (between {min(obsfatedate(markers))\|isodate} and {max(obsfatedate(markers))\|isodate})")}")}"
	> obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "			> obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
	> [alias]			> [alias]

tests/test-obsolete-bundle-strip.t


	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [ui]			> [ui]
	> # simpler log output			> # simpler log output
	> logtemplate = "{node\|short}: {desc}\n"			> logtemplate = "{node\|short}: {desc}\n"
	>			>
	> [experimental]			> [experimental]
	> # enable evolution			> # enable evolution
	> stabilization = all			> evolution = all
	>			>
	> # include obsmarkers in bundle			> # include obsmarkers in bundle
	> stabilization.bundle-obsmarker = yes			> evolution.bundle-obsmarker = yes
	>			>
	> [extensions]			> [extensions]
	> # needed for some tests			> # needed for some tests
	> strip =			> strip =
	> [defaults]			> [defaults]
	> # we'll query many hidden changeset			> # we'll query many hidden changeset
	> debugobsolete = --hidden			> debugobsolete = --hidden
	> EOF			> EOF

tests/test-obsolete-changeset-exchange.t

	Test changesets filtering during exchanges (some tests are still in			Test changesets filtering during exchanges (some tests are still in
	test-obsolete.t)			test-obsolete.t)

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	Push does not corrupt remote			Push does not corrupt remote
	----------------------------			----------------------------

	Create a DAG where a changeset reuses a revision from a file first used in an			Create a DAG where a changeset reuses a revision from a file first used in an
	extinct changeset.			extinct changeset.

	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 1 files (+1 heads)			added 1 changesets with 0 changes to 1 files (+1 heads)
	(run 'hg heads' to see heads)			(run 'hg heads' to see heads)

	check-that bundle can contain markers:			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			1 changesets found
	$ hg debugbundle ../f89bcc95eba5.hg			$ hg debugbundle ../f89bcc95eba5.hg
	Stream params: {Compression: BZ}			Stream params: {Compression: BZ}
	changegroup -- {nbchanges: 1, version: 02}			changegroup -- {nbchanges: 1, version: 02}
	f89bcc95eba5174b1ccc3e33a82e84c96e8338ee			f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
	$ hg debugbundle ../f89bcc95eba5-obs.hg			$ hg debugbundle ../f89bcc95eba5-obs.hg
	Stream params: {Compression: BZ}			Stream params: {Compression: BZ}
	changegroup -- {nbchanges: 1, version: 02}			changegroup -- {nbchanges: 1, version: 02}

tests/test-obsolete-checkheads.t

	Check that obsolete properly strip heads			Check that obsolete properly strip heads
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [phases]			> [phases]
	> # public changeset are not obsolete			> # public changeset are not obsolete
	> publish=false			> publish=false
	> [ui]			> [ui]
	> logtemplate='{node\|short} ({phase}) {desc\|firstline}\n'			> logtemplate='{node\|short} ({phase}) {desc\|firstline}\n'
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF
	$ mkcommit() {			$ mkcommit() {
	> echo "$1" > "$1"			> echo "$1" > "$1"
	> hg add "$1"			> hg add "$1"
	> hg ci -m "add $1"			> hg ci -m "add $1"
	> }			> }
	$ getid() {			$ getid() {
	> hg id --debug -ir "desc('$1')"			> hg id --debug -ir "desc('$1')"

tests/test-obsolete-divergent.t

	Test file dedicated to testing the divergent troubles from obsolete changeset.			Test file dedicated to testing the divergent troubles from obsolete changeset.

	This is the most complex troubles from far so we isolate it in a dedicated			This is the most complex troubles from far so we isolate it in a dedicated
	file.			file.

	Enable obsolete			Enable obsolete

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [ui]			> [ui]
	> logtemplate = {rev}:{node\|short} {desc}\n			> logtemplate = {rev}:{node\|short} {desc}\n
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> [extensions]			> [extensions]
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> [alias]			> [alias]
	> debugobsolete = debugobsolete -d '0 0'			> debugobsolete = debugobsolete -d '0 0'
	> [phases]			> [phases]
	> publish=False			> publish=False
	> EOF			> EOF

tests/test-obsolete-tag-cache.t

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [extensions]			> [extensions]
	> blackbox=			> blackbox=
	> rebase=			> rebase=
	> mock=$TESTDIR/mockblackbox.py			> mock=$TESTDIR/mockblackbox.py
	>			>
	> [experimental]			> [experimental]
	> stabilization = createmarkers			> evolution = createmarkers
	> EOF			> EOF

	Create a repo with some tags			Create a repo with some tags

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ echo initial > foo			$ echo initial > foo
	$ hg -q commit -A -m initial			$ hg -q commit -A -m initial

tests/test-obsolete.t

	$ hg debugobsolete -d '0 0' `getid kill_me` -u babar			$ hg debugobsolete -d '0 0' `getid kill_me` -u babar
	abort: creating obsolete markers is not enabled on this repo			abort: creating obsolete markers is not enabled on this repo
	[255]			[255]

	Enabling it			Enabling it

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers,exchange			> evolution=createmarkers,exchange
	> EOF			> EOF

	Killing a single changeset without replacement			Killing a single changeset without replacement

	$ hg debugobsolete 0			$ hg debugobsolete 0
	abort: changeset references must be full hexadecimal node identifiers			abort: changeset references must be full hexadecimal node identifiers
	[255]			[255]
	$ hg debugobsolete '00'			$ hg debugobsolete '00'
	$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log			$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
	$ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'			$ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
	200 Script output follows			200 Script output follows
	$ killdaemons.py hg.pid			$ killdaemons.py hg.pid

	Checking _enable=False warning if obsolete marker exists			Checking _enable=False warning if obsolete marker exists

	$ echo '[experimental]' >> $HGRCPATH			$ echo '[experimental]' >> $HGRCPATH
	$ echo "stabilization=" >> $HGRCPATH			$ echo "evolution=" >> $HGRCPATH
	$ hg log -r tip			$ hg log -r tip
	obsolete feature not enabled but 68 markers found!			obsolete feature not enabled but 68 markers found!
	68:c15e9edfca13 (draft) [tip ] add celestine			68:c15e9edfca13 (draft) [tip ] add celestine

	reenable for later test			reenable for later test

	$ echo '[experimental]' >> $HGRCPATH			$ echo '[experimental]' >> $HGRCPATH
	$ echo "stabilization=createmarkers,exchange" >> $HGRCPATH			$ echo "evolution=createmarkers,exchange" >> $HGRCPATH

	$ rm hg.pid access.log errors.log			$ rm hg.pid access.log errors.log
	#endif			#endif

	Several troubles on the same changeset (create an unstable and bumped changeset)			Several troubles on the same changeset (create an unstable and bumped changeset)

	$ hg debugobsolete `getid obsolete_e`			$ hg debugobsolete `getid obsolete_e`
	obsoleted 1 changesets			obsoleted 1 changesets
	$ echo foo > f1			$ echo foo > f1
	$ hg add f1			$ hg add f1
	$ hg ci -m '1'			$ hg ci -m '1'
	$ echo foo > f2			$ echo foo > f2
	$ hg add f2			$ hg add f2
	$ hg ci -m '2'			$ hg ci -m '2'

	$ echo bar > f2			$ echo bar > f2
	$ hg commit --amend --config experimetnal.stabilization=createmarkers			$ hg commit --amend --config experimetnal.evolution=createmarkers
	$ hg log -G			$ hg log -G
	@ 3:b0551702f918 (draft) [tip ] 2			@ 3:b0551702f918 (draft) [tip ] 2
	\|			\|
	o 1:e016b03fd86f (draft) [ ] 1			o 1:e016b03fd86f (draft) [ ] 1
	\|			\|
	o 0:a78f55e5508c (draft) [ ] 0			o 0:a78f55e5508c (draft) [ ] 0

	$ hg log -G --hidden			$ hg log -G --hidden
	$ hg ci --amend -m bb			$ hg ci --amend -m bb
	$ echo c > c			$ echo c > c
	$ hg ci -Am c			$ hg ci -Am c
	adding c			adding c
	$ hg ci --amend -m cc			$ hg ci --amend -m cc
	$ echo d > d			$ echo d > d
	$ hg ci -Am d			$ hg ci -Am d
	adding 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"			$ hg debugobsolete --index --rev "3+7"
	1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}			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)			3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 $.*$ {'operation': 'amend', 'user': 'test'} (re)
	$ hg debugobsolete --index --rev "3+7" -Tjson			$ hg debugobsolete --index --rev "3+7" -Tjson
	[			[
	{			{
	"date": [0.0, 0],			"date": [0.0, 0],
	"flag": 0,			"flag": 0,

tests/test-phases.t


	test hidden changeset are not cloned as public (issue3935)			test hidden changeset are not cloned as public (issue3935)

	$ cd initialrepo			$ cd initialrepo

	(enabling evolution)			(enabling evolution)
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	(making a changeset hidden; H in that case)			(making a changeset hidden; H in that case)
	$ hg debugobsolete `hg id --debug -r 5`			$ hg debugobsolete `hg id --debug -r 5`
	obsoleted 1 changesets			obsoleted 1 changesets

	$ cd ..			$ cd ..
	$ hg clone initialrepo clonewithobs			$ hg clone initialrepo clonewithobs

tests/test-push-race.t

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [ui]			> [ui]
	> ssh = $PYTHON "$TESTDIR/dummyssh"			> ssh = $PYTHON "$TESTDIR/dummyssh"
	> # simplify output			> # simplify output
	> logtemplate = {node\|short} {desc} ({branch})			> logtemplate = {node\|short} {desc} ({branch})
	> [phases]			> [phases]
	> publish = no			> publish = no
	> [experimental]			> [experimental]
	> stabilization = all			> evolution = all
	> [alias]			> [alias]
	> graph = log -G --rev 'sort(all(), "topo")'			> graph = log -G --rev 'sort(all(), "topo")'
	> EOF			> EOF

	We tests multiple cases:			We tests multiple cases:
	* strict: no race detected,			* strict: no race detected,
	* unrelated: race on unrelated heads are allowed.			* unrelated: race on unrelated heads are allowed.

tests/test-rebase-conflicts.t

	> B E			> B E
	> \|/			> \|/
	> A			> A
	> EOS			> EOS

	$ hg update E -q			$ hg update E -q
	$ echo 3 > B			$ echo 3 > B
	$ hg commit --amend -m E -A B -q			$ 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)			rebasing 1:112478962961 "B" (B)
	merging B			merging B
	warning: conflicts while merging B! (edit, then use 'hg resolve --mark')			warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	[1]			[1]

	$ echo 4 > B			$ echo 4 > B
	$ hg resolve -m			$ hg resolve -m
	(no more unresolved files)			(no more unresolved files)
	continue: hg rebase --continue			continue: hg rebase --continue
	$ hg rebase --continue --config experimental.stabilization=none			$ hg rebase --continue --config experimental.evolution=none
	rebasing 1:112478962961 "B" (B)			rebasing 1:112478962961 "B" (B)
	rebasing 3:f585351a92f8 "D" (D)			rebasing 3:f585351a92f8 "D" (D)
	warning: orphaned descendants detected, not stripping 112478962961			warning: orphaned descendants detected, not stripping 112478962961
	saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)			saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)

	$ rm .hg/localtags			$ rm .hg/localtags
	$ hg tglog			$ hg tglog
	o 5:draft 'D'			o 5:draft 'D'

tests/test-rebase-dest.t

	> [phases]			> [phases]
	> publish=False			> publish=False
	> [alias]			> [alias]
	> tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)'			> tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)'
	> [extensions]			> [extensions]
	> maprevset=$TESTTMP/maprevset.py			> maprevset=$TESTTMP/maprevset.py
	> [experimental]			> [experimental]
	> rebase.multidest=true			> rebase.multidest=true
	> stabilization=all			> evolution=all
	> 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
	> hg debugdrawdag			> hg debugdrawdag
	> hg rebase "$@" > _rebasetmp			> hg rebase "$@" > _rebasetmp
	> r=$?			> r=$?

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]
	> stabilization=createmarkers,allowunstable			> evolution=createmarkers,allowunstable
	> [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
	\| o 6:9c48361117de D			\| o 6:9c48361117de D
	\| \|			\| \|
	o \| 4:ff2c4d47b71d C			o \| 4:ff2c4d47b71d C
	\|/			\|/
	o 2:261e70097290 B2			o 2:261e70097290 B2
	\|			\|
	o 0:4a2df7238c3b A			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			obsoleted 1 changesets
	$ hg rebase -d 6 -r "4::"			$ hg rebase -d 6 -r "4::"
	rebasing 4:ff2c4d47b71d "C"			rebasing 4:ff2c4d47b71d "C"
	note: not rebasing 7:360bbaa7d3ce "O", it has no successor			note: not rebasing 7:360bbaa7d3ce "O", it has no successor
	rebasing 8:8d47583e023f "P" (tip)			rebasing 8:8d47583e023f "P" (tip)

	If all the changeset to be rebased are obsolete and present in the destination, we			If all the changeset to be rebased are obsolete and present in the destination, we
	should display a friendly error message			should display a friendly error message


	$ hg up 9			$ hg up 9
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo "non-relevant change" > nonrelevant			$ echo "non-relevant change" > nonrelevant
	$ hg add nonrelevant			$ hg add nonrelevant
	$ hg commit -m nonrelevant			$ hg commit -m nonrelevant
	created new head			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			obsoleted 1 changesets
	$ hg rebase -r . -d 10			$ hg rebase -r . -d 10
	note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor			note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor

	If a rebase is going to create divergence, it should abort			If a rebase is going to create divergence, it should abort

	$ hg log -G			$ hg log -G
	@ 10:121d9e3bc4c6 P			@ 10:121d9e3bc4c6 P
	$ hg commit -m "willconflict second version"			$ hg commit -m "willconflict second version"
	created new head			created new head
	$ printf "dummy" > K			$ printf "dummy" > K
	$ hg add K			$ hg add K
	$ hg commit -m "dummy change"			$ hg commit -m "dummy change"
	$ printf "dummy" > L			$ printf "dummy" > L
	$ hg add L			$ hg add L
	$ hg commit -m "dummy change"			$ 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			obsoleted 1 changesets

	$ hg log -G -r 16::			$ hg log -G -r 16::
	@ 21:7bdc8a87673d dummy change			@ 21:7bdc8a87673d dummy change
	\|			\|
	x 20:8b31da3c4919 dummy change			x 20:8b31da3c4919 dummy change
	\|			\|
	o 19:b82fb57ea638 willconflict second version			o 19:b82fb57ea638 willconflict second version
	Z			Z

	$ cd ..			$ cd ..

	Test that bookmark is moved and working dir is updated when all changesets have			Test that bookmark is moved and working dir is updated when all changesets have
	equivalents in destination			equivalents in destination
	$ hg init rbsrepo && cd rbsrepo			$ hg init rbsrepo && cd rbsrepo
	$ echo "[experimental]" > .hg/hgrc			$ echo "[experimental]" > .hg/hgrc
	$ echo "stabilization=all" >> .hg/hgrc			$ echo "evolution=all" >> .hg/hgrc
	$ echo "rebaseskipobsolete=on" >> .hg/hgrc			$ echo "rebaseskipobsolete=on" >> .hg/hgrc
	$ echo root > root && hg ci -Am root			$ echo root > root && hg ci -Am root
	adding root			adding root
	$ echo a > a && hg ci -Am a			$ echo a > a && hg ci -Am a
	adding a			adding a
	$ hg up 0			$ hg up 0
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo b > b && hg ci -Am b			$ echo b > b && hg ci -Am b
	adding b			adding b
	created new head			created new head
	$ hg rebase -r 2 -d 1			$ hg rebase -r 2 -d 1
	rebasing 2:1e9a3c00cbe9 "b" (tip)			rebasing 2:1e9a3c00cbe9 "b" (tip)
	$ hg log -r . # working dir is at rev 3 (successor of 2)			$ hg log -r . # working dir is at rev 3 (successor of 2)
	3:be1832deae9a b (no-eol)			3:be1832deae9a b (no-eol)
	$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now			$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
	$ hg up 2 && hg log -r . # working dir is at rev 2 again			$ 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			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	2:1e9a3c00cbe9 b (no-eol)			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)			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			Check that working directory and bookmark was updated to rev 3 although rev 2
	was skipped			was skipped
	$ hg log -r .			$ hg log -r .
	3:be1832deae9a b (no-eol)			3:be1832deae9a b (no-eol)
	$ hg bookmarks			$ hg bookmarks
	mybook 3:be1832deae9a			mybook 3:be1832deae9a
	$ hg debugobsolete --rev tip			$ hg debugobsolete --rev tip

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]
	> stabilization=createmarkers,allowunstable			> evolution=createmarkers,allowunstable
	>			>
	> [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-rebase-scenario-global.t

	> def extsetup(ui):			> def extsetup(ui):
	> extensions.afterloaded('rebase', wraprebase)			> extensions.afterloaded('rebase', wraprebase)
	> EOF			> EOF

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> wraprebase=$TESTTMP/wraprebase.py			> wraprebase=$TESTTMP/wraprebase.py
	> [experimental]			> [experimental]
	> stabilization=all			> evolution=all
	> EOF			> EOF

	$ hg debugdrawdag <<'EOS'			$ hg debugdrawdag <<'EOS'
	> B C			> B C
	> \|/			> \|/
	> A			> A
	> EOS			> EOS

	$ hg rebase -s C -d B			$ hg rebase -s C -d B
	rebasing 2:dc0947a82db8 "C" (C tip)			rebasing 2:dc0947a82db8 "C" (C tip)

	$ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'			$ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
	[1]			[1]

tests/test-revset.t


	Test short 'ff...' hash collision			Test short 'ff...' hash collision
	(BUG: '0:wdir()' is still needed to populate wdir revision)			(BUG: '0:wdir()' is still needed to populate wdir revision)

	$ hg init wdir-hashcollision			$ hg init wdir-hashcollision
	$ cd wdir-hashcollision			$ cd wdir-hashcollision
	$ cat <<EOF >> .hg/hgrc			$ cat <<EOF >> .hg/hgrc
	> [experimental]			> [experimental]
	> stabilization = createmarkers			> evolution = createmarkers
	> EOF			> EOF
	$ echo 0 > a			$ echo 0 > a
	$ hg ci -qAm 0			$ hg ci -qAm 0
	$ for i in 2463 2961 6726 78127; do			$ for i in 2463 2961 6726 78127; do
	> hg up -q 0			> hg up -q 0
	> echo $i > a			> echo $i > a
	> hg ci -qm $i			> hg ci -qm $i
	> done			> done

tests/test-revset2.t

	$ cd ..			$ cd ..

	Test obsstore related revsets			Test obsstore related revsets

	$ hg init repo1			$ hg init repo1
	$ cd repo1			$ cd repo1
	$ cat <<EOF >> .hg/hgrc			$ cat <<EOF >> .hg/hgrc
	> [experimental]			> [experimental]
	> stabilization = createmarkers			> evolution = createmarkers
	> EOF			> EOF

	$ hg debugdrawdag <<'EOS'			$ hg debugdrawdag <<'EOS'
	> F G			> F G
	> \|/ # split: B -> E, F			> \|/ # split: B -> E, F
	> B C D E # amend: B -> C -> D			> B C D E # amend: B -> C -> D
	> \\|/ \| # amend: F -> G			> \\|/ \| # amend: F -> G
	> A A Z # amend: A -> Z			> A A Z # amend: A -> Z

tests/test-shelve.t

	rebasing 3:013284d9655e "changes to: b" (tip)			rebasing 3:013284d9655e "changes to: b" (tip)
	$ hg status			$ hg status
	A d			A d

	test bug 4073 we need to enable obsolete markers for it			test bug 4073 we need to enable obsolete markers for it

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF
	$ hg shelve			$ hg shelve
	shelved as default			shelved as default
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg debugobsolete `hg --debug id -i -r 1`			$ hg debugobsolete `hg --debug id -i -r 1`
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg unshelve			$ hg unshelve
	unshelving change 'default'			unshelving change 'default'

tests/test-strip.t

	b-Z -1:000000000000			b-Z -1:000000000000

	Test the above using obsstore "by the way". Not directly related to strip, but			Test the above using obsstore "by the way". Not directly related to strip, but
	we have reusable code here			we have reusable code here

	$ cd $TESTTMP/scmutilcleanup.obsstore			$ cd $TESTTMP/scmutilcleanup.obsstore
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [experimental]			> [experimental]
	> stabilization=all			> evolution=all
	> stabilization.track-operation=1			> evolution.track-operation=1
	> EOF			> EOF

	$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py			$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py

	$ rm .hg/localtags			$ rm .hg/localtags
	$ hg log -G -T '{rev}:{node\|short} {desc} {bookmarks}' -r 'sort(all(), topo)'			$ hg log -G -T '{rev}:{node\|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
	o 12:1473d4b996d1 G2 b-F@divergent3 b-G			o 12:1473d4b996d1 G2 b-F@divergent3 b-G
	\|			\|

tests/test-subrepo-missing.t

	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]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	check that we can update parent repo with missing (amended) subrepo revision			check that we can update parent repo with missing (amended) subrepo revision

	$ hg up --repository subrepo -r tip			$ hg up --repository subrepo -r tip
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg ci -m "updated subrepo to tip"			$ hg ci -m "updated subrepo to tip"
	created new head			created new head

tests/test-tag.t

	$ hg tag -R empty -r 00000000000 -f nulltag			$ hg tag -R empty -r 00000000000 -f nulltag
	abort: cannot tag null revision			abort: cannot tag null revision
	[255]			[255]

	issue5539: pruned tags do not appear in .hgtags			issue5539: pruned tags do not appear in .hgtags

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> stabilization=createmarkers,exchange			> evolution=createmarkers,exchange
	> EOF			> EOF
	$ hg up e4d483960b9b --quiet			$ hg up e4d483960b9b --quiet
	$ echo aaa >>a			$ echo aaa >>a
	$ hg ci -maaa			$ hg ci -maaa
	$ hg log -r . -T "{node}\n"			$ hg log -r . -T "{node}\n"
	743b3afd5aa69f130c246806e48ad2e699f490d2			743b3afd5aa69f130c246806e48ad2e699f490d2
	$ hg tag issue5539			$ hg tag issue5539
	hook: tag changes detected			hook: tag changes detected

tests/test-update-branches.t

	---------------------------------------------------------------------			---------------------------------------------------------------------

	successors should be taken in account when checking head destination			successors should be taken in account when checking head destination

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [ui]			> [ui]
	> logtemplate={rev}:{node\|short} {desc\|firstline}			> logtemplate={rev}:{node\|short} {desc\|firstline}
	> [experimental]			> [experimental]
	> stabilization=createmarkers			> evolution=createmarkers
	> EOF			> EOF

	Test no-argument update to a successor of an obsoleted changeset			Test no-argument update to a successor of an obsoleted changeset

	$ hg log -G			$ hg log -G
	o 5:ff252e8273df 5			o 5:ff252e8273df 5
	\|			\|
	o 4:d047485b3896 4			o 4:d047485b3896 4

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1957			Sep 21 2017, 6:52 AM	★	★