This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3460

shortest: extract function for checking if a prefix is a revnum
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG890bdf0e33c8: shortest: extract function for checking if a prefix is a revnum
Summary

Much of isvalid() was about testing if a prefix is a valid revnum. I
want to reuse that soon, so let's move it out.

There is no significant slowdown from the function call overhead.

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/revlog.py (23 lines)

Diff 8514

mercurial/revlog.py

n = self._partialmatch(id) n = self._partialmatch(id)
if n: if n:
return n return n
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(prefix): def isrev(prefix):
try:
if self._partialmatch(prefix) is None:
return False
except error.RevlogError:
return False
except error.WdirUnsupported:
# single 'ff...' match
return True
try: try:
i = int(prefix) i = int(prefix)
# 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 prefix[0] == '0' or i > len(self): if prefix[0] == '0' or i > len(self):
return True
return False return False
return True
except ValueError: except ValueError:
return False
def isvalid(prefix):
try:
if self._partialmatch(prefix) is None:
return False
except error.RevlogError:
return False
except error.WdirUnsupported:
# single 'ff...' match
return True return True
return not isrev(prefix)
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:
prefix = hexnode[:length] prefix = hexnode[:length]
if isvalid(prefix): if isvalid(prefix):