This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10800

revlog: allow to pass an existing docket to `_loadindex()`
ClosedPublic

Authored by marmoute on May 30 2021, 1:30 PM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf7f082bc0e7c: revlog: allow to pass an existing docket to `_loadindex()`
Summary

This will be when switching undelying files, for examples during censors and strip operation with rvlog-v2.

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 30 2021, 1:30 PM
baymax updated this revision to Diff 28313.May 31 2021, 6:51 AM

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

Alphare accepted this revision as: Alphare.May 31 2021, 10:51 AM
baymax updated this revision to Diff 28328.May 31 2021, 4:21 PM

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

baymax updated this revision to Diff 28410.Jun 1 2021, 11:17 PM

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

baymax updated this revision to Diff 28425.Jun 2 2021, 7:43 AM

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

baymax updated this revision to Diff 28459.Jun 4 2021, 11:05 AM

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

baymax updated this revision to Diff 28481.Jun 7 2021, 5:17 AM

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

marmoute added a commit: rHGf7f082bc0e7c: revlog: allow to pass an existing docket to `_loadindex()`.Jun 7 2021, 5:26 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf7f082bc0e7c: revlog: allow to pass an existing docket to `_loadindex()` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (82 lines)

Diff 28503

mercurial/revlog.py

return fp.read() return fp.read()
else: else:
return fp.read(size) return fp.read(size)
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
return b'' return b''
def _loadindex(self): def _loadindex(self, docket=None):
new_header, mmapindexthreshold, force_nodemap = self._init_opts() new_header, mmapindexthreshold, force_nodemap = self._init_opts()
if self.postfix is not None: if self.postfix is not None:
entry_point = b'%s.i.%s' % (self.radix, self.postfix) entry_point = b'%s.i.%s' % (self.radix, self.postfix)
elif self._trypending and self.opener.exists(b'%s.i.a' % self.radix): elif self._trypending and self.opener.exists(b'%s.i.a' % self.radix):
entry_point = b'%s.i.a' % self.radix entry_point = b'%s.i.a' % self.radix
else: else:
entry_point = b'%s.i' % self.radix entry_point = b'%s.i' % self.radix
if docket is not None:
self._docket = docket
self._docket_file = entry_point
else:
entry_data = b'' entry_data = b''
self._initempty = True self._initempty = True
entry_data = self._get_data(entry_point, mmapindexthreshold) entry_data = self._get_data(entry_point, mmapindexthreshold)
if len(entry_data) > 0: if len(entry_data) > 0:
header = INDEX_HEADER.unpack(entry_data[:4])[0] header = INDEX_HEADER.unpack(entry_data[: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
supported_flags = SUPPORTED_FLAGS.get(self._format_version) supported_flags = SUPPORTED_FLAGS.get(self._format_version)
if supported_flags is None: if supported_flags is None:
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)
elif self._format_flags & ~supported_flags: elif self._format_flags & ~supported_flags:
msg = _(b'unknown flags (%#04x) in version %d revlog %s') msg = _(b'unknown flags (%#04x) in version %d revlog %s')
display_flag = self._format_flags >> 16 display_flag = self._format_flags >> 16
msg %= (display_flag, self._format_version, self.display_id) msg %= (display_flag, self._format_version, self.display_id)
raise error.RevlogError(msg) raise error.RevlogError(msg)
features = FEATURES_BY_VERSION[self._format_version] features = FEATURES_BY_VERSION[self._format_version]
self._inline = features[b'inline'](self._format_flags) self._inline = features[b'inline'](self._format_flags)
self._generaldelta = features[b'generaldelta'](self._format_flags) self._generaldelta = features[b'generaldelta'](self._format_flags)
self.hassidedata = features[b'sidedata'] self.hassidedata = features[b'sidedata']
if not features[b'docket']: if not features[b'docket']:
self._indexfile = entry_point self._indexfile = entry_point
index_data = entry_data index_data = entry_data
else: else:
self._docket_file = entry_point self._docket_file = entry_point
if self._initempty: if self._initempty:
self._docket = docketutil.default_docket(self, header) self._docket = docketutil.default_docket(self, header)
else: else:
self._docket = docketutil.parse_docket( self._docket = docketutil.parse_docket(
self, entry_data, use_pending=self._trypending self, entry_data, use_pending=self._trypending
) )
if self._docket is not None:
self._indexfile = self._docket.index_filepath() self._indexfile = self._docket.index_filepath()
index_data = b'' index_data = b''
index_size = self._docket.index_end index_size = self._docket.index_end
if index_size > 0: if index_size > 0:
index_data = self._get_data( index_data = self._get_data(
self._indexfile, mmapindexthreshold, size=index_size self._indexfile, mmapindexthreshold, size=index_size
) )
if len(index_data) < index_size: if len(index_data) < index_size: