This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2619

revsetlang: add a hint for more useful parse errors
ClosedPublic

Authored by ryanmce on Mar 3 2018, 6:31 PM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG2a258985ffeb: revsetlang: add a hint for more useful parse errors
Summary

This logic is largely based on the similar logic added to template error
messages in D2608 and D2609, but with a few tweaks based on how revsets
actually work.

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

ryanmce created this revision.Mar 3 2018, 6:31 PM
lothiraldan accepted this revision.Mar 3 2018, 10:31 PM
yuja added a subscriber: yuja.Mar 4 2018, 7:49 AM

Queued, thanks.

tests/test-revset.t
2796

Rewritten this as mulitple echos to silence check-code.

Closed by commit rHG2a258985ffeb: revsetlang: add a hint for more useful parse errors (authored by ryanmce). · Explain WhyMar 4 2018, 7:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6540

mercurial/revsetlang.py

else: else:
msg = _("\"##\" can't concatenate \"%s\" element") % (e[0]) msg = _("\"##\" can't concatenate \"%s\" element") % (e[0])
raise error.ParseError(msg) raise error.ParseError(msg)
return ('string', ''.join(l)) return ('string', ''.join(l))
else: else:
return tuple(foldconcat(t) for t in tree) return tuple(foldconcat(t) for t in tree)
def parse(spec, lookup=None): def parse(spec, lookup=None):
try:
return _parsewith(spec, lookup=lookup) return _parsewith(spec, lookup=lookup)
except error.ParseError as inst:
if len(inst.args) > 1: # has location
# Add 1 to location because unlike templates, revset parse errors
# point to the char where the error happened, not the char after.
loc = inst.args[1] + 1
# Remove newlines -- spaces are equivalent whitespace.
spec = spec.replace('\n', ' ')
# We want the caret to point to the place in the template that
# failed to parse, but in a hint we get a open paren at the
# start. Therefore, we print "loc + 1" spaces (instead of "loc")
# to line up the caret with the location of the error.
inst.hint = spec + '\n' + ' ' * loc + '^ ' + _('here')
raise
def _quote(s): def _quote(s):
r"""Quote a value in order to make it safe for the revset engine. r"""Quote a value in order to make it safe for the revset engine.
>>> _quote(b'asdf') >>> _quote(b'asdf')
"'asdf'" "'asdf'"
>>> _quote(b"asdf'\"") >>> _quote(b"asdf'\"")
'\'asdf\\\'"\'' '\'asdf\\\'"\''

tests/test-annotate.t

$ hg log -r 'followlines(baz, 0:4)' $ hg log -r 'followlines(baz, 0:4)'
hg: parse error: fromline must be strictly positive hg: parse error: fromline must be strictly positive
[255] [255]
$ hg log -r 'followlines(baz, 2:40)' $ hg log -r 'followlines(baz, 2:40)'
abort: line range exceeds file size abort: line range exceeds file size
[255] [255]
$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])' $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'
hg: parse error at 43: not a prefix: [ hg: parse error at 43: not a prefix: [
(followlines(baz, 2:4, startrev=20, descend=[1])
^ here)
[255] [255]
$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)' $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'
hg: parse error: descend argument must be a boolean hg: parse error: descend argument must be a boolean
[255] [255]
Test empty annotate output Test empty annotate output
$ printf '\0' > binary $ printf '\0' > binary

tests/test-default-push.t

$ hg --config 'paths.default:pushrev=notdefined()' push $ hg --config 'paths.default:pushrev=notdefined()' push
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
hg: parse error: unknown identifier: notdefined hg: parse error: unknown identifier: notdefined
[255] [255]
$ hg --config 'paths.default:pushrev=(' push $ hg --config 'paths.default:pushrev=(' push
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
hg: parse error at 1: not a prefix: end hg: parse error at 1: not a prefix: end
((
^ here)
[255] [255]
$ cd .. $ cd ..

tests/test-fileset.t

$ fileset "status('2', '', added())" $ fileset "status('2', '', added())"
hg: parse error: second argument to status must be a revision hg: parse error: second argument to status must be a revision
[255] [255]
Empty revset will error at the revset layer Empty revset will error at the revset layer
$ fileset "status(' ', '4', added())" $ fileset "status(' ', '4', added())"
hg: parse error at 1: not a prefix: end hg: parse error at 1: not a prefix: end
(
^ here)
[255] [255]
$ fileset "status('2', ' ', added())" $ fileset "status('2', ' ', added())"
hg: parse error at 1: not a prefix: end hg: parse error at 1: not a prefix: end
(
^ here)
[255] [255]

tests/test-revset.t

$ log 'a' # branch $ log 'a' # branch
0 0
$ log '2785f51ee' $ log '2785f51ee'
0 0
$ log 'date(2005)' $ log 'date(2005)'
4 4
$ log 'date(this is a test)' $ log 'date(this is a test)'
hg: parse error at 10: unexpected token: symbol hg: parse error at 10: unexpected token: symbol
(date(this is a test)
^ here)
[255] [255]
$ log 'date()' $ log 'date()'
hg: parse error: date requires a string hg: parse error: date requires a string
[255] [255]
$ log 'date' $ log 'date'
abort: unknown revision 'date'! abort: unknown revision 'date'!
[255] [255]
$ log 'date(' $ log 'date('
hg: parse error at 5: not a prefix: end hg: parse error at 5: not a prefix: end
(date(
^ here)
[255] [255]
$ log 'date("\xy")' $ log 'date("\xy")'
hg: parse error: invalid \x escape* (glob) hg: parse error: invalid \x escape* (glob)
[255] [255]
$ log 'date(tip)' $ log 'date(tip)'
hg: parse error: invalid date: 'tip' hg: parse error: invalid date: 'tip'
[255] [255]
$ log '0:date' $ log '0:date'
(symbol '1')) (symbol '1'))
hg: parse error: unknown identifier: rel1 hg: parse error: unknown identifier: rel1
[255] [255]
parse errors of relation, subscript and relation-subscript operators: parse errors of relation, subscript and relation-subscript operators:
$ hg debugrevspec '[0]' $ hg debugrevspec '[0]'
hg: parse error at 0: not a prefix: [ hg: parse error at 0: not a prefix: [
([0]
^ here)
[255] [255]
$ hg debugrevspec '.#' $ hg debugrevspec '.#'
hg: parse error at 2: not a prefix: end hg: parse error at 2: not a prefix: end
(.#
^ here)
[255] [255]
$ hg debugrevspec '#rel' $ hg debugrevspec '#rel'
hg: parse error at 0: not a prefix: # hg: parse error at 0: not a prefix: #
(#rel
^ here)
[255] [255]
$ hg debugrevspec '.#rel[0' $ hg debugrevspec '.#rel[0'
hg: parse error at 7: unexpected token: end hg: parse error at 7: unexpected token: end
(.#rel[0
^ here)
[255] [255]
$ hg debugrevspec '.]' $ hg debugrevspec '.]'
hg: parse error at 1: invalid token hg: parse error at 1: invalid token
(.]
^ here)
[255] [255]
$ hg debugrevspec '.#generations[a]' $ hg debugrevspec '.#generations[a]'
hg: parse error: relation subscript must be an integer hg: parse error: relation subscript must be an integer
[255] [255]
$ hg debugrevspec '.#generations[1-2]' $ hg debugrevspec '.#generations[1-2]'
hg: parse error: relation subscript must be an integer hg: parse error: relation subscript must be an integer
[255] [255]
(string '\\bissue\\d+')) (string '\\bissue\\d+'))
* set: * set:
<filteredset <filteredset
<fullreposet+ 0:10>, <fullreposet+ 0:10>,
<grep '\\bissue\\d+'>> <grep '\\bissue\\d+'>>
6 6
$ try 'grep(r"\")' $ try 'grep(r"\")'
hg: parse error at 7: unterminated string hg: parse error at 7: unterminated string
(grep(r"\")
^ here)
[255] [255]
$ log 'head()' $ log 'head()'
0 0
1 1
2 2
3 3
4 4
5 5
topo.firstbranch should accept any kind of expressions: topo.firstbranch should accept any kind of expressions:
$ hg log -r 'sort(0, topo, topo.firstbranch=(book1))' $ hg log -r 'sort(0, topo, topo.firstbranch=(book1))'
0 b12 m111 u112 111 10800 0 b12 m111 u112 111 10800
$ cd .. $ cd ..
$ cd repo $ cd repo
test multiline revset with errors
$ echo > multiline-revset
yujaUnsubmitted
Not Done

Rewritten this as mulitple echos to silence check-code.

yuja: Rewritten this as mulitple `echo`s to silence check-code.
$ echo '. +' >> multiline-revset
$ echo '.^ +' >> multiline-revset
$ hg log -r "`cat multiline-revset`"
hg: parse error at 9: not a prefix: end
( . + .^ +
^ here)
[255]

tests/test-revset2.t

9 9
$ log 'ancestors(8) and (heads(branch("-a-b-c-")) or heads(branch(é)))' $ log 'ancestors(8) and (heads(branch("-a-b-c-")) or heads(branch(é)))'
4 4
issue2654: report a parse error if the revset was not completely parsed issue2654: report a parse error if the revset was not completely parsed
$ log '1 OR 2' $ log '1 OR 2'
hg: parse error at 2: invalid token hg: parse error at 2: invalid token
(1 OR 2
^ here)
[255] [255]
or operator should preserve ordering: or operator should preserve ordering:
$ log 'reverse(2::4) or tip' $ log 'reverse(2::4) or tip'
4 4
2 2
9 9
2 2
==== ====
1 1
3 3
test error message of bad revset test error message of bad revset
$ hg log -r 'foo\\' $ hg log -r 'foo\\'
hg: parse error at 3: syntax error in revset 'foo\\' hg: parse error at 3: syntax error in revset 'foo\\'
(foo\\
^ here)
[255] [255]
$ cd .. $ cd ..
Test that revset predicate of extension isn't loaded at failure of Test that revset predicate of extension isn't loaded at failure of
loading it loading it
$ cd repo $ cd repo