diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -226,13 +226,22 @@ def runinteger(context, mapping, data): def runstring(context, mapping, data): return data +def _recursivesymbolblocker(key): + def showrecursion(**args): + raise error.Abort(_("recursive reference '%s' in template") % key) + return showrecursion + def runsymbol(context, mapping, key): v = mapping.get(key) if v is None: v = context._defaults.get(key) if v is None: + # put poison to cut recursion. we can't move this to parsing phase + # because "x = {x}" is allowed if "x" is a keyword. (issue4758) + safemapping = mapping.copy() + safemapping[key] = _recursivesymbolblocker(key) try: - v = context.process(key, mapping) + v = context.process(key, safemapping) except TemplateNotFound: v = '' if callable(v): diff --git a/tests/test-command-template.t b/tests/test-command-template.t --- a/tests/test-command-template.t +++ b/tests/test-command-template.t @@ -1035,6 +1035,33 @@ Include works: 1 0 +Check that recursive reference does not fall into RuntimeError (issue4758): + + common mistake: + + $ hg log -T '{changeset}\n' + abort: recursive reference 'changeset' in template + [255] + + circular reference: + + $ cat << EOF > issue4758 + > changeset = '{foo}' + > foo = '{changeset}' + > EOF + $ hg log --style ./issue4758 + abort: recursive reference 'foo' in template + [255] + + not a recursion if a keyword of the same name exists: + + $ cat << EOF > issue4758 + > changeset = '{tags % rev}' + > rev = '{rev} {tag}\n' + > EOF + $ hg log --style ./issue4758 -r tip + 8 tip + Check that {phase} works correctly on parents: $ cat << EOF > parentphase