This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6807

flagprocessors: small code update to clarify parameters
ClosedPublic

Authored by marmoute on Sep 7 2019, 5:27 AM.

Details

Reviewers
yuja
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3bed541aa65d: flagprocessors: small code update to clarify parameters
Summary

'raw' is really a third mode, not a small variant.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

marmoute created this revision.Sep 7 2019, 5:27 AM
indygreg accepted this revision.Sep 7 2019, 1:08 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/revlogutils/flagutil.py
163

I'm going to change this to use not in in flight.

This revision is now accepted and ready to land.Sep 7 2019, 1:08 PM
marmoute added a commit: rHG3bed541aa65d: flagprocessors: small code update to clarify parameters.Sep 7 2019, 1:09 PM
Closed by commit rHG3bed541aa65d: flagprocessors: small code update to clarify parameters (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/flagutil.py (8 lines)

Diff 16412

mercurial/revlogutils/flagutil.py

``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity. returned text should be checked for hash integrity.
""" """
return self._processflagsfunc(text, flags, 'read', raw=True)[1] return self._processflagsfunc(text, flags, 'raw')[1]
def _processflagsfunc(self, text, flags, operation, raw=False): def _processflagsfunc(self, text, flags, operation):
# fast path: no flag processors will run # fast path: no flag processors will run
if flags == 0: if flags == 0:
return text, True return text, True
if not operation in ('read', 'write'): if not operation in ('read', 'write', 'raw'):
indygregUnsubmitted
Not Done

I'm going to change this to use not in in flight.

indygreg: I'm going to change this to use `not in` in flight.
raise error.ProgrammingError(_("invalid '%s' operation") % raise error.ProgrammingError(_("invalid '%s' operation") %
operation) operation)
# Check all flags are known. # Check all flags are known.
if flags & ~REVIDX_KNOWN_FLAGS: if flags & ~REVIDX_KNOWN_FLAGS:
raise self._flagserrorclass(_("incompatible revision flag '%#x'") % raise self._flagserrorclass(_("incompatible revision flag '%#x'") %
(flags & ~REVIDX_KNOWN_FLAGS)) (flags & ~REVIDX_KNOWN_FLAGS))
validatehash = True validatehash = True
# Depending on the operation (read or write), the order might be # Depending on the operation (read or write), the order might be
if flag not in self._flagprocessors: if flag not in self._flagprocessors:
message = _("missing processor for flag '%#x'") % (flag) message = _("missing processor for flag '%#x'") % (flag)
raise self._flagserrorclass(message) raise self._flagserrorclass(message)
processor = self._flagprocessors[flag] processor = self._flagprocessors[flag]
if processor is not None: if processor is not None:
readtransform, writetransform, rawtransform = processor readtransform, writetransform, rawtransform = processor
if raw: if operation == 'raw':
vhash = rawtransform(self, text) vhash = rawtransform(self, text)
elif operation == 'read': elif operation == 'read':
text, vhash = readtransform(self, text) text, vhash = readtransform(self, text)
else: # write operation else: # write operation
text, vhash = writetransform(self, text) text, vhash = writetransform(self, text)
validatehash = validatehash and vhash validatehash = validatehash and vhash
return text, validatehash return text, validatehash