This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3152

upgrade: sniff for filelog type
ClosedPublic

Authored by indygreg on Apr 5 2018, 8:51 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHGc8666a9e9e11: upgrade: sniff for filelog type

Summary

The upgrade code should never encounter a vanilla revlog
instance: only changelog, manifestrevlog, and filelog should
be seen.

The previous code assumed !changelog & !manifestrevlog meant
file data. So this change feels pretty safe. If nothing else, it
will help tease out typing issues.

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 5 2018, 8:51 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 5 2018, 8:51 PM

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

indygreg added a child revision: D3153: tests: call rawsize() directly.Apr 5 2018, 8:51 PM

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

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

Closed by commit rHGc8666a9e9e11: upgrade: sniff for filelog type (authored by indygreg). · Explain WhyApr 6 2018, 9:23 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/upgrade.py (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 7850

mercurial/upgrade.py

	crevcount += len(rl)			crevcount += len(rl)
	csrcsize += datasize			csrcsize += datasize
	crawsize += rawsize			crawsize += rawsize
	elif isinstance(rl, manifest.manifestrevlog):			elif isinstance(rl, manifest.manifestrevlog):
	mcount += 1			mcount += 1
	mrevcount += len(rl)			mrevcount += len(rl)
	msrcsize += datasize			msrcsize += datasize
	mrawsize += rawsize			mrawsize += rawsize
	elif isinstance(rl, revlog.revlog):			elif isinstance(rl, filelog.filelog):
	fcount += 1			fcount += 1
	frevcount += len(rl)			frevcount += len(rl)
	fsrcsize += datasize			fsrcsize += datasize
	frawsize += rawsize			frawsize += rawsize
				else:
				error.ProgrammingError('unknown revlog type')

	if not revcount:			if not revcount:
	return			return

	ui.write(_('migrating %d total revisions (%d in filelogs, %d in manifests, '			ui.write(_('migrating %d total revisions (%d in filelogs, %d in manifests, '
	'%d in changelog)\n') %			'%d in changelog)\n') %
	(revcount, frevcount, mrevcount, crevcount))			(revcount, frevcount, mrevcount, crevcount))
	ui.write(_('migrating %s in store; %s tracked data\n') % (			ui.write(_('migrating %s in store; %s tracked data\n') % (

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7766		Apr 5 2018, 8:51 PM	★	★
Diff 2	7850	rHGc8666a9e9e11480b94783e51363bde3dbcf684fc	Apr 5 2018, 8:40 PM	★	★