Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: wrap {diffopts} of annotate by hybriddict()
authorYuya Nishihara <yuya@tcha.org>
Wed, 04 Apr 2018 20:31:16 +0900
changeset 38139 d32f07069dd1
parent 38138 8e9ce73ceb15
child 38140 220058198be6
hgweb: wrap {diffopts} of annotate by hybriddict() The diffopts here is a plain dict, which should be wrapped by hybriddict.
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hgweb/webcommands.py	Wed Apr 04 20:29:58 2018 +0900
+++ b/mercurial/hgweb/webcommands.py	Wed Apr 04 20:31:16 2018 +0900
@@ -992,7 +992,7 @@
         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