# HG changeset patch # User Yuya Nishihara <y...@tcha.org> # Date 1522841476 -32400 # Wed Apr 04 20:31:16 2018 +0900 # Node ID 11795e08de913fd3285f9052599e32d3dcde0c0d # Parent e58591b37eada3d982d2db29901c73e8b084c4f9 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') _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel