| hg-reviewers |
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.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (12 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Jan 9 2019, 10:54 PM |
| 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 ' | ||||