This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6934

revlog: explicitly set revlogv0 in vfs options
ClosedPublic

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

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
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.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
365–366

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

PathPackages
Mmercurial/localrepo.py (2 lines)
Mmercurial/revlog.py (5 lines)

Diff 16754

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

mmapindexthreshold = None mmapindexthreshold = None
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', {}):
martinvonzUnsubmitted
Not Done

Needs updating

martinvonz: Needs updating
# If options provided but no 'revlog*' found, the repository
# would have no 'requires' file in it, which means we have to
# stick to the old format.
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']