This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5181

shortest: never emit 0-length prefix even if unique
ClosedPublic

Authored by martinvonz on Oct 22 2018, 2:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbf249bb60087: shortest: never emit 0-length prefix even if unique
Summary

It turned out that the pure version of our code for finding the
shortest unique nodeid prefix would return a 0-length string if that
was unique (because there was at most one revision in the
disambiguation set). That's kind of correct, but it can't be used as
input, so we shouldn't return it. Let's just adjust the given
minlength up to at least 1. This fixes test-template-functions.t,
which was failing in pure mode.

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.

Event Timeline

martinvonz created this revision.Oct 22 2018, 2:37 PM
Closed by commit rHGbf249bb60087: shortest: never emit 0-length prefix even if unique (authored by martinvonz). · Explain WhyOct 22 2018, 2:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)

Diff 12310

mercurial/scmutil.py

If "cache" is not None, it must be a dictionary that can be used for If "cache" is not None, it must be a dictionary that can be used for
caching between calls to this method. caching between calls to this method.
""" """
# _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.
minlength=max(minlength, 1)
def disambiguate(prefix): def disambiguate(prefix):
"""Disambiguate against revnums.""" """Disambiguate against revnums."""
if repo.ui.configbool('experimental', 'revisions.prefixhexnode'): if repo.ui.configbool('experimental', 'revisions.prefixhexnode'):
if mayberevnum(repo, prefix): if mayberevnum(repo, prefix):
return 'x' + prefix return 'x' + prefix
else: else:
return prefix return prefix