This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3458

shortest: move some safe code out of exception block
ClosedPublic

Authored by martinvonz on May 7 2018, 12:55 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG858c7bfb3f49: shortest: move some safe code out of exception block
Summary

The RevlogError and WdirUnsupported could be raised by
_partialmatch(), but not by the rest of isvalid(), so let's move the
rest out to make it clearer.

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

martinvonz created this revision.May 7 2018, 12:55 PM
Closed by commit rHG858c7bfb3f49: shortest: move some safe code out of exception block (authored by martinvonz). · Explain WhyMay 8 2018, 8:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (21 lines)

Diff 8512

mercurial/revlog.py

raise LookupError(id, self.indexfile, _('no match found')) raise 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(test): def isvalid(test):
try: try:
if self._partialmatch(test) is None: if self._partialmatch(test) is None:
return False return False
except error.RevlogError:
return False
except error.WdirUnsupported:
# single 'ff...' match
return True
try: try:
i = int(test) i = int(test)
# if we are a pure int, then starting with zero will not be # if we are a pure int, then starting with zero will not be
# confused as a rev; or, obviously, if the int is larger # confused as a rev; or, obviously, if the int is larger
# than the value of the tip rev # than the value of the tip rev
if test[0] == '0' or i > len(self): if test[0] == '0' or i > len(self):
return True return True
return False return False
except ValueError: except ValueError:
return True return True
except error.RevlogError:
return False
except error.WdirUnsupported:
# single 'ff...' match
return True
hexnode = hex(node) hexnode = hex(node)
shortest = hexnode shortest = hexnode
startlength = max(6, minlength) startlength = max(6, minlength)
length = startlength length = startlength
while True: while True:
test = hexnode[:length] test = hexnode[:length]
if isvalid(test): if isvalid(test):