diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -451,7 +451,7 @@ def _runrecursivesymbol(context, mapping, key): - raise error.Abort(_(b"recursive reference '%s' in template") % key) + raise error.InputError(_(b"recursive reference '%s' in template") % key) def buildtemplate(exp, context): diff --git a/tests/test-template-basic.t b/tests/test-template-basic.t --- a/tests/test-template-basic.t +++ b/tests/test-template-basic.t @@ -265,7 +265,7 @@ > EOF $ hg log --style ./issue4758 abort: recursive reference 'changeset' in template - [255] + [10] not a recursion if a keyword of the same name exists: