From patchwork Wed May  9 13:33:06 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [5,of,7] hgweb: wrap {succsandmarkers} with mappinggenerator
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 31431
Message-Id: <20330c4fe13bd19941e5.1525872786@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Wed, 09 May 2018 22:33:06 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1522763676 -32400
#      Tue Apr 03 22:54:36 2018 +0900
# Node ID 20330c4fe13bd19941e56152e6b525b336d54e07
# Parent  dd0c574b7d3565fdaefd222d6448b9468516d640
hgweb: wrap {succsandmarkers} with mappinggenerator

This is also a generator of mappings, which needs a wrapper.

diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py
--- a/mercurial/hgweb/webutil.py
+++ b/mercurial/hgweb/webutil.py
@@ -378,7 +378,7 @@ def linerange(req):
 def formatlinerange(fromline, toline):
     return '%d:%d' % (fromline + 1, toline)
 
-def succsandmarkers(context, mapping):
+def _succsandmarkersgen(context, mapping):
     repo = context.resource(mapping, 'repo')
     itemmappings = templatekw.showsuccsandmarkers(context, mapping)
     for item in itemmappings.tovalue(context, mapping):
@@ -386,6 +386,9 @@ def succsandmarkers(context, mapping):
                                        for successor in item['successors'])
         yield item
 
+def succsandmarkers(context, mapping):
+    return templateutil.mappinggenerator(_succsandmarkersgen, args=(mapping,))
+
 # teach templater succsandmarkers is switched to (context, mapping) API
 succsandmarkers._requires = {'repo', 'ctx'}