# HG changeset patch # User Yuya Nishihara # Date 1522765871 -32400 # Node ID c4313a9fde7bb13db6d1881da55a6f2c527e61e4 # Parent 790ca0c11fd4f2f709f5014b58f26fa8f8105c7b hgweb: use template context to render {files} of changesetentry() This is a preferred way to process nested templates. diff -r 790ca0c11fd4 -r c4313a9fde7b mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Tue Apr 03 23:29:11 2018 +0900 +++ b/mercurial/hgweb/webutil.py Tue Apr 03 23:31:11 2018 +0900 @@ -463,11 +463,11 @@ else: return short(ctx.node()) -def _listfilesgen(context, tmpl, ctx, stripecount): +def _listfilesgen(context, ctx, stripecount): parity = paritygen(stripecount) for blockno, f in enumerate(ctx.files()): template = 'filenodelink' if f in ctx else 'filenolink' - yield tmpl.generate(template, { + yield context.process(template, { 'node': ctx.hex(), 'file': f, 'blockno': blockno + 1, @@ -503,8 +503,7 @@ changesetbookmark=showbookmarks, changesetbranch=showbranch, files=templateutil.mappedgenerator(_listfilesgen, - args=(web.tmpl, ctx, - web.stripecount)), + args=(ctx, web.stripecount)), diffsummary=lambda **x: diffsummary(diffstatsgen), diffstat=diffstats, archives=web.archivelist(ctx.hex()),