This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9600

errors: raise InputError if an ambiguous revision id prefix is used
ClosedPublic

Authored by martinvonz on Dec 14 2020, 4:31 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGbe3d8178251e: errors: raise InputError if an ambiguous revision id prefix is used
Summary

It's long bothered me that we include the "00changelog.i" part in a
message to the user. This fixes that along with the exit code.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (10 lines)
Mmercurial/scmutil.py (2 lines)
Mtests/test-revisions.t (4 lines)
Mtests/test-revset.t (16 lines)

Diff 24266

mercurial/revset.py

subscriptrelations = { subscriptrelations = {
b"g": generationssubrel, b"g": generationssubrel,
b"generations": generationssubrel, b"generations": generationssubrel,
} }
def lookupfn(repo): def lookupfn(repo):
return lambda symbol: scmutil.isrevsymbol(repo, symbol) def fn(symbol):
try:
return scmutil.isrevsymbol(repo, symbol)
except error.AmbiguousPrefixLookupError:
raise error.InputError(
b'ambiguous revision identifier: %s' % symbol
)
return fn
def match(ui, spec, lookup=None): def match(ui, spec, lookup=None):
"""Create a matcher for a single revision spec""" """Create a matcher for a single revision spec"""
return matchany(ui, [spec], lookup=lookup) return matchany(ui, [spec], lookup=lookup)
def matchany(ui, specs, lookup=None, localalias=None): def matchany(ui, specs, lookup=None, localalias=None):

mercurial/scmutil.py

if b" " in l: if b" " in l:
k, v = l.strip().split(b" ", 1) k, v = l.strip().split(b" ", 1)
else: else:
k, v = l.strip(), b"" k, v = l.strip(), b""
k = encoding.tolocal(k) k = encoding.tolocal(k)
try: try:
data[revsingle(repo, k).rev()] = encoding.tolocal(v) data[revsingle(repo, k).rev()] = encoding.tolocal(v)
except (error.LookupError, error.RepoLookupError): except (error.LookupError, error.RepoLookupError, error.InputError):
pass # we ignore data for nodes that don't exist locally pass # we ignore data for nodes that don't exist locally
finally: finally:
if proc: if proc:
try: try:
proc.communicate() proc.communicate()
except ValueError: except ValueError:
# This happens if we started iterating src and then # This happens if we started iterating src and then
# get a parse error on a line. It should be safe to ignore. # get a parse error on a line. It should be safe to ignore.

tests/test-revisions.t

2:72 2:72
1:9 1:9
0:b 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: ambiguous revision identifier: 7
[255] [10]
7b is no longer ambiguous 7b is no longer ambiguous
$ hg l -r 7b $ hg l -r 7b
3:7b 3:7b
$ cd .. $ cd ..

tests/test-revset.t

$ log 'id(8)' $ log 'id(8)'
3 3
$ hg log --template '{rev}\n' -r 'id(x8)' $ hg log --template '{rev}\n' -r 'id(x8)'
3 3
$ hg log --template '{rev}\n' -r 'x8' $ hg log --template '{rev}\n' -r 'x8'
3 3
$ hg log --template '{rev}\n' -r 'id(x)' $ hg log --template '{rev}\n' -r 'id(x)'
$ hg log --template '{rev}\n' -r 'x' $ hg log --template '{rev}\n' -r 'x'
abort: 00changelog.i@: ambiguous identifier abort: ambiguous revision identifier: x
[255] [10]
$ 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)'
3:fff48a9b9de34a4d64120c29548214c67980ade3 fff4 3:fff48a9b9de34a4d64120c29548214c67980ade3 fff4
4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8 4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
2147483647:ffffffffffffffffffffffffffffffffffffffff fffff 2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
$ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571 $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugrevspec 'fff' $ hg debugrevspec 'fff'
abort: 00changelog.i@fff: ambiguous identifier abort: ambiguous revision identifier: fff
[255] [10]
$ hg debugrevspec 'ffff' $ hg debugrevspec 'ffff'
abort: 00changelog.i@ffff: ambiguous identifier abort: ambiguous revision identifier: ffff
[255] [10]
$ hg debugrevspec 'fffb' $ hg debugrevspec 'fffb'
abort: 00changelog.i@fffb: ambiguous identifier abort: ambiguous revision identifier: fffb
[255] [10]
BROKEN should be '2' (node lookup uses unfiltered repo) BROKEN should be '2' (node lookup uses unfiltered repo)
$ hg debugrevspec 'id(fffb)' $ hg debugrevspec 'id(fffb)'
BROKEN should be '2' (node lookup uses unfiltered repo) BROKEN should be '2' (node lookup uses unfiltered repo)
$ hg debugrevspec 'ffff8' $ hg debugrevspec 'ffff8'
4 4
$ hg debugrevspec 'fffff' $ hg debugrevspec 'fffff'
2147483647 2147483647