changeset 38171:8e9ce73ceb15

hgweb: wrap {parents} of {annotate} with mappinggenerator It's a generator of at most two mappings, which has to be wrapped.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 04 Apr 2018 20:29:58 +0900
parents 3e6253438bf9
children d32f07069dd1
files mercurial/hgweb/webcommands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py	Wed Apr 04 20:28:51 2018 +0900
+++ b/mercurial/hgweb/webcommands.py	Wed Apr 04 20:29:58 2018 +0900
@@ -929,7 +929,7 @@
     # TODO there are still redundant operations within basefilectx.parents()
     # and from the fctx.annotate() call itself that could be cached.
     parentscache = {}
-    def parents(f):
+    def parents(context, f):
         rev = f.rev()
         if rev not in parentscache:
             parentscache[rev] = []
@@ -967,7 +967,7 @@
                    "node": f.hex(),
                    "rev": rev,
                    "author": f.user(),
-                   "parents": parents(f),
+                   "parents": templateutil.mappinggenerator(parents, args=(f,)),
                    "desc": f.description(),
                    "extra": f.extra(),
                    "file": f.path(),