This is an archive of the discontinued Mercurial Phabricator instance.

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 7676

mercurial/verify.py

	subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles,			subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles,
	progress)			progress)
	for f, onefilenodes in subdirfilenodes.iteritems():			for f, onefilenodes in subdirfilenodes.iteritems():
	filenodes.setdefault(f, {}).update(onefilenodes)			filenodes.setdefault(f, {}).update(onefilenodes)

	if not dir and subdirnodes:			if not dir and subdirnodes:
	ui.progress(_('checking'), None)			ui.progress(_('checking'), None)
	for f in sorted(storefiles):			for f in sorted(storefiles):
	self.warn(_("warning: orphan revlog '%s'") % f)			self.warn(_("warning: orphan data file '%s'") % f)

	return filenodes			return filenodes

	def _crosscheckfiles(self, filelinkrevs, filenodes):			def _crosscheckfiles(self, filelinkrevs, filenodes):
	repo = self.repo			repo = self.repo
	ui = self.ui			ui = self.ui
	ui.status(_("crosschecking files in changesets and manifests\n"))			ui.status(_("crosschecking files in changesets and manifests\n"))

	if f in filenodes:			if f in filenodes:
	fns = [(v, k) for k, v in filenodes[f].iteritems()]			fns = [(v, k) for k, v in filenodes[f].iteritems()]
	for lr, node in sorted(fns):			for lr, node in sorted(fns):
	self.err(lr, _("manifest refers to unknown revision %s") %			self.err(lr, _("manifest refers to unknown revision %s") %
	short(node), f)			short(node), f)
	ui.progress(_('checking'), None)			ui.progress(_('checking'), None)

	for f in sorted(storefiles):			for f in sorted(storefiles):
	self.warn(_("warning: orphan revlog '%s'") % f)			self.warn(_("warning: orphan data file '%s'") % f)

	return len(files), revisions			return len(files), revisions

tests/test-repair-strip.t

	abandoned transaction found - run hg recover			abandoned transaction found - run hg recover
	checking changesets			checking changesets
	checking manifests			checking manifests
	crosschecking files in changesets and manifests			crosschecking files in changesets and manifests
	checking files			checking files
	b@?: rev 1 points to nonexistent changeset 2			b@?: rev 1 points to nonexistent changeset 2
	(expected 1)			(expected 1)
	b@?: 736c29771fba not in manifests			b@?: 736c29771fba not in manifests
	warning: orphan revlog 'data/c.i'			warning: orphan data file 'data/c.i'
	2 files, 2 changesets, 3 total revisions			2 files, 2 changesets, 3 total revisions
	2 warnings encountered!			2 warnings encountered!
	2 integrity errors encountered!			2 integrity errors encountered!
	% journal contents			% journal contents
	00changelog.i			00changelog.i
	00manifest.i			00manifest.i
	data/b.i			data/b.i
	data/c.i			data/c.i

tests/test-treemanifest.t

	checking changesets			checking changesets
	checking manifests			checking manifests
	checking directory manifests			checking directory manifests
	0: empty or missing b/			0: empty or missing b/
	b/@0: parent-directory manifest refers to unknown revision 67688a370455			b/@0: parent-directory manifest refers to unknown revision 67688a370455
	b/@1: parent-directory manifest refers to unknown revision f065da70369e			b/@1: parent-directory manifest refers to unknown revision f065da70369e
	b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b			b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
	b/@3: parent-directory manifest refers to unknown revision 367152e6af28			b/@3: parent-directory manifest refers to unknown revision 367152e6af28
	warning: orphan revlog 'meta/b/bar/00manifest.i'			warning: orphan data file 'meta/b/bar/00manifest.i'
	warning: orphan revlog 'meta/b/bar/orange/00manifest.i'			warning: orphan data file 'meta/b/bar/orange/00manifest.i'
	warning: orphan revlog 'meta/b/bar/orange/fly/00manifest.i'			warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i'
	warning: orphan revlog 'meta/b/foo/00manifest.i'			warning: orphan data file 'meta/b/foo/00manifest.i'
	warning: orphan revlog 'meta/b/foo/apple/00manifest.i'			warning: orphan data file 'meta/b/foo/apple/00manifest.i'
	warning: orphan revlog 'meta/b/foo/apple/bees/00manifest.i'			warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i'
	crosschecking files in changesets and manifests			crosschecking files in changesets and manifests
	b/bar/fruits.txt@0: in changeset but not in manifest			b/bar/fruits.txt@0: in changeset but not in manifest
	b/bar/orange/fly/gnat.py@0: in changeset but not in manifest			b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
	b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest			b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest
	b/foo/apple/bees/flower.py@0: in changeset but not in manifest			b/foo/apple/bees/flower.py@0: in changeset but not in manifest
	checking files			checking files
	8 files, 4 changesets, 18 total revisions			8 files, 4 changesets, 18 total revisions
	6 warnings encountered!			6 warnings encountered!

tests/test-verify.t

	[1]			[1]
	$ cp -R .hg/store-full/. .hg/store			$ cp -R .hg/store-full/. .hg/store

	Entire changelog and manifest log missing			Entire changelog and manifest log missing

	$ rm .hg/store/00changelog.*			$ rm .hg/store/00changelog.*
	$ rm .hg/store/00manifest.*			$ rm .hg/store/00manifest.*
	$ hg verify -q			$ hg verify -q
	warning: orphan revlog 'data/file.i'			warning: orphan data file 'data/file.i'
	1 warnings encountered!			1 warnings encountered!
	$ cp -R .hg/store-full/. .hg/store			$ cp -R .hg/store-full/. .hg/store

	Entire changelog and filelog missing			Entire changelog and filelog missing

	$ rm .hg/store/00changelog.*			$ rm .hg/store/00changelog.*
	$ rm .hg/store/data/file.*			$ rm .hg/store/data/file.*
	$ hg verify -q			$ hg verify -q
	$ cat start b > .hg/store/data/a.i			$ cat start b > .hg/store/data/a.i

	$ hg verify			$ hg verify
	checking changesets			checking changesets
	checking manifests			checking manifests
	crosschecking files in changesets and manifests			crosschecking files in changesets and manifests
	checking files			checking files
	a@1: broken revlog! (index data/a.i is corrupted)			a@1: broken revlog! (index data/a.i is corrupted)
	warning: orphan revlog 'data/a.i'			warning: orphan data file 'data/a.i'
	1 files, 2 changesets, 0 total revisions			1 files, 2 changesets, 0 total revisions
	1 warnings encountered!			1 warnings encountered!
	1 integrity errors encountered!			1 integrity errors encountered!
	(first damaged changeset appears to be 1)			(first damaged changeset appears to be 1)
	[1]			[1]

	$ cd ..			$ cd ..

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7676		Apr 4 2018, 9:24 PM	★	★
Diff 2	7804	rHGa6651f5e2c7814350d8137db0e6635bf32c33cb6	Apr 4 2018, 4:43 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

verify: drop "revlog" from warning messageClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 7676

mercurial/verify.py

tests/test-repair-strip.t

tests/test-treemanifest.t

tests/test-verify.t

verify: drop "revlog" from warning message
ClosedPublic

Revision Contents
Changeset List