diff -r 186321309d05 -r a7dd6692e5cb mercurial/templater.py
--- a/mercurial/templater.py	Mon Jun 15 16:08:22 2015 -0700
+++ b/mercurial/templater.py	Sat Jun 13 00:15:22 2015 +0900
@@ -174,6 +174,10 @@
         v = list(v)
     return v
 
+def runtemplate(context, mapping, template):
+    for func, data in template:
+        yield func(context, mapping, data)
+
 def buildfilter(exp, context):
     func, data = compileexp(exp[1], context, methods)
     filt = getfilter(exp[2], context)
@@ -201,10 +205,6 @@
     ctmpl = gettemplate(exp[2], context)
     return (runmap, (func, data, ctmpl))
 
-def runtemplate(context, mapping, template):
-    for func, data in template:
-        yield func(context, mapping, data)
-
 def runmap(context, mapping, data):
     func, data, ctmpl = data
     d = func(context, mapping, data)