( )⚙ D4036 revlog: use specialized exception for ambiguous prefix lookup

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4036

revlog: use specialized exception for ambiguous prefix lookup
ClosedPublic

Authored by martinvonz on Aug 1 2018, 5:57 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdf0873ab5c14: revlog: use specialized exception for ambiguous prefix lookup
Summary

It's useful to be able to catch a specific exception for this
case. We'll use it soon.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (3 lines)
Mmercurial/localrepo.py (3 lines)
Mmercurial/revlog.py (9 lines)
Mmercurial/scmutil.py (4 lines)

Diff 9875

mercurial/error.py

RevlogError.__init__(self, '%s@%s: %s' % (index, name, message)) RevlogError.__init__(self, '%s@%s: %s' % (index, name, message))
def __bytes__(self): def __bytes__(self):
return RevlogError.__bytes__(self) return RevlogError.__bytes__(self)
def __str__(self): def __str__(self):
return RevlogError.__str__(self) return RevlogError.__str__(self)
class AmbiguousPrefixLookupError(LookupError):
pass
class FilteredLookupError(LookupError): class FilteredLookupError(LookupError):
pass pass
class ManifestLookupError(LookupError): class ManifestLookupError(LookupError):
pass pass
class CommandError(Exception): class CommandError(Exception):
"""Exception raised on errors in parsing the command line.""" """Exception raised on errors in parsing the command line."""

mercurial/localrepo.py

try: try:
return context.changectx(self, changeid) return context.changectx(self, changeid)
except error.WdirUnsupported: except error.WdirUnsupported:
return context.workingctx(self) return context.workingctx(self)
def __contains__(self, changeid): def __contains__(self, changeid):
"""True if the given changeid exists """True if the given changeid exists
error.LookupError is raised if an ambiguous node specified. error.AmbiguousPrefixLookupError is raised if an ambiguous node
specified.
""" """
try: try:
self[changeid] self[changeid]
return True return True
except error.RepoLookupError: except error.RepoLookupError:
return False return False
def __nonzero__(self): def __nonzero__(self):

mercurial/revlog.py

REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED
# max size of revlog with inline data # max size of revlog with inline data
_maxinline = 131072 _maxinline = 131072
_chunksize = 1048576 _chunksize = 1048576
RevlogError = error.RevlogError RevlogError = error.RevlogError
LookupError = error.LookupError LookupError = error.LookupError
AmbiguousPrefixLookupError = error.AmbiguousPrefixLookupError
CensoredNodeError = error.CensoredNodeError CensoredNodeError = error.CensoredNodeError
ProgrammingError = error.ProgrammingError 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,
} }
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 RevlogError: except 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 LookupError(id, self.indexfile, raise AmbiguousPrefixLookupError(id, self.indexfile,
_('ambiguous identifier')) _('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 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 LookupError(id, self.indexfile, raise AmbiguousPrefixLookupError(id, self.indexfile,
_('ambiguous identifier')) _('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:

mercurial/scmutil.py

try: try:
return disambiguate(cl.shortest(node, minlength)) return disambiguate(cl.shortest(node, minlength))
except error.LookupError: except error.LookupError:
raise error.RepoLookupError() raise error.RepoLookupError()
def isrevsymbol(repo, symbol): def isrevsymbol(repo, symbol):
"""Checks if a symbol exists in the repo. """Checks if a symbol exists in the repo.
See revsymbol() for details. Raises error.LookupError if the symbol is an See revsymbol() for details. Raises error.AmbiguousPrefixLookupError if the
ambiguous nodeid prefix. symbol is an ambiguous nodeid prefix.
""" """
try: try:
revsymbol(repo, symbol) revsymbol(repo, symbol)
return True return True
except error.RepoLookupError: except error.RepoLookupError:
return False return False
def revsymbol(repo, symbol): def revsymbol(repo, symbol):