diff --git a/mercurial/revsetlang.py b/mercurial/revsetlang.py --- a/mercurial/revsetlang.py +++ b/mercurial/revsetlang.py @@ -558,14 +558,22 @@ >>> _parsewith(b'foo($1)', syminitletters=_aliassyminitletters) ('func', ('symbol', 'foo'), ('symbol', '$1')) - >>> _parsewith(b'$1') - Traceback (most recent call last): - ... - ParseError: ("syntax error in revset '$1'", 0) - >>> _parsewith(b'foo bar') - Traceback (most recent call last): - ... - ParseError: ('invalid token', 4) + >>> from . import error + >>> from . import pycompat + >>> try: + ... _parsewith(b'$1') + ... except error.ParseError as e: + ... pycompat.sysstr(e.message) + ... e.location + "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')'): lookup = None diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -376,14 +376,22 @@ ('string', 'foo') >>> parseexpr(b'foo(bar)') ('func', ('symbol', 'foo'), ('symbol', 'bar')) - >>> parseexpr(b'foo(') - Traceback (most recent call last): - ... - ParseError: ('not a prefix: end', 4) - >>> parseexpr(b'"foo" "bar"') - Traceback (most recent call last): - ... - ParseError: ('invalid token', 7) + >>> from . import error + >>> from . import pycompat + >>> try: + ... parseexpr(b'foo(') + ... except error.ParseError as e: + ... pycompat.sysstr(e.message) + ... e.location + '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: return _parseexpr(expr)