diff -r 68ce242c8b4b -r 28f974d83c0a mercurial/templateutil.py
--- a/mercurial/templateutil.py	Mon Sep 10 20:57:18 2018 +0900
+++ b/mercurial/templateutil.py	Thu Jun 07 23:27:54 2018 +0900
@@ -856,7 +856,7 @@
         # old templatekw: expand all keywords and resources
         # (TODO: drop support for old-style functions. 'f._requires = ()'
         #  can be removed.)
-        props = {k: context._resources.lookup(context, mapping, k)
+        props = {k: context._resources.lookup(mapping, k)
                  for k in context._resources.knownkeys()}
         # pass context to _showcompatlist() through templatekw._showlist()
         props['templ'] = context