( )⚙ D10740 revlog: avoid raising no-arg RevlogError for internal flow control

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10740

revlog: avoid raising no-arg RevlogError for internal flow control
ClosedPublic

Authored by martinvonz on May 19 2021, 1:47 AM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG93a0abe098e7: revlog: avoid raising no-arg RevlogError for internal flow control
Summary

I'm about to make RevlogError require a message argument and this
code was failing. This patch refactors it to not raise an exception
for intra-function flow control.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (19 lines)

Diff 28088

mercurial/revlog.py

self.rev(node) self.rev(node)
return node return node
except (TypeError, error.LookupError): except (TypeError, error.LookupError):
pass pass
def _partialmatch(self, id): def _partialmatch(self, id):
# we don't care wdirfilenodeids as they should be always full hash # we don't care wdirfilenodeids as they should be always full hash
maybewdir = self.nodeconstants.wdirhex.startswith(id) maybewdir = self.nodeconstants.wdirhex.startswith(id)
ambiguous = False
try: try:
partial = self.index.partialmatch(id) partial = self.index.partialmatch(id)
if partial and self.hasnode(partial): if partial and self.hasnode(partial):
if maybewdir: if maybewdir:
# single 'ff...' match in radix tree, ambiguous with wdir # single 'ff...' match in radix tree, ambiguous with wdir
raise error.RevlogError ambiguous = True
else:
return partial return partial
if maybewdir: elif maybewdir:
# no 'ff...' match in radix tree, wdir identified # no 'ff...' match in radix tree, wdir identified
raise error.WdirUnsupported raise error.WdirUnsupported
else:
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 error.AmbiguousPrefixLookupError( ambiguous = True
id, self.display_id, _(b'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 ambiguous:
raise error.AmbiguousPrefixLookupError(
id, self.display_id, _(b'ambiguous identifier')
)
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