This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8514

revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode
ClosedPublic

Authored by martinvonz on May 11 2020, 12:26 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG62435a5b46fe: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode
Summary

experimental.revisions.prefixhexnode makes it so the template
function shortest() uses an "x" prefix to disambiguate between short
nodeids and revnums. That config has so far also been used for
enabling parsing of "x123" unambiguously as a nodeid. That makes it a
little annoying for people who have prefixhexnode=yes to share such
nodeids with people who have prefixhexnode=no ("x123" will be
considered invalid for them). There seems to be little harm in
allowing that parsing for everyone. We still let e.g. bookmark names
like "x123" take precedence over the nodeid, so that's not a
concern. The only thing I can think of is that people get used to the
"x" prefix being valid, making it impossible for us to change to a
different prefix if we wanted to do that when graduating the feature.

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.May 11 2020, 12:26 PM
martinvonz added a commit: rHG62435a5b46fe: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode.May 11 2020, 7:37 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG62435a5b46fe: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (4 lines)
Mtests/test-revset.t (8 lines)

Diff 21346

mercurial/scmutil.py

if ui.debugflag: if ui.debugflag:
hexfunc = hex hexfunc = hex
else: else:
hexfunc = short hexfunc = short
return b'%d:%s' % (rev, hexfunc(node)) return b'%d:%s' % (rev, hexfunc(node))
def resolvehexnodeidprefix(repo, prefix): def resolvehexnodeidprefix(repo, prefix):
if prefix.startswith(b'x') and repo.ui.configbool( if prefix.startswith(b'x'):
b'experimental', b'revisions.prefixhexnode'
):
prefix = prefix[1:] 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( revset = repo.ui.config(
b'experimental', b'revisions.disambiguatewithin' b'experimental', b'revisions.disambiguatewithin'

tests/test-revset.t

$ 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(8)' $ log 'id(8)'
3 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x8)' $ hg log --template '{rev}\n' -r 'id(x8)'
3 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x8' $ hg log --template '{rev}\n' -r 'x8'
3 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x)' $ hg log --template '{rev}\n' -r 'id(x)'
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x' $ hg log --template '{rev}\n' -r 'x'
abort: 00changelog.i@: ambiguous identifier! abort: 00changelog.i@: ambiguous identifier!
[255] [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