This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3500

shortest: make pure code also disambigute against revnums at end
ClosedPublic

Authored by martinvonz on May 8 2018, 2:07 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0db7fe7c34d3: shortest: make pure code also disambigute against revnums at end
Summary

This makes the pure code more similar to the native code in that it
first finds a prefix that's unambiguous among nodeids and then adds
hex digits until it no longer looks like a revnum. It will allow us to
even better separate the disambiguation with revnums in a later patch.

With this patch hg log -r 0::50 -T '{shortest(node,1)}' with no
native code goes from 25s to 43s. It wasn't exactly usable to begin
with, so I don't feel too bad about it.

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

Diff 8640

mercurial/revlog.py

if not isrev(prefix) and not maybewdir(prefix): if not isrev(prefix) and not maybewdir(prefix):
return prefix return prefix
if not getattr(self, 'filteredrevs', None): if not getattr(self, 'filteredrevs', None):
try: try:
length = max(self.index.shortest(node), minlength) length = max(self.index.shortest(node), minlength)
return disambiguate(hexnode, length) return disambiguate(hexnode, length)
except RevlogError: except RevlogError:
if node != wdirid:
raise LookupError(node, self.indexfile, _('no node'))
except AttributeError:
# Fall through to pure code
pass
if node == wdirid: if node == wdirid:
for length in range(minlength, 41): for length in range(minlength, 41):
prefix = hexnode[:length] prefix = hexnode[:length]
if isvalid(prefix): if isvalid(prefix):
return prefix return prefix
else:
raise LookupError(node, self.indexfile, _('no node'))
except AttributeError:
# Fall through to pure code
pass
shortest = hexnode for length in range(minlength, 41):
startlength = max(6, minlength)
length = startlength
while True:
prefix = hexnode[:length] prefix = hexnode[:length]
if isvalid(prefix): if isvalid(prefix):
shortest = prefix return disambiguate(hexnode, length)
if length == minlength or length > startlength:
return shortest
length -= 1
else:
length += 1
if len(shortest) <= length:
return shortest
def cmp(self, node, text): def cmp(self, node, text):
"""compare text with a given file revision """compare text with a given file revision
returns True if text is different than what is stored. returns True if text is different than what is stored.
""" """
p1, p2 = self.parents(node) p1, p2 = self.parents(node)
return hash(text, p1, p2) != node return hash(text, p1, p2) != node