| indygreg | |
| Alphare |
| hg-reviewers |
| 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 (4 lines) |
| # no 'ff...' match in radix tree, wdir identified | # no 'ff...' match in radix tree, wdir identified | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| return None | return None | ||||
| except error.RevlogError: | except error.RevlogError: | ||||
| # parsers.c radix tree lookup gave multiple matches | # parsers.c radix tree lookup gave multiple matches | ||||
| # fast path: for unfiltered changelog, radix tree is accurate | # fast path: for unfiltered changelog, radix tree is accurate | ||||
| if not getattr(self, 'filteredrevs', None): | if not getattr(self, 'filteredrevs', None): | ||||
| raise error.AmbiguousPrefixLookupError( | raise error.AmbiguousPrefixLookupError( | ||||
| id, self._indexfile, _(b'ambiguous identifier') | id, self.display_id, _(b'ambiguous identifier') | ||||
| ) | ) | ||||
| # fall through to slow path that filters hidden revisions | # fall through to slow path that filters hidden revisions | ||||
| except (AttributeError, ValueError): | except (AttributeError, ValueError): | ||||
| # we are pure python, or key was too short to search radix tree | # we are pure python, or key was too short to search radix tree | ||||
| pass | pass | ||||
| if id in self._pcache: | if id in self._pcache: | ||||
| return self._pcache[id] | return self._pcache[id] | ||||
| ] | ] | ||||
| if self.nodeconstants.nullhex.startswith(id): | if self.nodeconstants.nullhex.startswith(id): | ||||
| nl.append(self.nullid) | nl.append(self.nullid) | ||||
| if len(nl) > 0: | if len(nl) > 0: | ||||
| if len(nl) == 1 and not maybewdir: | if len(nl) == 1 and not maybewdir: | ||||
| self._pcache[id] = nl[0] | self._pcache[id] = nl[0] | ||||
| return nl[0] | return nl[0] | ||||
| raise error.AmbiguousPrefixLookupError( | raise error.AmbiguousPrefixLookupError( | ||||
| id, self._indexfile, _(b'ambiguous identifier') | id, self.display_id, _(b'ambiguous identifier') | ||||
| ) | ) | ||||
| if maybewdir: | if maybewdir: | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| return None | return None | ||||
| except TypeError: | except TypeError: | ||||
| pass | pass | ||||
| def lookup(self, id): | def lookup(self, id): | ||||