# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1522769049 -32400
# Node ID aeccb08af31143015eb393af60a317503dab3de5
# Parent  4c3ab15f353208a5705850a610ee75d266bd0c4b
hgweb: wrap {lines} of filerevision with mappinggenerator

No bare generator of mappings should be put in a template mapping.

diff -r 4c3ab15f3532 -r aeccb08af311 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Wed Apr 04 00:21:52 2018 +0900
+++ b/mercurial/hgweb/webcommands.py	Wed Apr 04 00:24:09 2018 +0900
@@ -149,7 +149,7 @@
         mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
         text = '(binary:%s)' % mt
 
-    def lines():
+    def lines(context):
         for lineno, t in enumerate(text.splitlines(True)):
             yield {"line": t,
                    "lineid": "l%d" % (lineno + 1),
@@ -160,7 +160,7 @@
         'filerevision',
         file=f,
         path=webutil.up(f),
-        text=lines(),
+        text=templateutil.mappinggenerator(lines),
         symrev=webutil.symrevorshortnode(web.req, fctx),
         rename=webutil.renamelink(fctx),
         permissions=fctx.manifest().flags(f),