This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3059

tests: use `hg unbundle` instead of `hg pull` in some tests
ClosedPublic

Authored by indygreg on Apr 3 2018, 9:56 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG5d10f41ddcc4: tests: use `hg unbundle` instead of `hg pull` in some tests

Summary

hg pull <bundle> uses the special "bundlerepo" repository. The
bundlerepo code makes many assumptions about the storage of
repositories. It will be difficult to teach bundlerepo to use
non-revlog storage before a better storage interface is established.

Many test failures using our "simple store" are related to
bundlerepo: the simple store just isn't compatible with bundlerepo
because of storage assumptions in bundlerepo.

In order to mitigate the impact of bundlerepo on our code base,
this commit changes various tests to use hg unbundle instead
of hg pull. This bypasses the bundlerepo code.

Tests exercising exchange functionality have not been altered, as
they should be using hg pull and going through the bundlerepo
code paths.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 3 2018, 9:56 PM

Herald added a reviewer: durin42. · View Herald TranscriptApr 3 2018, 9:56 PM

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

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

indygreg added a child revision: D3060: tests: disallow using simple store repo with bundlerepo.Apr 3 2018, 9:56 PM

Quick question before I'm okay with this: do we still have an explicit test of hg pull from a bundle somewhere?

If so, this is strictly an improvement, since pull-from-bundle is slower than straight-unbundle.

In D3059#49559, @durin42 wrote:

Quick question before I'm okay with this: do we still have an explicit test of hg pull from a bundle somewhere?
If so, this is strictly an improvement, since pull-from-bundle is slower than straight-unbundle.

It has to be evaluated on a case-by-case basis. I attempted to only make changes where the test was simply adding revisions to a repo and not testing behavior w.r.t. exchange. That being said, I audited this again and found at least one error. So will submit a follow-up.

indygreg updated this revision to Diff 7633.Apr 4 2018, 2:36 PM

Answered my own question, a couple of callsites are left. :)

durin42 accepted this revision.Apr 4 2018, 2:55 PM

This revision is now accepted and ready to land.Apr 4 2018, 2:55 PM

Closed by commit rHG5d10f41ddcc4: tests: use `hg unbundle` instead of `hg pull` in some tests (authored by indygreg). · Explain WhyApr 4 2018, 2:56 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-branches.t (4 lines)
M			tests/test-bundle-type.t (6 lines)
M			tests/test-keyword.t (6 lines)
M			tests/test-merge-symlinks.t (2 lines)
M			tests/test-rebase-conflicts.t (9 lines)
M			tests/test-strip.t (10 lines)
M			tests/test-treemanifest.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7602		Apr 3 2018, 9:56 PM	★	★
Diff 2	7633		Apr 4 2018, 2:36 PM	★	★
Diff 3	7636	rHG5d10f41ddcc494b3a84d3ef491be138c96dc4d3a	Apr 3 2018, 4:56 PM	★	★

Status	Author	Revision
Abandoned	indygreg	D3066 tests: teach test-fncache.t about the simple store
Abandoned	indygreg	D3065 repair: use repo.file().files() to rebuild fncache
Closed	indygreg	D3064 tests: disable tests for advanced clone features with simple store
Closed	indygreg	D3063 tests: skip largefiles and lfs tests when using simple store
Closed	indygreg	D3062 tests: disable infinitepush tests for simple store
Closed	indygreg	D3061 tests: conditionalize test output for simple store
Closed	indygreg	D3060 tests: disallow using simple store repo with bundlerepo
Closed	indygreg	D3059 tests: use `hg unbundle` instead of `hg pull` in some tests
Closed	indygreg	D3058 bundlerepo: use super() when calling file()
Closed	indygreg	D3057 tests: remove superfluous config setting
Closed	indygreg	D3056 tests: disable test-revlog-v2 when using simple store
Closed	indygreg	D3043 narrow: pass node into revlog.revision()
Closed	indygreg	D3042 tests: skip filelog damage tests when not using revlogs
Closed	indygreg	D3041 changegroup: remove "revlog" from error message
Closed	indygreg	D3040 tests: skip some tests when using simple store
Closed	indygreg	D3039 tests: conditionalize tests based on presence of custom extensions
Closed	indygreg	D3030 tests: conditionalize tests based on presence of revlogs for files
Closed	indygreg	D3029 tests: add test extension implementing custom filelog storage
Closed	indygreg	D3028 debugcommands: drop offset and length from debugindex by default
Closed	indygreg	D3027 debugcommands: drop base revision from debugindex
Closed	indygreg	D3026 tests: use debugdeltachain where appropriate
Closed	indygreg	D3025 tests: don't use revlog paths in tests

Diff 7636

tests/test-branches.t

	abort: a branch of the same name already exists			abort: a branch of the same name already exists
	(use 'hg update' to switch to it)			(use 'hg update' to switch to it)
	[255]			[255]

	verify update will accept invalid legacy branch names			verify update will accept invalid legacy branch names

	$ hg init test-invalid-branch-name			$ hg init test-invalid-branch-name
	$ cd test-invalid-branch-name			$ cd test-invalid-branch-name
	$ hg pull -u "$TESTDIR"/bundles/test-invalid-branch-name.hg			$ hg unbundle -u "$TESTDIR"/bundles/test-invalid-branch-name.hg
	pulling from *test-invalid-branch-name.hg (glob)
	requesting all changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 3 changes to 2 files			added 3 changesets with 3 changes to 2 files
	new changesets f0e4c7f04036:33c2ceb9310b			new changesets f0e4c7f04036:33c2ceb9310b
	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 update '"colon:test"'			$ hg update '"colon:test"'

tests/test-bundle-type.t

	bundle w/o type option			bundle w/o type option

	$ hg init t1			$ hg init t1
	$ hg init t2			$ hg init t2
	$ cd t1			$ cd t1
	$ echo blablablablabla > file.txt			$ echo blablablablabla > file.txt
	$ hg ci -Ama			$ hg ci -Ama
	adding file.txt			adding file.txt
	$ hg log \| grep summary			$ hg log \| grep summary
	summary: a			summary: a
	$ hg bundle ../b1 ../t2			$ hg bundle ../b1 ../t2
	searching for changes			searching for changes
	1 changesets found			1 changesets found

	$ cd ../t2			$ cd ../t2
	$ hg pull ../b1			$ hg unbundle ../b1
	pulling from ../b1
	requesting all changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets c35a0f9217e6			new changesets c35a0f9217e6
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	$ hg up			$ hg up
	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 log \| grep summary			$ hg log \| grep summary
	summary: a			summary: a
	$ cd ..			$ cd ..

	Unknown compression type is rejected			Unknown compression type is rejected

	$ hg init t3			$ hg init t3
	$ cd t3			$ cd t3
	$ hg -q pull ../b1			$ hg -q unbundle ../b1
	$ hg bundle -a -t unknown out.hg			$ hg bundle -a -t unknown out.hg
	abort: unknown is not a recognized bundle specification			abort: unknown is not a recognized bundle specification
	(see 'hg help bundlespec' for supported values for --type)			(see 'hg help bundlespec' for supported values for --type)
	[255]			[255]

	$ hg bundle -a -t unknown-v2 out.hg			$ hg bundle -a -t unknown-v2 out.hg
	abort: unknown compression is not supported			abort: unknown compression is not supported
	(see 'hg help bundlespec' for supported values for --type)			(see 'hg help bundlespec' for supported values for --type)

tests/test-keyword.t

	hg init t			hg init t
	cd t			cd t
	echo a > a			echo a > a
	ln -s a sym			ln -s a sym
	hg add sym			hg add sym
	hg ci -m addsym -u mercurial			hg ci -m addsym -u mercurial
	hg bundle --base null ../test-keyword.hg			hg bundle --base null ../test-keyword.hg

	$ hg pull -u "$TESTDIR"/bundles/test-keyword.hg			$ hg unbundle "$TESTDIR"/bundles/test-keyword.hg
	pulling from *test-keyword.hg (glob)
	requesting all changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets a2392c293916			new changesets a2392c293916
				(run 'hg update' to get a working copy)
				$ hg up a2392c293916
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	$ echo 'expand $Id$' > a			$ echo 'expand $Id$' > a
	$ echo 'do not process $Id:' >> a			$ echo 'do not process $Id:' >> a
	$ echo 'xxx $' >> a			$ echo 'xxx $' >> a
	$ echo 'ignore $Id$' > b			$ echo 'ignore $Id$' > b

	Output files as they were created			Output files as they were created

tests/test-merge-symlinks.t

	# hg up -C 0			# hg up -C 0
	# ln -s a l			# ln -s a l
	# hg ci -qAm t2 -d '2 0'			# hg ci -qAm t2 -d '2 0'
	# echo l2 > l2			# echo l2 > l2
	# hg ci -qAm t3 -d '3 0'			# hg ci -qAm t3 -d '3 0'

	$ hg init t			$ hg init t
	$ cd t			$ cd t
	$ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"			$ hg -q unbundle "$TESTDIR/bundles/test-merge-symlinks.hg"
	$ hg up -C 3			$ hg up -C 3
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved			3 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Merge them and display *_ISLINK vars			Merge them and display *_ISLINK vars
	merge heads			merge heads

	$ hg merge --tool="$PYTHON ../echo.py"			$ hg merge --tool="$PYTHON ../echo.py"
	merging l			merging l

tests/test-rebase-conflicts.t

	Bookmark stays active after --continue			Bookmark stays active after --continue
	$ hg bookmarks			$ hg bookmarks
	* mybook 5:d67b21408fc0			* mybook 5:d67b21408fc0

	$ cd ..			$ cd ..

	Check that the right ancestors is used while rebasing a merge (issue4041)			Check that the right ancestors is used while rebasing a merge (issue4041)

	$ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041			$ hg init issue4041
	requesting all changes			$ cd issue4041
				$ hg unbundle "$TESTDIR/bundles/issue4041.hg"
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 11 changesets with 8 changes to 3 files (+1 heads)			added 11 changesets with 8 changes to 3 files (+1 heads)
	new changesets 24797d4f68de:2f2496ddf49d			new changesets 24797d4f68de:2f2496ddf49d
	updating to branch default			(run 'hg heads' to see heads)
				$ hg up default
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ cd issue4041
	$ hg log -G			$ hg log -G
	o changeset: 10:2f2496ddf49d			o changeset: 10:2f2496ddf49d
	\|\ branch: f1			\|\ branch: f1
	\| \| tag: tip			\| \| tag: tip
	\| \| parent: 7:4c9fbe56a16f			\| \| parent: 7:4c9fbe56a16f
	\| \| parent: 9:e31216eec445			\| \| parent: 9:e31216eec445
	\| \| user: szhang			\| \| user: szhang
	\| \| date: Thu Sep 05 12:59:39 2013 -0400			\| \| date: Thu Sep 05 12:59:39 2013 -0400

tests/test-strip.t


	$ hg debugbundle .hg/strip-backup/*			$ hg debugbundle .hg/strip-backup/*
	Stream params: {Compression: BZ}			Stream params: {Compression: BZ}
	changegroup -- {nbchanges: 1, version: 02}			changegroup -- {nbchanges: 1, version: 02}
	264128213d290d868c54642d13aeaa3675551a78			264128213d290d868c54642d13aeaa3675551a78
	cache:rev-branch-cache -- {}			cache:rev-branch-cache -- {}
	phase-heads -- {}			phase-heads -- {}
	264128213d290d868c54642d13aeaa3675551a78 draft			264128213d290d868c54642d13aeaa3675551a78 draft
	$ hg pull .hg/strip-backup/*			$ hg unbundle .hg/strip-backup/*
	pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
	searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 0 files (+1 heads)			added 1 changesets with 0 changes to 1 files (+1 heads)
	new changesets 264128213d29			new changesets 264128213d29
	(run 'hg heads' to see heads, 'hg merge' to merge)			(run 'hg heads' to see heads, 'hg merge' to merge)
	$ rm .hg/strip-backup/*			$ rm .hg/strip-backup/*
	$ hg log --graph			$ hg log --graph
	o changeset: 4:264128213d29			o changeset: 4:264128213d29
	\| tag: tip			\| tag: tip
	\| parent: 1:ef3a871183d7			\| parent: 1:ef3a871183d7
	\| user: test			\| user: test
	\| summary: commitB			\| summary: commitB
	\|			\|
	o changeset: 0:105141ef12d0			o changeset: 0:105141ef12d0
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: commitA			summary: commitA


	$ hg pull -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg			$ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
	pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
	searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 1 changes to 1 files			added 2 changesets with 1 changes to 1 files
	new changesets 35358f982181:4cf5e92caec2			new changesets 35358f982181:4cf5e92caec2
	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 strip -k -r 35358f982181			$ hg strip -k -r 35358f982181

tests/test-treemanifest.t

	comparing with .hg/strip-backup/*-backup.hg (glob)			comparing with .hg/strip-backup/*-backup.hg (glob)
	searching for changes			searching for changes
	changeset: 6:51cfd7b1e13b			changeset: 6:51cfd7b1e13b
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: modify dir1/a			summary: modify dir1/a

	$ hg pull .hg/strip-backup/*			$ hg unbundle .hg/strip-backup/*
	pulling from .hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
	searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets 51cfd7b1e13b			new changesets 51cfd7b1e13b
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	$ hg --config extensions.strip= strip tip			$ hg --config extensions.strip= strip tip
	saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)