This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10599

revlog: directly use self._format_version when loading index
ClosedPublic

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

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHGef7a8a1622ad: revlog: directly use self._format_version when loading index
Summary

The shorthand variable does not bring much, so we drop it to simplify the code.

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 27514.May 3 2021, 9:44 PM

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

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

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (39 lines)

Diff 27846

mercurial/revlog.py

indexdata = self._get_data(self._indexfile, mmapindexthreshold) indexdata = self._get_data(self._indexfile, 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
flags = self._format_flags = header & ~0xFFFF flags = self._format_flags = header & ~0xFFFF
fmt = self._format_version = header & 0xFFFF self._format_version = header & 0xFFFF
if fmt == REVLOGV0: if self._format_version == REVLOGV0:
if flags: if flags:
raise error.RevlogError( msg = _(b'unknown flags (%#04x) in version %d revlog %s')
_(b'unknown flags (%#04x) in version %d revlog %s') msg %= (flags >> 16, self._format_version, self.display_id)
% (flags >> 16, fmt, self.display_id) raise error.RevlogError(msg)
)
self._inline = False self._inline = False
self._generaldelta = False self._generaldelta = False
elif fmt == REVLOGV1: elif self._format_version == REVLOGV1:
if flags & ~REVLOGV1_FLAGS: if flags & ~REVLOGV1_FLAGS:
raise error.RevlogError( msg = _(b'unknown flags (%#04x) in version %d revlog %s')
_(b'unknown flags (%#04x) in version %d revlog %s') msg %= (flags >> 16, self._format_version, self.display_id)
% (flags >> 16, fmt, self.display_id) raise error.RevlogError(msg)
)
self._inline = self._format_flags & FLAG_INLINE_DATA self._inline = self._format_flags & FLAG_INLINE_DATA
self._generaldelta = self._format_flags & FLAG_GENERALDELTA self._generaldelta = self._format_flags & FLAG_GENERALDELTA
elif fmt == REVLOGV2: elif self._format_version == REVLOGV2:
if flags & ~REVLOGV2_FLAGS: if flags & ~REVLOGV2_FLAGS:
raise error.RevlogError( msg = _(b'unknown flags (%#04x) in version %d revlog %s')
_(b'unknown flags (%#04x) in version %d revlog %s') msg %= (flags >> 16, self._format_version, self.display_id)
% (flags >> 16, fmt, self.display_id) raise error.RevlogError(msg)
)
# There is a bug in the transaction handling when going from an # There is a bug in the transaction handling when going from an
# inline revlog to a separate index and data file. Turn it off until # inline revlog to a separate index and data file. Turn it off until
# it's fixed, since v2 revlogs sometimes get rewritten on exchange. # it's fixed, since v2 revlogs sometimes get rewritten on exchange.
# See issue6485 # See issue6485
self._inline = False self._inline = False
# generaldelta implied by version 2 revlogs. # generaldelta implied by version 2 revlogs.
self._generaldelta = True self._generaldelta = True
else: else:
raise error.RevlogError( msg = _(b'unknown version (%d) in revlog %s')
_(b'unknown version (%d) in revlog %s') % (fmt, self.display_id) msg %= (self._format_version, self.display_id)
) raise error.RevlogError(msg)
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
if self._nodemap_file is not None: if self._nodemap_file is not None:
use_rust_index = True use_rust_index = True
else: else:
use_rust_index = self.opener.options.get(b'rust.index') use_rust_index = self.opener.options.get(b'rust.index')
self._parse_index = parse_index_v1 self._parse_index = parse_index_v1
if self._format_version == REVLOGV0: if self._format_version == REVLOGV0:
self._parse_index = revlogv0.parse_index_v0 self._parse_index = revlogv0.parse_index_v0
elif fmt == REVLOGV2: elif self._format_version == REVLOGV2:
self._parse_index = parse_index_v2 self._parse_index = parse_index_v2
elif devel_nodemap: elif devel_nodemap:
self._parse_index = parse_index_v1_nodemap self._parse_index = parse_index_v1_nodemap
elif use_rust_index: elif use_rust_index:
self._parse_index = parse_index_v1_mixed self._parse_index = parse_index_v1_mixed
try: try:
d = self._parse_index(indexdata, self._inline) d = self._parse_index(indexdata, self._inline)
index, _chunkcache = d index, _chunkcache = d