This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10600

revlog: directly use self._format_flags when loading index
ClosedPublic

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

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG58ef549ae55f: revlog: directly use self._format_flags 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 27515.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 (17 lines)

Diff 27845

mercurial/revlog.py

self._initempty = True self._initempty = True
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 self._format_flags = header & ~0xFFFF
self._format_version = header & 0xFFFF self._format_version = header & 0xFFFF
if self._format_version == REVLOGV0: if self._format_version == REVLOGV0:
if flags: if self._format_flags:
msg = _(b'unknown flags (%#04x) in version %d revlog %s') msg = _(b'unknown flags (%#04x) in version %d revlog %s')
msg %= (flags >> 16, self._format_version, self.display_id) display_flag = self._format_flags >> 16
msg %= (display_flag, self._format_version, self.display_id)
raise error.RevlogError(msg) raise error.RevlogError(msg)
self._inline = False self._inline = False
self._generaldelta = False self._generaldelta = False
elif self._format_version == REVLOGV1: elif self._format_version == REVLOGV1:
if flags & ~REVLOGV1_FLAGS: if self._format_flags & ~REVLOGV1_FLAGS:
msg = _(b'unknown flags (%#04x) in version %d revlog %s') msg = _(b'unknown flags (%#04x) in version %d revlog %s')
msg %= (flags >> 16, self._format_version, self.display_id) display_flag = self._format_flags >> 16
msg %= (display_flag, self._format_version, self.display_id)
raise error.RevlogError(msg) 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 self._format_version == REVLOGV2: elif self._format_version == REVLOGV2:
if flags & ~REVLOGV2_FLAGS: if self._format_flags & ~REVLOGV2_FLAGS:
msg = _(b'unknown flags (%#04x) in version %d revlog %s') msg = _(b'unknown flags (%#04x) in version %d revlog %s')
msg %= (flags >> 16, self._format_version, self.display_id) display_flag = self._format_flags >> 16
msg %= (display_flag, self._format_version, self.display_id)
raise error.RevlogError(msg) 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.