##// END OF EJS Templates
flagprocessors: add a `sidedata` parameters to _processflagswrite...
flagprocessors: add a `sidedata` parameters to _processflagswrite To read sidedata using flagprocessors, we need flag processors to store them. So we pass this information to the flag processing layer. Differential Revision: https://phab.mercurial-scm.org/D6815

File last commit:

r43257:36a0a195 default
r43257:36a0a195 default
Show More
flagutil.py
202 lines | 8.2 KiB | text/x-python | PythonLexer
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 # flagutils.py - code to deal with revlog flags and their processors
#
# Copyright 2016 Remi Chaintron <remi@fb.com>
# Copyright 2016-2019 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
flagutil: move insertflagprocessor to the new module (API)
r42957 from ..i18n import _
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 from .constants import (
REVIDX_DEFAULT_FLAGS,
REVIDX_ELLIPSIS,
REVIDX_EXTSTORED,
REVIDX_FLAGS_ORDER,
REVIDX_ISCENSORED,
REVIDX_RAWTEXT_CHANGING_FLAGS,
)
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956 from .. import (
flagutil: move insertflagprocessor to the new module (API)
r42957 error,
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956 util
)
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 # blanked usage of all the name to prevent pyflakes constraints
# We need these name available in the module for extensions.
REVIDX_ISCENSORED
REVIDX_ELLIPSIS
REVIDX_EXTSTORED
REVIDX_DEFAULT_FLAGS
REVIDX_FLAGS_ORDER
REVIDX_RAWTEXT_CHANGING_FLAGS
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956 REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)
flagutil: move the `flagprocessors` mapping in the new module...
r42955 # Store flag processors (cf. 'addflagprocessor()' to register)
flagprocessors = {
REVIDX_ISCENSORED: None,
}
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954
flagutil: move addflagprocessor to the new module (API)
r42958 def addflagprocessor(flag, processor):
"""Register a flag processor on a revision data flag.
Invariant:
- Flags need to be defined in REVIDX_KNOWN_FLAGS and REVIDX_FLAGS_ORDER,
and REVIDX_RAWTEXT_CHANGING_FLAGS if they can alter rawtext.
- Only one flag processor can be registered on a specific flag.
- flagprocessors must be 3-tuples of functions (read, write, raw) with the
following signatures:
- (read) f(self, rawtext) -> text, bool
- (write) f(self, text) -> rawtext, bool
- (raw) f(self, rawtext) -> bool
"text" is presented to the user. "rawtext" is stored in revlog data, not
directly visible to the user.
The boolean returned by these transforms is used to determine whether
the returned text can be used for hash integrity checking. For example,
if "write" returns False, then "text" is used to generate hash. If
"write" returns True, that basically means "rawtext" returned by "write"
should be used to generate hash. Usually, "write" and "read" return
different booleans. And "raw" returns a same boolean as "write".
Note: The 'raw' transform is used for changegroup generation and in some
debug commands. In this case the transform only indicates whether the
contents can be used for hash integrity checks.
"""
insertflagprocessor(flag, processor, flagprocessors)
flagutil: move insertflagprocessor to the new module (API)
r42957 def insertflagprocessor(flag, processor, flagprocessors):
if not flag & REVIDX_KNOWN_FLAGS:
msg = _("cannot register processor on unknown flag '%#x'.") % (flag)
raise error.ProgrammingError(msg)
if flag not in REVIDX_FLAGS_ORDER:
msg = _("flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % (flag)
raise error.ProgrammingError(msg)
if flag in flagprocessors:
msg = _("cannot register multiple processors on flag '%#x'.") % (flag)
raise error.Abort(msg)
flagprocessors[flag] = processor
flagutil: introduce a flagprocessorsmixin class...
r43140
class flagprocessorsmixin(object):
"""basic mixin to support revlog flag processing
Make sure the `_flagprocessors` attribute is set at ``__init__`` time.
See the documentation of the ``_processflags`` method for details.
"""
flagutil: make the error class used by the mixin configurable...
r43142 _flagserrorclass = error.RevlogError
flagutil: introduce a flagprocessorsmixin class...
r43140 def _processflags(self, text, flags, operation, raw=False):
flagprocessors: introduce specialized functions...
r43144 """deprecated entry point to access flag processors"""
flagprocessors: deprecate _processflags...
r43150 msg = ('_processflag(...) use the specialized variant')
util.nouideprecwarn(msg, '5.2', stacklevel=2)
flagprocessors: introduce specialized functions...
r43144 if raw:
return text, self._processflagsraw(text, flags)
elif operation == 'read':
return self._processflagsread(text, flags)
else: # write operation
return self._processflagswrite(text, flags)
def _processflagsread(self, text, flags):
"""Inspect revision data flags and applies read transformations defined
by registered flag processors.
flagutil: introduce a flagprocessorsmixin class...
r43140
``text`` - the revision data to process
``flags`` - the revision flags
``raw`` - an optional argument describing if the raw transform should be
applied.
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
flagprocessors: introduce specialized functions...
r43144 """
flagprocessors: return flagdata in the main processing function...
r43254 return self._processflagsfunc(text, flags, 'read')
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: add a `sidedata` parameters to _processflagswrite...
r43257 def _processflagswrite(self, text, flags, sidedata):
flagprocessors: introduce specialized functions...
r43144 """Inspect revision data flags and applies write transformations defined
by registered flag processors.
``text`` - the revision data to process
``flags`` - the revision flags
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
flagutil: introduce a flagprocessorsmixin class...
r43140 """
flagprocessors: add a `sidedata` parameters to _processflagswrite...
r43257 assert not sidedata # XXX until it is actually processed
flagprocessors: return flagdata in the main processing function...
r43254 return self._processflagsfunc(text, flags, 'write')[:2]
flagprocessors: introduce specialized functions...
r43144
def _processflagsraw(self, text, flags):
"""Inspect revision data flags to check is the content hash should be
validated.
``text`` - the revision data to process
``flags`` - the revision flags
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
flagprocessors: small code update to clarify parameters...
r43151 return self._processflagsfunc(text, flags, 'raw')[1]
flagprocessors: introduce specialized functions...
r43144
flagprocessors: small code update to clarify parameters...
r43151 def _processflagsfunc(self, text, flags, operation):
flagutil: introduce a flagprocessorsmixin class...
r43140 # fast path: no flag processors will run
if flags == 0:
flagprocessors: return flagdata in the main processing function...
r43254 return text, True, {}
flagprocessors: small code update to clarify parameters...
r43151 if operation not in ('read', 'write', 'raw'):
flagutil: introduce a flagprocessorsmixin class...
r43140 raise error.ProgrammingError(_("invalid '%s' operation") %
operation)
# Check all flags are known.
if flags & ~REVIDX_KNOWN_FLAGS:
flagutil: make the error class used by the mixin configurable...
r43142 raise self._flagserrorclass(_("incompatible revision flag '%#x'") %
(flags & ~REVIDX_KNOWN_FLAGS))
flagutil: introduce a flagprocessorsmixin class...
r43140 validatehash = True
# Depending on the operation (read or write), the order might be
# reversed due to non-commutative transforms.
orderedflags = REVIDX_FLAGS_ORDER
if operation == 'write':
orderedflags = reversed(orderedflags)
flagprocessors: return flagdata in the main processing function...
r43254 outsidedata = {}
flagutil: introduce a flagprocessorsmixin class...
r43140 for flag in orderedflags:
# If a flagprocessor has been registered for a known flag, apply the
# related operation transform and update result tuple.
if flag & flags:
vhash = True
if flag not in self._flagprocessors:
message = _("missing processor for flag '%#x'") % (flag)
flagutil: make the error class used by the mixin configurable...
r43142 raise self._flagserrorclass(message)
flagutil: introduce a flagprocessorsmixin class...
r43140
processor = self._flagprocessors[flag]
if processor is not None:
readtransform, writetransform, rawtransform = processor
flagprocessors: small code update to clarify parameters...
r43151 if operation == 'raw':
flagutil: introduce a flagprocessorsmixin class...
r43140 vhash = rawtransform(self, text)
elif operation == 'read':
flagprocessors: have the read transform function return side data (API)...
r43255 text, vhash, s = readtransform(self, text)
outsidedata.update(s)
flagutil: introduce a flagprocessorsmixin class...
r43140 else: # write operation
text, vhash = writetransform(self, text)
validatehash = validatehash and vhash
flagprocessors: return flagdata in the main processing function...
r43254 return text, validatehash, outsidedata