# HG changeset patch # User Yuya Nishihara # Date 2018-04-04 11:31:16 # Node ID d32f07069dd1d4d2f90f74f937e574029545d762 # Parent 8e9ce73ceb151348d20a443f9157b0d804350637 hgweb: wrap {diffopts} of annotate by hybriddict() The diffopts here is a plain dict, which should be wrapped by hybriddict. diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -992,7 +992,7 @@ def annotate(web): rename=webutil.renamelink(fctx), permissions=fctx.manifest().flags(f), ishead=int(ishead), - diffopts=diffopts, + diffopts=templateutil.hybriddict(diffopts), **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))) @webcommand('filelog')