This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4735

revlog: catch more specific exception in shortest()
ClosedPublic

Authored by yuja on Sep 25 2018, 9:33 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7a9e2d85f475: revlog: catch more specific exception in shortest()
Summary

Since revlog._partialmatch() catches RevlogError coming from cext and
re-raises AmbiguousPrefixLookupError, catching RevlogError here seems
less correct.

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.

Event Timeline

yuja created this revision.Sep 25 2018, 9:33 AM
Closed by commit rHG7a9e2d85f475: revlog: catch more specific exception in shortest() (authored by yuja). · Explain WhySep 25 2018, 12:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)

Diff 11351

mercurial/revlog.py

raise error.LookupError(id, self.indexfile, _('no match found')) raise error.LookupError(id, self.indexfile, _('no match found'))
def shortest(self, node, minlength=1): def shortest(self, node, minlength=1):
"""Find the shortest unambiguous prefix that matches node.""" """Find the shortest unambiguous prefix that matches node."""
def isvalid(prefix): def isvalid(prefix):
try: try:
node = self._partialmatch(prefix) node = self._partialmatch(prefix)
except error.RevlogError: except error.AmbiguousPrefixLookupError:
return False return False
except error.WdirUnsupported: except error.WdirUnsupported:
# single 'ff...' match # single 'ff...' match
return True return True
if node is None: if node is None:
raise error.LookupError(node, self.indexfile, _('no node')) raise error.LookupError(node, self.indexfile, _('no node'))
return True return True