This is an archive of the discontinued Mercurial Phabricator instance.

revlog: explicitly set revlogv0 in vfs options
ClosedPublic

Authored by marmoute on Oct 1 2019, 8:33 AM.

Download Raw Diff

Details

Reviewers

martinvonz
durin42
indygreg
pulkit

Group Reviewers

hg-reviewers

Commits

rHG188476e48f51: revlog: explicitly set revlogv0 in vfs options

Summary

Relying on having an attribute or not for something so fundamental seems too
fragile to me. (And indeed I had issue with that later in this series). So we
explicitly record the fact the repository use revlog-v0.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

marmoute created this revision.Oct 1 2019, 8:33 AM

Herald added a reviewer: indygreg. · View Herald TranscriptOct 1 2019, 8:33 AM

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

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

marmoute added a child revision: D6935: vfs: give all vfs an options attribute by default.Oct 1 2019, 8:33 AM

pulkit accepted this revision.Oct 1 2019, 10:38 AM

This revision is now accepted and ready to land.Oct 1 2019, 10:38 AM

martinvonz added inline comments.Oct 1 2019, 12:25 PM

mercurial/revlog.py
367–369	Needs updating

marmoute updated this revision to Diff 16748.Oct 1 2019, 12:37 PM

marmoute added a commit: rHG188476e48f51: revlog: explicitly set revlogv0 in vfs options.Oct 1 2019, 1:07 PM

Closed by commit rHG188476e48f51: revlog: explicitly set revlogv0 in vfs options (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/localrepo.py (2 lines)
M			mercurial/revlog.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	16731		Oct 1 2019, 8:32 AM	★	★
Diff 2	16748		Oct 1 2019, 12:37 PM	★	★
Diff 3	16754	rHG188476e48f51055e4c35209cc72b16622c6e14e1	Sep 27 2019, 12:24 AM	★	★

Commit	Parents	Author	Summary	Date
cae6ab111bad	ae70776f4ae4	Pierre-Yves David		Sep 27 2019, 12:24 AM

Status	Author	Revision
Closed	marmoute	D6937 copies: move file input processsing early
Closed	marmoute	D6936 copies: prepare changelog for more copies storage mode
Closed	marmoute	D6935 vfs: give all vfs an options attribute by default
Closed	marmoute	D6934 revlog: explicitly set revlogv0 in vfs options
Closed	marmoute	D6933 context: clarify the various mode in the _copies property cache
Closed	marmoute	D6932 context: clarify the various mode in the filesremoved method
Closed	marmoute	D6931 context: clarify the various mode in the filesadded method
Closed	marmoute	D6930 copies: expand the logic of usechangesetcentricalgo

Diff 16731

mercurial/localrepo.py


	# In the absence of another requirement superseding a revlog-related			# In the absence of another requirement superseding a revlog-related
	# requirement, we have to assume the repo is using revlog version 0.			# requirement, we have to assume the repo is using revlog version 0.
	# This revlog format is super old and we don't bother trying to parse			# This revlog format is super old and we don't bother trying to parse
	# opener options for it because those options wouldn't do anything			# opener options for it because those options wouldn't do anything
	# meaningful on such old repos.			# meaningful on such old repos.
	if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements:			if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements:
	options.update(resolverevlogstorevfsoptions(ui, requirements, features))			options.update(resolverevlogstorevfsoptions(ui, requirements, features))
				else: # explicitly mark repo as using revlogv0
				options['revlogv0'] = True

	return options			return options

	def resolverevlogstorevfsoptions(ui, requirements, features):			def resolverevlogstorevfsoptions(ui, requirements, features):
	"""Resolve opener options specific to revlogs."""			"""Resolve opener options specific to revlogs."""

	options = {}			options = {}
	options[b'flagprocessors'] = {}			options[b'flagprocessors'] = {}

mercurial/revlog.py

	opts = getattr(self.opener, 'options', {}) or {}			opts = getattr(self.opener, 'options', {}) or {}

	if 'revlogv2' in opts:			if 'revlogv2' in opts:
	newversionflags = REVLOGV2 \| FLAG_INLINE_DATA			newversionflags = REVLOGV2 \| FLAG_INLINE_DATA
	elif 'revlogv1' in opts:			elif 'revlogv1' in opts:
	newversionflags = REVLOGV1 \| FLAG_INLINE_DATA			newversionflags = REVLOGV1 \| FLAG_INLINE_DATA
	if 'generaldelta' in opts:			if 'generaldelta' in opts:
	newversionflags \|= FLAG_GENERALDELTA			newversionflags \|= FLAG_GENERALDELTA
	elif getattr(self.opener, 'options', None) is not None:			elif 'revlogv0' in getattr(self.opener, 'options', {}):
	# If options provided but no 'revlog*' found, the repository			# If options provided but no 'revlog*' found, the repository
	# would have no 'requires' file in it, which means we have to			# would have no 'requires' file in it, which means we have to
	# stick to the old format.			# stick to the old format.
				martinvonzUnsubmitted Not Done Needs updating martinvonz: Needs updating
	newversionflags = REVLOGV0			newversionflags = REVLOGV0
	else:			else:
	newversionflags = REVLOG_DEFAULT_VERSION			newversionflags = REVLOG_DEFAULT_VERSION

	if 'chunkcachesize' in opts:			if 'chunkcachesize' in opts:
	self._chunkcachesize = opts['chunkcachesize']			self._chunkcachesize = opts['chunkcachesize']
	if 'maxchainlen' in opts:			if 'maxchainlen' in opts:
	self._maxchainlen = opts['maxchainlen']			self._maxchainlen = opts['maxchainlen']