# HG changeset patch # User Yuya Nishihara # Date 2018-04-03 13:54:36 # Node ID 10d3dc8123c5a427be7ea0b40a272d5455e85edb # Parent 89db78126f7f5ab853dc74d089704571007bfbaf 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'}