templater: rename mappable to hybriditem as it is the primary use case

This frees up the name 'mappable' for new interface type.

mercurial/templatekw.py

@@ -31,7 +31,6 b' from .utils import ('
 )
 
 _hybrid = templateutil.hybrid
-_mappable = templateutil.mappable
 hybriddict = templateutil.hybriddict
 hybridlist = templateutil.hybridlist
 compatdict = templateutil.compatdict
@@ -469,7 +468,8 b' def showmanifest(context, mapping):'
     f = context.process('manifest', mapping)
     # TODO: perhaps 'ctx' should be dropped from mapping because manifest
     # rev and node are completely different from changeset's.
-    return _mappable(f, None, f, lambda x: {'rev': mrev, 'node': mhex})
+    return templateutil.hybriditem(f, None, f,
+                                   lambda x: {'rev': mrev, 'node': mhex})
 
 @templatekeyword('obsfate', requires={'ui', 'repo', 'ctx'})
 def showobsfate(context, mapping):

mercurial/templater.py

@@ -42,7 +42,7 b' hybrid'
     represents a list/dict of printable values, which can also be converted
     to mappings by % operator.
 
-mappable
+hybriditem
     represents a scalar printable value, also supports % operator.
 
 mappinggenerator, mappinglist

mercurial/templateutil.py

@@ -215,7 +215,7 b' class hybrid(wrapped):'
         if util.safehasattr(val, '_makemap'):
             # a nested hybrid list/dict, which has its own way of map operation
             return val
-        return mappable(None, key, val, self._makemap)
+        return hybriditem(None, key, val, self._makemap)
 
     def itermaps(self, context):
         makemap = self._makemap
@@ -243,7 +243,7 b' class hybrid(wrapped):'
                     for k, v in xs.iteritems()}
         return [unwrapvalue(context, mapping, x) for x in xs]
 
-class mappable(wrapped):
+class hybriditem(wrapped):
     """Wrapper for non-list/dict object to support map operation
 
     This class allows us to handle both: