templater: drop 'templ' from resources dict

Partially resolves cycle, templ -> context -> templ. This will make it easier
to replace the resources dict with new immutable resource mapper interface.

mercurial/templatekw.py

@@ -35,19 +35,8 b' compatdict = templateutil.compatdict'
 compatlist = templateutil.compatlist
 _showcompatlist = templateutil._showcompatlist
 
-# TODO: temporary hack for porting; will be removed soon
-class _fakecontextwrapper(object):
-    def __init__(self, templ):
-        self._templ = templ
-
-    def preload(self, t):
-        return t in self._templ
-
-    def process(self, t, mapping):
-        return self._templ.generatenamed(t, mapping)
-
 def _showlist(name, values, templ, mapping, plural=None, separator=' '):
-    context = _fakecontextwrapper(templ)
+    context = templ  # this is actually a template context, not a templater
     return _showcompatlist(context, mapping, name, values, plural, separator)
 
 def showdict(name, data, mapping, plural=None, key='key', value='value',

mercurial/templater.py

@@ -738,8 +738,7 b' class templater(object):'
         self.filters = templatefilters.filters.copy()
         self.filters.update(filters)
         self.defaults = defaults
-        self._resources = {'templ': lambda context, mapping, key: self}
-        self._resources.update(resources)
+        self._resources = resources
         self._aliases = aliases
         self.minchunk, self.maxchunk = minchunk, maxchunk
         self.ecache = {}

mercurial/templateutil.py

@@ -348,8 +348,11 b' def runsymbol(context, mapping, key, def'
             v = default
     if callable(v) and getattr(v, '_requires', None) is None:
         # old templatekw: expand all keywords and resources
+        # (TODO: deprecate this after porting web template keywords to new API)
         props = {k: f(context, mapping, k)
                  for k, f in context._resources.items()}
+        # pass context to _showcompatlist() through templatekw._showlist()
+        props['templ'] = context
         props.update(mapping)
         return v(**pycompat.strkwargs(props))
     if callable(v):