This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4041

revisions: allow "x123" to refer to nodeid prefix "123"
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7848f284b211: revisions: allow "x123" to refer to nodeid prefix "123"
Summary

When resolving "123" to a revision, we try to interpret it as revnum
before we try to interpret it as a nodeid hex prefix. This can lead to
the shortest valid prefix being longer than necessary. This patch lets
us write such nodeids in a shorter form by prefixing them with "x"
instead of adding more hex digits until they're longer than the
longest decimal revnum.

On my hg repo with almost 69k revisions, turning this feature on saves
on average 0.4% on the average nodeid length. That clearly doesn't
justify this patch. However, it becomes more usefule when combined
with the earlier patches in this series that let you disambiguate
nodeid prefixes within a configured revset.

Note that we attempt to resolve symbols as nodeid prefixes after we've
exhausted all other posibilities, so this is a backwards compatible
change (only queries that would previously fail may now succeed).

I've still hidden this feature behind an experiemntal config option so
we can roll it back if needed.

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
martinvonz updated this revision to Diff 9889.Aug 4 2018, 1:26 AM
yuja added a subscriber: yuja.Aug 4 2018, 2:42 AM
Note that we attempt to resolve symbols as nodeid prefixes after we've
exhausted all other posibilities, so this is a backwards compatible
change (only queries that would previously fail may now succeed).
I've still hidden this feature behind an experiemntal config option so
we can roll it back if needed.

I guess nobody would love this syntax, but I have no alternative idea.
Queued this as it is an experimental feature.

Closed by commit rHG7848f284b211: revisions: allow "x123" to refer to nodeid prefix "123" (authored by martinvonz). · Explain WhyAug 4 2018, 2:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/scmutil.py (3 lines)
Mtests/test-revset.t (10 lines)

Diff 9896

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem('experimental', 'remotenames', coreconfigitem('experimental', 'remotenames',
default=False, default=False,
) )
coreconfigitem('experimental', 'removeemptydirs', coreconfigitem('experimental', 'removeemptydirs',
default=True, default=True,
) )
coreconfigitem('experimental', 'revisions.prefixhexnode',
default=False,
)
coreconfigitem('experimental', 'revlogv2', coreconfigitem('experimental', 'revlogv2',
default=None, default=None,
) )
coreconfigitem('experimental', 'revisions.disambiguatewithin', coreconfigitem('experimental', 'revisions.disambiguatewithin',
default=None, default=None,
) )
coreconfigitem('experimental', 'single-head-per-branch', coreconfigitem('experimental', 'single-head-per-branch',
default=False, default=False,

mercurial/scmutil.py

"""Format given revision and node depending on the current verbosity""" """Format given revision and node depending on the current verbosity"""
if ui.debugflag: if ui.debugflag:
hexfunc = hex hexfunc = hex
else: else:
hexfunc = short hexfunc = short
return '%d:%s' % (rev, hexfunc(node)) return '%d:%s' % (rev, hexfunc(node))
def resolvehexnodeidprefix(repo, prefix): def resolvehexnodeidprefix(repo, prefix):
if (prefix.startswith('x') and
repo.ui.configbool('experimental', 'revisions.prefixhexnode')):
prefix = prefix[1:]
try: try:
# Uses unfiltered repo because it's faster when prefix is ambiguous/ # Uses unfiltered repo because it's faster when prefix is ambiguous/
# This matches the shortesthexnodeidprefix() function below. # This matches the shortesthexnodeidprefix() function below.
node = repo.unfiltered().changelog._partialmatch(prefix) node = repo.unfiltered().changelog._partialmatch(prefix)
except error.AmbiguousPrefixLookupError: except error.AmbiguousPrefixLookupError:
revset = repo.ui.config('experimental', 'revisions.disambiguatewithin') revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')
if revset: if revset:
# Clear config to avoid infinite recursion # Clear config to avoid infinite recursion

tests/test-revset.t

9 9
$ log 'rev(10)' $ log 'rev(10)'
$ log 'rev(tip)' $ log 'rev(tip)'
hg: parse error: rev expects a number hg: parse error: rev expects a number
[255] [255]
Test hexadecimal revision Test hexadecimal revision
$ log 'id(2)' $ log 'id(2)'
$ log 'id(5)'
2
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x5)'
2
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x5'
2
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x)'
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x'
abort: 00changelog.i@: ambiguous identifier!
[255]
$ log 'id(23268)' $ log 'id(23268)'
4 4
$ log 'id(2785f51eece)' $ log 'id(2785f51eece)'
0 0
$ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)' $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)'
8 8
$ log 'id(d5d0dcbdc4a)' $ log 'id(d5d0dcbdc4a)'
$ log 'id(d5d0dcbdc4w)' $ log 'id(d5d0dcbdc4w)'