( )⚙ D10622 revlog: unify flag processing when loading index

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10622

revlog: unify flag processing when loading index
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG4d1c893b9095: revlog: unify flag processing when loading index
Summary

The new code use a simple declaration to do centralised processing. This is
clearer, shorter and less error prone. This will be especially useful as we plan
to add a fourth format: changelog-v2.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.May 3 2021, 7:54 AM
baymax updated this revision to Diff 27537.May 3 2021, 9:45 PM

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

baymax updated this revision to Diff 27868.May 11 2021, 1:43 PM

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

baymax updated this revision to Diff 27994.May 17 2021, 7:02 AM

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

marmoute added a commit: rHG4d1c893b9095: revlog: unify flag processing when loading index.May 17 2021, 9:00 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4d1c893b9095: revlog: unify flag processing when loading index (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (23 lines)
Mmercurial/revlogutils/constants.py (30 lines)

Diff 27537

mercurial/revlog.py

sha1nodeconstants, sha1nodeconstants,
short, short,
wdirrev, wdirrev,
) )
from .i18n import _ from .i18n import _
from .pycompat import getattr from .pycompat import getattr
from .revlogutils.constants import ( from .revlogutils.constants import (
ALL_KINDS, ALL_KINDS,
FEATURES_BY_VERSION,
FLAG_GENERALDELTA, FLAG_GENERALDELTA,
FLAG_INLINE_DATA, FLAG_INLINE_DATA,
INDEX_HEADER, INDEX_HEADER,
REVLOGV0, REVLOGV0,
REVLOGV1, REVLOGV1,
REVLOGV1_FLAGS, REVLOGV1_FLAGS,
REVLOGV2, REVLOGV2,
REVLOGV2_FLAGS, REVLOGV2_FLAGS,
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)
if self._format_version == REVLOGV0: features = FEATURES_BY_VERSION[self._format_version]
self._inline = False self._inline = features[b'inline'](self._format_flags)
self._generaldelta = False self._generaldelta = features[b'generaldelta'](self._format_flags)
elif self._format_version == REVLOGV1: self.hassidedata = features[b'sidedata']
self._inline = self._format_flags & FLAG_INLINE_DATA
self._generaldelta = self._format_flags & FLAG_GENERALDELTA
elif self._format_version == REVLOGV2:
# 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
# it's fixed, since v2 revlogs sometimes get rewritten on exchange.
# See issue6485
self._inline = False
# generaldelta implied by version 2 revlogs.
self._generaldelta = True
# revlog-v2 has built in sidedata support
self.hassidedata = True
else:
assert False, 'unreachable'
index_data = entry_data index_data = entry_data
self._indexfile = entry_point self._indexfile = entry_point
if self.postfix is None or self.postfix == b'a': if self.postfix is None or self.postfix == b'a':
self._datafile = b'%s.d' % self.radix self._datafile = b'%s.d' % self.radix
else: else:
self._datafile = b'%s.d.%s' % (self.radix, self.postfix) self._datafile = b'%s.d.%s' % (self.radix, self.postfix)

mercurial/revlogutils/constants.py

REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED
SUPPORTED_FLAGS = { SUPPORTED_FLAGS = {
REVLOGV0: REVLOGV0_FLAGS, REVLOGV0: REVLOGV0_FLAGS,
REVLOGV1: REVLOGV1_FLAGS, REVLOGV1: REVLOGV1_FLAGS,
REVLOGV2: REVLOGV2_FLAGS, REVLOGV2: REVLOGV2_FLAGS,
} }
_no = lambda flags: False
_yes = lambda flags: True
def _from_flag(flag):
return lambda flags: bool(flags & flag)
FEATURES_BY_VERSION = {
REVLOGV0: {
b'inline': _no,
b'generaldelta': _no,
b'sidedata': False,
},
REVLOGV1: {
b'inline': _from_flag(FLAG_INLINE_DATA),
b'generaldelta': _from_flag(FLAG_GENERALDELTA),
b'sidedata': False,
},
REVLOGV2: {
# 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
# it's fixed, since v2 revlogs sometimes get rewritten on exchange.
# See issue6485
b'inline': _no,
b'generaldelta': _yes,
b'sidedata': True,
},
}
SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000 SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000