##// END OF EJS Templates
cg4: introduce protocol flag to signify the presence of sidedata...
cg4: introduce protocol flag to signify the presence of sidedata We need a way of signaling whether the current revision has sidedata or not, and re-using the revision flags would waste potential revlog flags and mix two normally independent layers. In this change, we add a single byte at the start of the ch4 delta header to set potential protocol flags. We also reclaim the revlog flag for sidedata, since it is no longer used, in its place now lives the (also experimental) copytracing flag. When generating deltas, apply the `CG_FLAG_SIDEDATA` flag if there is sidedata. When applying the deltas, if said flag is present, the next chunk contains the sidedata. Differential Revision: https://phab.mercurial-scm.org/D10343

File last commit:

r47843:119790e1 default
r47843:119790e1 default
Show More
flagutil.py
194 lines | 7.3 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,
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO,
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 REVIDX_ISCENSORED,
REVIDX_RAWTEXT_CHANGING_FLAGS,
)
Augie Fackler
formatting: blacken the codebase...
r43346 from .. import error, util
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956
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
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO,
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 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,
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO: None,
flagutil: move the `flagprocessors` mapping in the new module...
r42955 }
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954
Augie Fackler
formatting: blacken the codebase...
r43346
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)
Augie Fackler
formatting: blacken the codebase...
r43346
flagutil: move insertflagprocessor to the new module (API)
r42957 def insertflagprocessor(flag, processor, flagprocessors):
if not flag & REVIDX_KNOWN_FLAGS:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot register processor on unknown flag '%#x'.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.ProgrammingError(msg)
if flag not in REVIDX_FLAGS_ORDER:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.ProgrammingError(msg)
if flag in flagprocessors:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot register multiple processors on flag '%#x'.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.Abort(msg)
flagprocessors[flag] = processor
flagutil: introduce a flagprocessorsmixin class...
r43140
Augie Fackler
formatting: blacken the codebase...
r43346
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 def processflagswrite(revlog, text, flags):
flagprocessors: make `processflagswrite` a module level function...
r43260 """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.
"""
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return _processflagsfunc(
revlog,
text,
flags,
b'write',
)[:2]
Augie Fackler
formatting: blacken the codebase...
r43346
flagprocessors: make `processflagswrite` a module level function...
r43260
flagprocessors: make `processflagsread` a module level function...
r43261 def processflagsread(revlog, text, flags):
"""Inspect revision data flags and applies read transformations defined
by registered flag processors.
``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.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return _processflagsfunc(revlog, text, flags, b'read')
flagprocessors: make `processflagsread` a module level function...
r43261
Augie Fackler
formatting: blacken the codebase...
r43346
flagprocessors: make `processflagsraw` a module level function...
r43262 def processflagsraw(revlog, 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.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return _processflagsfunc(revlog, text, flags, b'raw')[1]
flagprocessors: make `processflagsraw` a module level function...
r43262
Augie Fackler
formatting: blacken the codebase...
r43346
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 def _processflagsfunc(revlog, text, flags, operation):
flagprocessors: make `_processflagsfunc` a module level function...
r43259 """internal function to process flag on a revlog
flagprocessors: introduce specialized functions...
r43144
flagprocessors: make `_processflagsfunc` a module level function...
r43259 This function is private to this module, code should never needs to call it
directly."""
# fast path: no flag processors will run
if flags == 0:
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return text, True
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation not in (b'read', b'write', b'raw'):
raise error.ProgrammingError(_(b"invalid '%s' operation") % operation)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 # Check all flags are known.
if flags & ~REVIDX_KNOWN_FLAGS:
Augie Fackler
formatting: blacken the codebase...
r43346 raise revlog._flagserrorclass(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"incompatible revision flag '%#x'")
Augie Fackler
formatting: blacken the codebase...
r43346 % (flags & ~REVIDX_KNOWN_FLAGS)
)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 validatehash = True
# Depending on the operation (read or write), the order might be
# reversed due to non-commutative transforms.
orderedflags = REVIDX_FLAGS_ORDER
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation == b'write':
flagprocessors: make `_processflagsfunc` a module level function...
r43259 orderedflags = reversed(orderedflags)
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 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
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 if flag not in revlog._flagprocessors:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 message = _(b"missing processor for flag '%#x'") % flag
flagprocessors: make `_processflagsfunc` a module level function...
r43259 raise revlog._flagserrorclass(message)
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 processor = revlog._flagprocessors[flag]
if processor is not None:
readtransform, writetransform, rawtransform = processor
flagutil: introduce a flagprocessorsmixin class...
r43140
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation == b'raw':
flagprocessors: make `_processflagsfunc` a module level function...
r43259 vhash = rawtransform(revlog, text)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif operation == b'read':
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 text, vhash = readtransform(revlog, text)
Augie Fackler
formatting: blacken the codebase...
r43346 else: # write operation
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 text, vhash = writetransform(revlog, text)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 validatehash = validatehash and vhash
flagutil: introduce a flagprocessorsmixin class...
r43140
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return text, validatehash