| hg-reviewers |
These should be lightly used and I doubt that will be any
strong objections to removing the aliases.
Note that some uses of ProgrammingError in this file use
translated messages. I'm pretty sure that's a bug. But the
linters don't complain, so meh.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (20 lines) | |||
| M | mercurial/revlogutils/deltas.py (4 lines) |
| # Aliased for performance. | # Aliased for performance. | ||||
| _zlibdecompress = zlib.decompress | _zlibdecompress = zlib.decompress | ||||
| # max size of revlog with inline data | # max size of revlog with inline data | ||||
| _maxinline = 131072 | _maxinline = 131072 | ||||
| _chunksize = 1048576 | _chunksize = 1048576 | ||||
| LookupError = error.LookupError | LookupError = error.LookupError | ||||
| AmbiguousPrefixLookupError = error.AmbiguousPrefixLookupError | |||||
| CensoredNodeError = error.CensoredNodeError | |||||
| ProgrammingError = error.ProgrammingError | |||||
| # Store flag processors (cf. 'addflagprocessor()' to register) | # Store flag processors (cf. 'addflagprocessor()' to register) | ||||
| _flagprocessors = { | _flagprocessors = { | ||||
| REVIDX_ISCENSORED: None, | REVIDX_ISCENSORED: None, | ||||
| } | } | ||||
| # Flag processors for REVIDX_ELLIPSIS. | # Flag processors for REVIDX_ELLIPSIS. | ||||
| def ellipsisreadprocessor(rl, text): | def ellipsisreadprocessor(rl, text): | ||||
| different booleans. And "raw" returns a same boolean as "write". | different booleans. And "raw" returns a same boolean as "write". | ||||
| Note: The 'raw' transform is used for changegroup generation and in some | Note: The 'raw' transform is used for changegroup generation and in some | ||||
| debug commands. In this case the transform only indicates whether the | debug commands. In this case the transform only indicates whether the | ||||
| contents can be used for hash integrity checks. | contents can be used for hash integrity checks. | ||||
| """ | """ | ||||
| if not flag & REVIDX_KNOWN_FLAGS: | if not flag & REVIDX_KNOWN_FLAGS: | ||||
| msg = _("cannot register processor on unknown flag '%#x'.") % (flag) | msg = _("cannot register processor on unknown flag '%#x'.") % (flag) | ||||
| raise ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| if flag not in REVIDX_FLAGS_ORDER: | if flag not in REVIDX_FLAGS_ORDER: | ||||
| msg = _("flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % (flag) | msg = _("flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % (flag) | ||||
| raise ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| if flag in _flagprocessors: | if flag in _flagprocessors: | ||||
| msg = _("cannot register multiple processors on flag '%#x'.") % (flag) | msg = _("cannot register multiple processors on flag '%#x'.") % (flag) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| _flagprocessors[flag] = processor | _flagprocessors[flag] = processor | ||||
| def getoffset(q): | def getoffset(q): | ||||
| return int(q >> 16) | return int(q >> 16) | ||||
| if maybewdir: | if maybewdir: | ||||
| # no 'ff...' match in radix tree, wdir identified | # no 'ff...' match in radix tree, wdir identified | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| return None | return None | ||||
| except error.RevlogError: | except error.RevlogError: | ||||
| # parsers.c radix tree lookup gave multiple matches | # parsers.c radix tree lookup gave multiple matches | ||||
| # fast path: for unfiltered changelog, radix tree is accurate | # fast path: for unfiltered changelog, radix tree is accurate | ||||
| if not getattr(self, 'filteredrevs', None): | if not getattr(self, 'filteredrevs', None): | ||||
| raise AmbiguousPrefixLookupError(id, self.indexfile, | raise error.AmbiguousPrefixLookupError( | ||||
| _('ambiguous identifier')) | id, self.indexfile, _('ambiguous identifier')) | ||||
| # fall through to slow path that filters hidden revisions | # fall through to slow path that filters hidden revisions | ||||
| except (AttributeError, ValueError): | except (AttributeError, ValueError): | ||||
| # we are pure python, or key was too short to search radix tree | # we are pure python, or key was too short to search radix tree | ||||
| pass | pass | ||||
| if id in self._pcache: | if id in self._pcache: | ||||
| return self._pcache[id] | return self._pcache[id] | ||||
| if len(id) <= 40: | if len(id) <= 40: | ||||
| try: | try: | ||||
| # hex(node)[:...] | # hex(node)[:...] | ||||
| l = len(id) // 2 # grab an even number of digits | l = len(id) // 2 # grab an even number of digits | ||||
| prefix = bin(id[:l * 2]) | prefix = bin(id[:l * 2]) | ||||
| nl = [e[7] for e in self.index if e[7].startswith(prefix)] | nl = [e[7] for e in self.index if e[7].startswith(prefix)] | ||||
| nl = [n for n in nl if hex(n).startswith(id) and | nl = [n for n in nl if hex(n).startswith(id) and | ||||
| self.hasnode(n)] | self.hasnode(n)] | ||||
| if nullhex.startswith(id): | if nullhex.startswith(id): | ||||
| nl.append(nullid) | nl.append(nullid) | ||||
| if len(nl) > 0: | if len(nl) > 0: | ||||
| if len(nl) == 1 and not maybewdir: | if len(nl) == 1 and not maybewdir: | ||||
| self._pcache[id] = nl[0] | self._pcache[id] = nl[0] | ||||
| return nl[0] | return nl[0] | ||||
| raise AmbiguousPrefixLookupError(id, self.indexfile, | raise error.AmbiguousPrefixLookupError( | ||||
| _('ambiguous identifier')) | id, self.indexfile, _('ambiguous identifier')) | ||||
| if maybewdir: | if maybewdir: | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| return None | return None | ||||
| except TypeError: | except TypeError: | ||||
| pass | pass | ||||
| def lookup(self, id): | def lookup(self, id): | ||||
| """locate a node based on: | """locate a node based on: | ||||
| p1, p2 = self.parentrevs(rev) | p1, p2 = self.parentrevs(rev) | ||||
| if deltap in (p1, p2): | if deltap in (p1, p2): | ||||
| return False | return False | ||||
| return self.issnapshot(deltap) | return self.issnapshot(deltap) | ||||
| def snapshotdepth(self, rev): | def snapshotdepth(self, rev): | ||||
| """number of snapshot in the chain before this one""" | """number of snapshot in the chain before this one""" | ||||
| if not self.issnapshot(rev): | if not self.issnapshot(rev): | ||||
| raise ProgrammingError('revision %d not a snapshot') | raise error.ProgrammingError('revision %d not a snapshot') | ||||
| return len(self._deltachain(rev)[0]) - 1 | return len(self._deltachain(rev)[0]) - 1 | ||||
| def revdiff(self, rev1, rev2): | def revdiff(self, rev1, rev2): | ||||
| """return or calculate a delta between two revisions | """return or calculate a delta between two revisions | ||||
| The delta calculated is in binary form and is intended to be written to | The delta calculated is in binary form and is intended to be written to | ||||
| revlog data directly. So this function needs raw revision data. | revlog data directly. So this function needs raw revision data. | ||||
| """ | """ | ||||
| Note: If the ``raw`` argument is set, it has precedence over the | Note: If the ``raw`` argument is set, it has precedence over the | ||||
| operation and will only update the value of ``validatehash``. | operation and will only update the value of ``validatehash``. | ||||
| """ | """ | ||||
| # 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'): | ||||
| raise ProgrammingError(_("invalid '%s' operation ") % (operation)) | raise error.ProgrammingError(_("invalid '%s' operation") % | ||||
| operation) | |||||
| # Check all flags are known. | # Check all flags are known. | ||||
| if flags & ~REVIDX_KNOWN_FLAGS: | if flags & ~REVIDX_KNOWN_FLAGS: | ||||
| raise error.RevlogError(_("incompatible revision flag '%#x'") % | raise error.RevlogError(_("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 | ||||
| # reversed due to non-commutative transforms. | # reversed due to non-commutative transforms. | ||||
| orderedflags = REVIDX_FLAGS_ORDER | orderedflags = REVIDX_FLAGS_ORDER | ||||
| attr, | attr, | ||||
| ) | ) | ||||
| from .. import ( | from .. import ( | ||||
| error, | error, | ||||
| mdiff, | mdiff, | ||||
| ) | ) | ||||
| CensoredNodeError = error.CensoredNodeError | |||||
| # maximum <delta-chain-data>/<revision-text-length> ratio | # maximum <delta-chain-data>/<revision-text-length> ratio | ||||
| LIMIT_DELTA2TEXT = 2 | LIMIT_DELTA2TEXT = 2 | ||||
| class _testrevlog(object): | class _testrevlog(object): | ||||
| """minimalist fake revlog to use in doctests""" | """minimalist fake revlog to use in doctests""" | ||||
| def __init__(self, data, density=0.5, mingap=0): | def __init__(self, data, density=0.5, mingap=0): | ||||
| """data is an list of revision payload boundaries""" | """data is an list of revision payload boundaries""" | ||||
| try: | try: | ||||
| res = revlog._processflags(fulltext, flags, 'read', raw=True) | res = revlog._processflags(fulltext, flags, 'read', raw=True) | ||||
| fulltext, validatehash = res | fulltext, validatehash = res | ||||
| if validatehash: | if validatehash: | ||||
| revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2) | revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2) | ||||
| if flags & REVIDX_ISCENSORED: | if flags & REVIDX_ISCENSORED: | ||||
| raise error.RevlogError(_('node %s is not censored') % expectednode) | raise error.RevlogError(_('node %s is not censored') % expectednode) | ||||
| except CensoredNodeError: | except error.CensoredNodeError: | ||||
| # must pass the censored index flag to add censored revisions | # must pass the censored index flag to add censored revisions | ||||
| if not flags & REVIDX_ISCENSORED: | if not flags & REVIDX_ISCENSORED: | ||||
| raise | raise | ||||
| return fulltext | return fulltext | ||||
| @attr.s(slots=True, frozen=True) | @attr.s(slots=True, frozen=True) | ||||
| class _deltainfo(object): | class _deltainfo(object): | ||||
| distance = attr.ib() | distance = attr.ib() | ||||