This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5560

revlog: rename v to versionflags
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6439cefaeb64: revlog: rename v to versionflags
Summary

Single letter variables are harder to read.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 10 2019, 7:32 PM
Closed by commit rHG6439cefaeb64: revlog: rename v to versionflags (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 (26 lines)

Diff 13156

mercurial/revlog.py

# 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
opts = getattr(opener, 'options', {}) or {} opts = getattr(opener, 'options', {}) or {}
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 versionflags = REVLOGV2 | FLAG_GENERALDELTA | FLAG_INLINE_DATA
elif 'revlogv1' in opts: elif 'revlogv1' in opts:
v = REVLOGV1 | FLAG_INLINE_DATA versionflags = REVLOGV1 | FLAG_INLINE_DATA
if 'generaldelta' in opts: if 'generaldelta' in opts:
v |= FLAG_GENERALDELTA versionflags |= FLAG_GENERALDELTA
else: else:
v = REVLOG_DEFAULT_VERSION versionflags = 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 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)
self._loadindex(v, mmapindexthreshold) self._loadindex(versionflags, mmapindexthreshold)
def _loadindex(self, v, mmapindexthreshold): def _loadindex(self, versionflags, mmapindexthreshold):
indexdata = '' indexdata = ''
self._initempty = True self._initempty = True
try: try:
with self._indexfp() as f: with self._indexfp() as f:
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:
v = versionformat_unpack(indexdata[:4])[0] versionflags = versionformat_unpack(indexdata[:4])[0]
self._initempty = False self._initempty = False
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
self.version = v self.version = versionflags
self._inline = v & FLAG_INLINE_DATA self._inline = versionflags & FLAG_INLINE_DATA
self._generaldelta = v & FLAG_GENERALDELTA self._generaldelta = versionflags & FLAG_GENERALDELTA
flags = v & ~0xFFFF flags = versionflags & ~0xFFFF
fmt = v & 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 '
'revlog %s') % 'revlog %s') %
(flags >> 16, fmt, self.indexfile)) (flags >> 16, fmt, self.indexfile))
elif fmt == REVLOGV1: elif fmt == REVLOGV1:
if flags & ~REVLOGV1_FLAGS: if flags & ~REVLOGV1_FLAGS:
raise error.RevlogError(_('unknown flags (%#04x) in version %d ' raise error.RevlogError(_('unknown flags (%#04x) in version %d '