This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4038

scmutil: make shortest() respect disambiguation revset
ClosedPublic

Authored by martinvonz on Aug 1 2018, 5:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6f7c9527030b: scmutil: make shortest() respect disambiguation revset
Summary

The previous patch would let you use a shorter prefix if the prefix is
unique within a configured revset. However, that's not very useful if
there's no simple way of knowing what that shorter prefix is. This
patch adapts the shortest() template function to use the shorter
prefixes for nodes in the configured revset.

This is currently extremely slow, because it calculates the revset for
each call to shortest(). To make this faster, the next patch will
start caching the revset instance. Ideally we'd cache a prefix tree
instance instead.

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.Aug 1 2018, 5:57 PM
yuja added a subscriber: yuja.Aug 3 2018, 11:10 PM

Queued up to this patch, thanks.

+ revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')
+ if revset:
+ revs = repo.anyrevs([revset], user=True)
+ if cl.rev(node) in revs:
+ hexnode = hex(node)
+ for length in range(minlength, len(hexnode) + 1):
+ matches = []
+ prefix = hexnode[:length]
+ for rev in revs:
+ otherhexnode = repo[rev].hex()
+ if prefix == otherhexnode[:length]:

For micro optimization, this could be hex(cl.node(rev)).startswith(prefix).

Closed by commit rHG6f7c9527030b: scmutil: make shortest() respect disambiguation revset (authored by martinvonz). · Explain WhyAug 3 2018, 11:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (15 lines)
Mtests/test-revisions.t (8 lines)

Diff 9877

mercurial/scmutil.py

def disambiguate(prefix): def disambiguate(prefix):
"""Disambiguate against revnums.""" """Disambiguate against revnums."""
hexnode = hex(node) hexnode = hex(node)
for length in range(len(prefix), len(hexnode) + 1): for length in range(len(prefix), len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if not isrev(prefix): if not isrev(prefix):
return prefix return prefix
revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')
if revset:
revs = repo.anyrevs([revset], user=True)
if cl.rev(node) in revs:
hexnode = hex(node)
for length in range(minlength, len(hexnode) + 1):
matches = []
prefix = hexnode[:length]
for rev in revs:
otherhexnode = repo[rev].hex()
if prefix == otherhexnode[:length]:
matches.append(otherhexnode)
if len(matches) == 1:
return disambiguate(prefix)
try: try:
return disambiguate(cl.shortest(node, minlength)) return disambiguate(cl.shortest(node, minlength))
except error.LookupError: except error.LookupError:
raise error.RepoLookupError() raise error.RepoLookupError()
def isrevsymbol(repo, symbol): def isrevsymbol(repo, symbol):
"""Checks if a symbol exists in the repo. """Checks if a symbol exists in the repo.

tests/test-revisions.t

3:7ba57 3:7ba57
2:72 2:72
1:9 1:9
0:b 0:b
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]
> revisions.disambiguatewithin=:3 > revisions.disambiguatewithin=:3
> EOF > EOF
$ hg l
4:7ba5d
3:7b
2:72
1:9
0:b
9 was unambiguous and still is 9 was unambiguous and still is
$ hg l -r 9 $ hg l -r 9
1:9 1:9
7 was ambiguous and still is 7 was ambiguous and still is
$ hg l -r 7 $ hg l -r 7
abort: 00changelog.i@7: ambiguous identifier! abort: 00changelog.i@7: ambiguous identifier!
[255] [255]
7b is no longer ambiguous 7b is no longer ambiguous
$ hg l -r 7b $ hg l -r 7b
3:7ba57 3:7b
$ cd .. $ cd ..