This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5564

revlog: use separate variables to track version flags
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3f807237dc94: revlog: use separate variables to track version flags
Summary

It wasn't obvious to me that "versionflags" is used both to
define the default version+features value for new revlogs and
to track the value read from a revlog.

We rename the former use and add explicit assignment of
"versionflags" later to differentiate between the two.

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.Jan 10 2019, 7:32 PM
yuja added a subscriber: yuja.Jan 12 2019, 10:24 PM

Queued up to this, thanks.

Closed by commit rHG3f807237dc94: revlog: use separate variables to track version flags (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 (12 lines)

Diff 13196

mercurial/revlog.py

self._loadindex() self._loadindex()
def _loadindex(self): def _loadindex(self):
mmapindexthreshold = None mmapindexthreshold = None
opts = getattr(self.opener, 'options', {}) or {} opts = getattr(self.opener, 'options', {}) or {}
if 'revlogv2' in opts: if 'revlogv2' in opts:
versionflags = REVLOGV2 | FLAG_INLINE_DATA newversionflags = REVLOGV2 | FLAG_INLINE_DATA
elif 'revlogv1' in opts: elif 'revlogv1' in opts:
versionflags = REVLOGV1 | FLAG_INLINE_DATA newversionflags = REVLOGV1 | FLAG_INLINE_DATA
if 'generaldelta' in opts: if 'generaldelta' in opts:
versionflags |= FLAG_GENERALDELTA newversionflags |= FLAG_GENERALDELTA
else: else:
versionflags = 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']
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 (mmapindexthreshold is not None and if (mmapindexthreshold is not None and
self.opener.fstat(f).st_size >= mmapindexthreshold): self.opener.fstat(f).st_size >= mmapindexthreshold):
indexdata = util.buffer(util.mmapread(f)) indexdata = util.buffer(util.mmapread(f))
else: else:
indexdata = f.read() indexdata = f.read()
if len(indexdata) > 0: if len(indexdata) > 0:
versionflags = versionformat_unpack(indexdata[:4])[0] versionflags = versionformat_unpack(indexdata[:4])[0]
self._initempty = False self._initempty = False
else:
versionflags = newversionflags
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
versionflags = newversionflags
self.version = versionflags self.version = versionflags
flags = versionflags & ~0xFFFF flags = versionflags & ~0xFFFF
fmt = versionflags & 0xFFFF fmt = versionflags & 0xFFFF
if fmt == REVLOGV0: if fmt == REVLOGV0:
if flags: if flags:
raise error.RevlogError(_('unknown flags (%#04x) in version %d ' raise error.RevlogError(_('unknown flags (%#04x) in version %d '