( )⚙ D10601 revlog: use "entry_point" phrasing for loading the revlog

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10601

revlog: use "entry_point" phrasing for loading the revlog
ClosedPublic

Authored by marmoute on May 3 2021, 7:51 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG21ef5f75edf0: revlog: use "entry_point" phrasing for loading the revlog
Summary

The main entry for the revlog will not necessary be the index, but a small
"docket". So we change the variable names and we move the initialisation of the
index_file and data_file after that first entry point have been read.

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.May 3 2021, 7:51 AM
baymax updated this revision to Diff 27516.May 3 2021, 9:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 11 2021, 10:11 AM
This revision is now accepted and ready to land.May 11 2021, 10:11 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (21 lines)

Diff 27847

mercurial/revlog.py

raise raise
return b'' return b''
def _loadindex(self): def _loadindex(self):
new_header, mmapindexthreshold, force_nodemap = self._init_opts() new_header, mmapindexthreshold, force_nodemap = self._init_opts()
if self.postfix is None: if self.postfix is None:
index_file = b'%s.i' % self.radix entry_point = b'%s.i' % self.radix
data_file = b'%s.d' % self.radix
elif self.postfix == b'a':
index_file = b'%s.i.a' % self.radix
data_file = b'%s.d' % self.radix
else: else:
index_file = b'%s.i.%s' % (self.radix, self.postfix) entry_point = b'%s.i.%s' % (self.radix, self.postfix)
data_file = b'%s.d.%s' % (self.radix, self.postfix)
self._indexfile = index_file
self._datafile = data_file
indexdata = b'' indexdata = b''
self._initempty = True self._initempty = True
indexdata = self._get_data(self._indexfile, mmapindexthreshold) indexdata = self._get_data(entry_point, mmapindexthreshold)
if len(indexdata) > 0: if len(indexdata) > 0:
header = INDEX_HEADER.unpack(indexdata[:4])[0] header = INDEX_HEADER.unpack(indexdata[:4])[0]
self._initempty = False self._initempty = False
else: else:
header = new_header header = new_header
self._format_flags = header & ~0xFFFF self._format_flags = header & ~0xFFFF
self._format_version = header & 0xFFFF self._format_version = header & 0xFFFF
# generaldelta implied by version 2 revlogs. # generaldelta implied by version 2 revlogs.
self._generaldelta = True self._generaldelta = True
else: else:
msg = _(b'unknown version (%d) in revlog %s') msg = _(b'unknown version (%d) in revlog %s')
msg %= (self._format_version, self.display_id) msg %= (self._format_version, self.display_id)
raise error.RevlogError(msg) raise error.RevlogError(msg)
self._indexfile = entry_point
if self.postfix is None or self.postfix == b'a':
self._datafile = b'%s.d' % self.radix
else:
self._datafile = b'%s.d.%s' % (self.radix, self.postfix)
self.nodeconstants = sha1nodeconstants self.nodeconstants = sha1nodeconstants
self.nullid = self.nodeconstants.nullid self.nullid = self.nodeconstants.nullid
# sparse-revlog can't be on without general-delta (issue6056) # sparse-revlog can't be on without general-delta (issue6056)
if not self._generaldelta: if not self._generaldelta:
self._sparserevlog = False self._sparserevlog = False
self._storedeltachains = True self._storedeltachains = True