--- a/mercurial/hgweb/webcommands.py	Sat Mar 17 22:47:02 2018 +0900
+++ b/mercurial/hgweb/webcommands.py	Sun Mar 18 20:51:39 2018 +0900
@@ -36,6 +36,7 @@
     scmutil,
     smartset,
     templater,
+    templateutil,
 )
 
 from ..utils import (
@@ -287,7 +288,7 @@
                 LookupError):
             return MODE_KEYWORD, query
 
-    def changelist(**map):
+    def changelist(context):
         count = 0
 
         for ctx in searchfunc[0](funcarg):
@@ -303,7 +304,7 @@
                 'changelogtag': showtags,
                 'files': files,
             })
-            yield web.tmpl.generate('searchentry', lm)
+            yield lm
 
             if count >= revcount:
                 break
@@ -349,7 +350,7 @@
         query=query,
         node=tip.hex(),
         symrev='tip',
-        entries=changelist,
+        entries=templateutil.mappinggenerator(changelist, name='searchentry'),
         archives=web.archivelist('tip'),
         morevars=morevars,
         lessvars=lessvars,