| indygreg |
| hg-reviewers |
Sorry if this is considered churn, but "prefix" just seems much
clearer to me.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (14 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| 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(test): | def isvalid(prefix): | ||||
| try: | try: | ||||
| if self._partialmatch(test) is None: | if self._partialmatch(prefix) is None: | ||||
| return False | return False | ||||
| 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 | ||||
| try: | try: | ||||
| i = int(test) | 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 test[0] == '0' or i > len(self): | if prefix[0] == '0' or i > len(self): | ||||
| return True | return True | ||||
| return False | return False | ||||
| except ValueError: | except ValueError: | ||||
| return True | 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] | prefix = hexnode[:length] | ||||
| if isvalid(test): | if isvalid(prefix): | ||||
| shortest = test | shortest = prefix | ||||
| if length == minlength or length > startlength: | if length == minlength or length > startlength: | ||||
| return shortest | return shortest | ||||
| length -= 1 | length -= 1 | ||||
| else: | else: | ||||
| length += 1 | length += 1 | ||||
| if len(shortest) <= length: | if len(shortest) <= length: | ||||
| return shortest | return shortest | ||||