This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3104

simplestore: back up index when adding a revision
ClosedPublic

Authored by indygreg on Apr 4 2018, 9:24 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG06674aab2b4c: simplestore: back up index when adding a revision

Summary

This ensures that transaction rollback reverts the index to its
previous state. This fixed a few test failures due to hg verify
complaining about a reference to an undefined changeset revision.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 4 2018, 9:24 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 4 2018, 9:24 PM

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

indygreg added a child revision: D3105: tests: require revlog store with test-repair-strip.t.Apr 4 2018, 9:24 PM

durin42 accepted this revision.Apr 6 2018, 8:35 PM

This revision is now accepted and ready to land.Apr 6 2018, 8:35 PM

Closed by commit rHG06674aab2b4c: simplestore: back up index when adding a revision (authored by indygreg). · Explain WhyApr 6 2018, 9:21 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/simplestorerepo.py (2 lines)
M			tests/test-clone.t (6 lines)
M			tests/test-subrepo-recursion.t (4 lines)

Status	Author	Revision
Closed	indygreg	D3154 filelog: wrap revlog instead of inheriting it (API)
Closed	indygreg	D3153 tests: call rawsize() directly
Closed	indygreg	D3152 upgrade: sniff for filelog type
Closed	indygreg	D3151 revlog: move censor logic into main revlog class
Closed	indygreg	D3150 revlog: move parsemeta() and packmeta() from filelog (API)
Closed	indygreg	D3149 filelog: declare that filelog implements a storage interface
Closed	indygreg	D3148 repository: define existing interface for file storage
Closed	indygreg	D3147 tests: run some largefiles and lfs tests with simple store
Closed	indygreg	D3119 commands: don't violate storage abstractions in `manifest --all`
Closed	indygreg	D3118 commands: document the layering violation in `manifest --all`
Abandoned	indygreg	D3117 tests: make test-convert-git.t more deterministic
Closed	indygreg	D3116 simplestore: correctly implement flag processors
Closed	indygreg	D3115 tests: `hg init` after resetting HGRCPATH
Closed	indygreg	D3114 tests: work around potential repo incompatibility
Closed	indygreg	D3113 tests: disable test-keyword.t with simple store
Closed	indygreg	D3112 tests: conditionalize test-treemanifest.t
Closed	indygreg	D3111 tests: use unbundle in test-symlink-os-yes-fs-no.py
Closed	indygreg	D3110 tests: disable `hg clone --stream` test with simple store
Closed	indygreg	D3109 tests: use `hg unbundle` in test-setdiscovery.t
Closed	indygreg	D3108 tests: require revlog store for test-verify.t
Closed	indygreg	D3107 tests: conditionalize test-commandserver.t based on extra extensions
Closed	indygreg	D3106 tests: conditionalize test-bundle.t
Closed	indygreg	D3105 tests: require revlog store with test-repair-strip.t
Closed	indygreg	D3104 simplestore: back up index when adding a revision
Closed	indygreg	D3103 tests: disable shallow narrow tests with simple store
Closed	indygreg	D3102 tests: skip test-hgweb-bundle.t if we don't support bundlerepos
Closed	indygreg	D3101 tests: disable test-audit-path.t with simple store
Closed	indygreg	D3100 tests: port test-convert-filemap.t to simple store
Closed	indygreg	D3099 tests: disable test-static-http.t with simple store
Closed	indygreg	D3098 tests: don't drop global hgrc
Closed	indygreg	D3097 verify: allow suppressing warnings about extra files
Closed	indygreg	D3096 tests: conditionalize tests for various repo features
Closed	indygreg	D3095 simplestore: use a custom store for the simple store repo
Closed	indygreg	D3094 verify: drop "revlog" from warning message
Closed	indygreg	D3093 store: make file filtering during walk configurable
Closed	indygreg	D3092 simplestore: shore up lookup errors
Closed	indygreg	D3091 tests: extract dumprevlog tests to own file
Closed	indygreg	D3090 tests: skip test-censor.t when using simple store

Diff 7686

tests/simplestorerepo.py


	return [b'/'.join((self._storepath, f)) for f in entries]			return [b'/'.join((self._storepath, f)) for f in entries]

	# Required by verify.			# Required by verify.
	def checksize(self):			def checksize(self):
	return 0, 0			return 0, 0

	def add(self, text, meta, transaction, linkrev, p1, p2):			def add(self, text, meta, transaction, linkrev, p1, p2):
				transaction.addbackup(self._indexpath)

	if meta or text.startswith(b'\1\n'):			if meta or text.startswith(b'\1\n'):
	text = filelog.packmeta(meta, text)			text = filelog.packmeta(meta, text)

	return self.addrevision(text, transaction, linkrev, p1, p2)			return self.addrevision(text, transaction, linkrev, p1, p2)

	def addrevision(self, text, transaction, linkrev, p1, p2, node=None,			def addrevision(self, text, transaction, linkrev, p1, p2, node=None,
	flags=0):			flags=0):
	validatenode(p1)			validatenode(p1)

tests/test-clone.t

	linking: 10 (reposimplestore !)			linking: 10 (reposimplestore !)
	linking: 11 (reposimplestore !)			linking: 11 (reposimplestore !)
	linking: 12 (reposimplestore !)			linking: 12 (reposimplestore !)
	linking: 13 (reposimplestore !)			linking: 13 (reposimplestore !)
	linking: 14 (reposimplestore !)			linking: 14 (reposimplestore !)
	linking: 15 (reposimplestore !)			linking: 15 (reposimplestore !)
	linking: 16 (reposimplestore !)			linking: 16 (reposimplestore !)
	linking: 17 (reposimplestore !)			linking: 17 (reposimplestore !)
	linked 17 files (reposimplestore !)			linking: 18 (reposimplestore !)
				linked 18 files (reposimplestore !)
	#else			#else
	$ hg --debug clone -U . ../c --config progress.debug=true			$ hg --debug clone -U . ../c --config progress.debug=true
	linking: 1			linking: 1
	copying: 2			copying: 2
	copying: 3			copying: 3
	copying: 4			copying: 4
	copying: 5			copying: 5
	copying: 6			copying: 6
	copying: 7			copying: 7
	copying: 8			copying: 8
	copied 8 files (reporevlogstore !)			copied 8 files (reporevlogstore !)
	copying: 9 (reposimplestore !)			copying: 9 (reposimplestore !)
	copying: 10 (reposimplestore !)			copying: 10 (reposimplestore !)
	copying: 11 (reposimplestore !)			copying: 11 (reposimplestore !)
	copying: 12 (reposimplestore !)			copying: 12 (reposimplestore !)
	copying: 13 (reposimplestore !)			copying: 13 (reposimplestore !)
	copying: 14 (reposimplestore !)			copying: 14 (reposimplestore !)
	copying: 15 (reposimplestore !)			copying: 15 (reposimplestore !)
	copying: 16 (reposimplestore !)			copying: 16 (reposimplestore !)
	copying: 17 (reposimplestore !)			copying: 17 (reposimplestore !)
	copied 17 files (reposimplestore !)			copying: 18 (reposimplestore !)
				copied 18 files (reposimplestore !)
	#endif			#endif
	$ cd ../c			$ cd ../c

	Ensure branchcache got copied over:			Ensure branchcache got copied over:

	$ ls .hg/cache			$ ls .hg/cache
	branch2-served			branch2-served
	rbc-names-v1			rbc-names-v1

tests/test-subrepo-recursion.t

	linking [ <=> ] 5\r (no-eol) (esc)			linking [ <=> ] 5\r (no-eol) (esc)
	linking [ <=> ] 6\r (no-eol) (esc)			linking [ <=> ] 6\r (no-eol) (esc)
	linking [ <=> ] 7\r (no-eol) (esc)			linking [ <=> ] 7\r (no-eol) (esc)
	linking [ <=> ] 8\r (no-eol) (esc)			linking [ <=> ] 8\r (no-eol) (esc)
	linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)
				linking [ <=> ] 13\r (no-eol) (esc) (reposimplestore !)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	#else			#else
	$ hg clone -U . ../empty			$ hg clone -U . ../empty
	\r (no-eol) (esc)			\r (no-eol) (esc)
	linking [ <=> ] 1 (no-eol)			linking [ <=> ] 1 (no-eol)
	#endif			#endif

	$ cd ../empty			$ cd ../empty
	linking [ <=> ] 7\r (no-eol) (esc)			linking [ <=> ] 7\r (no-eol) (esc)
	linking [ <=> ] 8\r (no-eol) (esc)			linking [ <=> ] 8\r (no-eol) (esc)
	linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 13\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 13\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 14\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 14\r (no-eol) (esc) (reposimplestore !)
				linking [ <=> ] 15\r (no-eol) (esc) (reposimplestore !)
				linking [ <=> ] 16\r (no-eol) (esc) (reposimplestore !)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	archiving (foo) [ ] 0/3\r (no-eol) (esc)			archiving (foo) [ ] 0/3\r (no-eol) (esc)
	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)			archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)			archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)			archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	linking [ <=> ] 1\r (no-eol) (esc)			linking [ <=> ] 1\r (no-eol) (esc)
	linking [ <=> ] 2\r (no-eol) (esc)			linking [ <=> ] 2\r (no-eol) (esc)
	linking [ <=> ] 3\r (no-eol) (esc)			linking [ <=> ] 3\r (no-eol) (esc)
	linking [ <=> ] 4\r (no-eol) (esc)			linking [ <=> ] 4\r (no-eol) (esc)
	linking [ <=> ] 5\r (no-eol) (esc)			linking [ <=> ] 5\r (no-eol) (esc)
	linking [ <=> ] 6\r (no-eol) (esc)			linking [ <=> ] 6\r (no-eol) (esc)
	linking [ <=> ] 7\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 7\r (no-eol) (esc) (reposimplestore !)
	linking [ <=> ] 8\r (no-eol) (esc) (reposimplestore !)			linking [ <=> ] 8\r (no-eol) (esc) (reposimplestore !)
				linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)			archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)			archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)
	cloning subrepo foo from $TESTTMP/repo/foo			cloning subrepo foo from $TESTTMP/repo/foo
	cloning subrepo foo/bar from $TESTTMP/repo/foo/bar			cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
	#else			#else

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7686		Apr 4 2018, 9:24 PM	★	★
Diff 2	7830	rHG06674aab2b4cb79847d42ba58d2f67e98305f5da	Apr 4 2018, 8:53 PM	★	★