Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revlog.py @ 38012:0304f22497fa
revlog: use node tree (native code) for shortest() calculation
I want to rewrite revlog.shortest() to disambiguate only among hex
nodeids and then disambiguate the result with revnums at a higher
level (in scmutil). However, that would slow down `hg log -T
'{shortest(node,1)}\n'` from 5.0s to 6.8s, which I wasn't sure would
be acceptable. So this patch makes revlog.shortest() use the node tree
for finding the length of the shortest prefix that's unambiguous among
nodeids. Once that has been found, it makes it longer until it is also
not ambiguous with a revnum.
This speeds up `hg log -T '{shortest(node,1)}\n'` from 5.0s to 4.0s.
Differential Revision: https://phab.mercurial-scm.org/D3499
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 02 May 2018 23:17:58 -0700 |
| parents | da083d9fafab |
| children | 0db7fe7c34d3 |
line wrap: on
line diff
--- a/mercurial/revlog.py Mon May 07 16:49:31 2018 -0700 +++ b/mercurial/revlog.py Wed May 02 23:17:58 2018 -0700 @@ -1526,7 +1526,33 @@ raise LookupError(node, self.indexfile, _('no node')) return not isrev(prefix) + def maybewdir(prefix): + return all(c == 'f' for c in prefix) + hexnode = hex(node) + + def disambiguate(hexnode, minlength): + for length in range(minlength, 41): + prefix = hexnode[:length] + if not isrev(prefix) and not maybewdir(prefix): + return prefix + + if not getattr(self, 'filteredrevs', None): + try: + length = max(self.index.shortest(node), minlength) + return disambiguate(hexnode, length) + except RevlogError: + if node == wdirid: + for length in range(minlength, 41): + prefix = hexnode[:length] + if isvalid(prefix): + return prefix + else: + raise LookupError(node, self.indexfile, _('no node')) + except AttributeError: + # Fall through to pure code + pass + shortest = hexnode startlength = max(6, minlength) length = startlength