This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9349

tests: make doctests not depend on str(ParseError()) format
ClosedPublic

Authored by martinvonz on Nov 20 2020, 7:24 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG18489e26d9a0: tests: make doctests not depend on str(ParseError()) format
Summary

ParseError implements __bytes__, but it doesn't implement
__str__, so it gets the default __str__ implementation. The next
patch will make it so ParseError gets a __str__ implementation,
which changes the format slightly. This prepares by making us not
depend on the format.

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.Nov 20 2020, 7:24 PM
mharbison72 accepted this revision.Nov 20 2020, 9:45 PM
This revision is now accepted and ready to land.Nov 20 2020, 9:45 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/revsetlang.py (24 lines)
Mmercurial/templater.py (24 lines)

Diff 23600

mercurial/revsetlang.py

_aliassyminitletters = _syminitletters | {b'$'} _aliassyminitletters = _syminitletters | {b'$'}
def _parsewith(spec, lookup=None, syminitletters=None): def _parsewith(spec, lookup=None, syminitletters=None):
"""Generate a parse tree of given spec with given tokenizing options """Generate a parse tree of given spec with given tokenizing options
>>> _parsewith(b'foo($1)', syminitletters=_aliassyminitletters) >>> _parsewith(b'foo($1)', syminitletters=_aliassyminitletters)
('func', ('symbol', 'foo'), ('symbol', '$1')) ('func', ('symbol', 'foo'), ('symbol', '$1'))
>>> _parsewith(b'$1') >>> from . import error
Traceback (most recent call last): >>> from . import pycompat
... >>> try:
ParseError: ("syntax error in revset '$1'", 0) ... _parsewith(b'$1')
>>> _parsewith(b'foo bar') ... except error.ParseError as e:
Traceback (most recent call last): ... pycompat.sysstr(e.message)
... ... e.location
ParseError: ('invalid token', 4) "syntax error in revset '$1'"
0
>>> try:
... _parsewith(b'foo bar')
... except error.ParseError as e:
... pycompat.sysstr(e.message)
... e.location
'invalid token'
4
""" """
if lookup and spec.startswith(b'revset(') and spec.endswith(b')'): if lookup and spec.startswith(b'revset(') and spec.endswith(b')'):
lookup = None lookup = None
p = parser.parser(elements) p = parser.parser(elements)
tree, pos = p.parse( tree, pos = p.parse(
tokenize(spec, lookup=lookup, syminitletters=syminitletters) tokenize(spec, lookup=lookup, syminitletters=syminitletters)
) )
if pos != len(spec): if pos != len(spec):

mercurial/templater.py

def parseexpr(expr): def parseexpr(expr):
"""Parse a template expression into tree """Parse a template expression into tree
>>> parseexpr(b'"foo"') >>> parseexpr(b'"foo"')
('string', 'foo') ('string', 'foo')
>>> parseexpr(b'foo(bar)') >>> parseexpr(b'foo(bar)')
('func', ('symbol', 'foo'), ('symbol', 'bar')) ('func', ('symbol', 'foo'), ('symbol', 'bar'))
>>> parseexpr(b'foo(') >>> from . import error
Traceback (most recent call last): >>> from . import pycompat
... >>> try:
ParseError: ('not a prefix: end', 4) ... parseexpr(b'foo(')
>>> parseexpr(b'"foo" "bar"') ... except error.ParseError as e:
Traceback (most recent call last): ... pycompat.sysstr(e.message)
... ... e.location
ParseError: ('invalid token', 7) 'not a prefix: end'
4
>>> try:
... parseexpr(b'"foo" "bar"')
... except error.ParseError as e:
... pycompat.sysstr(e.message)
... e.location
'invalid token'
7
""" """
try: try:
return _parseexpr(expr) return _parseexpr(expr)
except error.ParseError as inst: except error.ParseError as inst:
_addparseerrorhint(inst, expr) _addparseerrorhint(inst, expr)
raise raise