This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5559

revlog: always process opener options
ClosedPublic

Authored by indygreg on Jan 10 2019, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcecf3f8bccd3: revlog: always process opener options
Summary

I'm not sure when `opener.options` would ever be explicitly
set to None. It is definitely not possible to construct a repo
this way because `localrepo.resolvestorevfsoptions()` always
returns a dict and `localrepo.makelocalrepository()` always
sets `opener.options` to this value.

Because we always execute this code now, if options are empty
we defaulted to creating version 0 revlogs. So we had to change
the code slightly to fall back to the default revlog version
and flags.

As astute reader will note that it is not possible to create
version 0 revlogs now. However, I don't think it was possible
before, as this required `opener.options` being unset, which
I don't think was possible. I suspect this means our test
coverage for version 0 revlog repositories is possibly
non-existent! Since I don't see a config option to disable
revlog v1, I'm not even sure if we had a way to create new
repos with version 0 revlogs! Who knows.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 10 2019, 7:32 PM
yuja added a subscriber: yuja.Jan 12 2019, 10:25 PM
I'm not sure when ``opener.options`` would ever be explicitly
set to None. It is definitely not possible to construct a repo
this way because ``localrepo.resolvestorevfsoptions()`` always
returns a dict and ``localrepo.makelocalrepository()`` always
sets ``opener.options`` to this value.
Because we always execute this code now, if options are empty
we defaulted to creating version 0 revlogs. So we had to change
the code slightly to fall back to the default revlog version
and flags.
As astute reader will note that it is not possible to create
version 0 revlogs now. However, I don't think it was possible
before, as this required ``opener.options`` being unset, which
I don't think was possible. I suspect this means our test
coverage for version 0 revlog repositories is possibly
non-existent! Since I don't see a config option to disable
revlog v1, I'm not even sure if we had a way to create new
repos with version 0 revlogs! Who knows.

Well, there was a trick to create a v0 repo, which dda11e799529 uses.

$ mkdir .hg

This patch looks good as itself, but we need to resurrect some trick
to create a v0 revlog.

Closed by commit rHGcecf3f8bccd3: revlog: always process opener options (authored by indygreg). · Explain WhyJan 12 2019, 10:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (77 lines)

Diff 13155

mercurial/revlog.py

# Make copy of flag processors so each revlog instance can support # Make copy of flag processors so each revlog instance can support
# custom flags. # custom flags.
self._flagprocessors = dict(_flagprocessors) self._flagprocessors = dict(_flagprocessors)
# 2-tuple of file handles being used for active writing. # 2-tuple of file handles being used for active writing.
self._writinghandles = None self._writinghandles = None
mmapindexthreshold = None mmapindexthreshold = None
v = REVLOG_DEFAULT_VERSION opts = getattr(opener, 'options', {}) or {}
opts = getattr(opener, 'options', None)
if opts is not None:
if 'revlogv2' in opts: if 'revlogv2' in opts:
# version 2 revlogs always use generaldelta. # version 2 revlogs always use generaldelta.
v = REVLOGV2 | FLAG_GENERALDELTA | FLAG_INLINE_DATA v = REVLOGV2 | FLAG_GENERALDELTA | FLAG_INLINE_DATA
elif 'revlogv1' in opts: elif 'revlogv1' in opts:
v = REVLOGV1 | FLAG_INLINE_DATA
if 'generaldelta' in opts: if 'generaldelta' in opts:
v |= FLAG_GENERALDELTA v |= FLAG_GENERALDELTA
else: else:
v = 0 v = 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']
if 'deltabothparents' in opts: if 'deltabothparents' in opts:
self._deltabothparents = opts['deltabothparents'] self._deltabothparents = opts['deltabothparents']
self._lazydeltabase = bool(opts.get('lazydeltabase', False)) self._lazydeltabase = bool(opts.get('lazydeltabase', False))
if 'compengine' in opts: if 'compengine' in opts:
self._compengine = opts['compengine'] self._compengine = opts['compengine']
if 'maxdeltachainspan' in opts: if 'maxdeltachainspan' in opts:
self._maxdeltachainspan = opts['maxdeltachainspan'] self._maxdeltachainspan = opts['maxdeltachainspan']
if mmaplargeindex and 'mmapindexthreshold' in opts: if mmaplargeindex and 'mmapindexthreshold' in opts:
mmapindexthreshold = opts['mmapindexthreshold'] mmapindexthreshold = opts['mmapindexthreshold']
self._sparserevlog = bool(opts.get('sparse-revlog', False)) self._sparserevlog = bool(opts.get('sparse-revlog', False))
withsparseread = bool(opts.get('with-sparse-read', False)) withsparseread = bool(opts.get('with-sparse-read', False))
# sparse-revlog forces sparse-read # sparse-revlog forces sparse-read
self._withsparseread = self._sparserevlog or withsparseread self._withsparseread = self._sparserevlog or withsparseread
if 'sparse-read-density-threshold' in opts: if 'sparse-read-density-threshold' in opts:
self._srdensitythreshold = opts['sparse-read-density-threshold'] self._srdensitythreshold = opts['sparse-read-density-threshold']
if 'sparse-read-min-gap-size' in opts: if 'sparse-read-min-gap-size' in opts:
self._srmingapsize = opts['sparse-read-min-gap-size'] self._srmingapsize = opts['sparse-read-min-gap-size']
if opts.get('enableellipsis'): if opts.get('enableellipsis'):
self._flagprocessors[REVIDX_ELLIPSIS] = ellipsisprocessor self._flagprocessors[REVIDX_ELLIPSIS] = ellipsisprocessor
# revlog v0 doesn't have flag processors # revlog v0 doesn't have flag processors
for flag, processor in opts.get(b'flagprocessors', {}).iteritems(): for flag, processor in opts.get(b'flagprocessors', {}).iteritems():
_insertflagprocessor(flag, processor, self._flagprocessors) _insertflagprocessor(flag, processor, self._flagprocessors)
if self._chunkcachesize <= 0: if self._chunkcachesize <= 0:
raise error.RevlogError(_('revlog chunk cache size %r is not ' raise error.RevlogError(_('revlog chunk cache size %r is not '
'greater than 0') % self._chunkcachesize) 'greater than 0') % self._chunkcachesize)
elif self._chunkcachesize & (self._chunkcachesize - 1): elif self._chunkcachesize & (self._chunkcachesize - 1):
raise error.RevlogError(_('revlog chunk cache size %r is not a ' raise error.RevlogError(_('revlog chunk cache size %r is not a '
'power of 2') % self._chunkcachesize) 'power of 2') % self._chunkcachesize)