| indygreg |
| hg-reviewers |
Follow-up to 7b2955624777 (scmutil: make shortesthexnodeidprefix()
take a full binary nodeid, 2018-04-14).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| if n is not None: | if n is not None: | ||||
| return n | return n | ||||
| 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, hexnode, minlength=1): | def shortest(self, node, minlength=1): | ||||
| """Find the shortest unambiguous prefix that matches hexnode.""" | """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 | ||||
| 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: | except error.RevlogError: | ||||
| return False | return False | ||||
| except error.WdirUnsupported: | except error.WdirUnsupported: | ||||
| # single 'ff...' match | # single 'ff...' match | ||||
| return True | return True | ||||
| 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): | ||||
| shortest = test | shortest = test | ||||
| if length == minlength or length > startlength: | if length == minlength or length > startlength: | ||||
| repo.changelog.rev(node) # make sure node isn't filtered | repo.changelog.rev(node) # make sure node isn't filtered | ||||
| return node | return node | ||||
| def shortesthexnodeidprefix(repo, node, minlength=1): | def shortesthexnodeidprefix(repo, node, minlength=1): | ||||
| """Find the shortest unambiguous prefix that matches hexnode.""" | """Find the shortest unambiguous prefix that matches hexnode.""" | ||||
| # _partialmatch() of filtered changelog could take O(len(repo)) time, | # _partialmatch() of filtered changelog could take O(len(repo)) time, | ||||
| # which would be unacceptably slow. so we look for hash collision in | # which would be unacceptably slow. so we look for hash collision in | ||||
| # unfiltered space, which means some hashes may be slightly longer. | # unfiltered space, which means some hashes may be slightly longer. | ||||
| return repo.unfiltered().changelog.shortest(hex(node), minlength) | return repo.unfiltered().changelog.shortest(node, minlength) | ||||
| 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.LookupError if the symbol is an | ||||
| ambiguous nodeid prefix. | ambiguous nodeid prefix. | ||||
| """ | """ | ||||
| try: | try: | ||||