# HG changeset patch # User Yuya Nishihara # Date 1521461363 -32400 # Node ID 3e74d3cc500ffa729abd9be58499f7918956d435 # Parent 98c14e857e71e40d54c60c438eac386284cd08d5 highlight: peek Content-Type header set by hgweb There should be no need to re-render the mimetype template since it's set before dispatching webcommands. diff -r 98c14e857e71 -r 3e74d3cc500f hgext/highlight/__init__.py --- a/hgext/highlight/__init__.py Tue Mar 20 14:12:05 2018 +0800 +++ b/hgext/highlight/__init__.py Mon Mar 19 21:09:23 2018 +0900 @@ -35,7 +35,6 @@ ) from mercurial import ( - encoding, extensions, fileset, ) @@ -59,7 +58,7 @@ guessfilenameonly=filenameonly) def filerevision_highlight(orig, web, fctx): - mt = ''.join(web.tmpl('mimetype', encoding=encoding.encoding)) + mt = web.res.headers['Content-Type'] # only pygmentize for mimetype containing 'html' so we both match # 'text/html' and possibly 'application/xhtml+xml' in the future # so that we don't have to touch the extension when the mimetype @@ -73,7 +72,7 @@ return orig(web, fctx) def annotate_highlight(orig, web): - mt = ''.join(web.tmpl('mimetype', encoding=encoding.encoding)) + mt = web.res.headers['Content-Type'] if 'html' in mt: fctx = webutil.filectx(web.repo, web.req) pygmentize(web, 'annotateline', fctx, web.tmpl)