changeset 38139:d32f07069dd1

hgweb: wrap {diffopts} of annotate by hybriddict() The diffopts here is a plain dict, which should be wrapped by hybriddict.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 04 Apr 2018 20:31:16 +0900
parents 8e9ce73ceb15
children 220058198be6
files mercurial/hgweb/webcommands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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')