diff -r c37ab438ff31 -r 1a4f925f72c3 mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py Wed Aug 05 14:03:45 2020 -0700 +++ b/mercurial/hgweb/hgwebdir_mod.py Wed Aug 05 14:19:42 2020 -0700 @@ -542,7 +542,7 @@ return self.ui.config(*args, **kwargs) vars = {} - styles, (style, mapfile) = hgweb_mod.getstyle( + styles, (style, mapfile, fp) = hgweb_mod.getstyle( req, config, self.templatepath ) if style == styles[0]: @@ -577,5 +577,6 @@ else: yield config(b'web', b'motd') - tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) - return tmpl + return templater.templater.frommapfile( + mapfile, fp=fp, defaults=defaults + )