Mercurial > hg-stable
changeset 6987:d09e813b21e3
highlight: only pygmentize for HTML mimetypes
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
| author | Rocco Rutte <pdmef@gmx.net> |
|---|---|
| date | Fri, 05 Sep 2008 10:39:57 +0200 |
| parents | 55c16f12908b |
| children | 907e4e9bd3c4 |
| files | hgext/highlight/__init__.py tests/test-highlight tests/test-highlight.out |
| diffstat | 3 files changed, 51 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/highlight/__init__.py Fri Sep 05 10:39:19 2008 +0200 +++ b/hgext/highlight/__init__.py Fri Sep 05 10:39:57 2008 +0200 @@ -25,14 +25,25 @@ web_annotate = webcommands.annotate def filerevision_highlight(web, tmpl, fctx): - style = web.config('web', 'pygments_style', 'colorful') - highlight.pygmentize('fileline', fctx, style, tmpl) + mt = ''.join(tmpl('mimetype', encoding=web.encoding)) + # 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 + # for a template changes; also hgweb optimizes the case that a + # raw file is sent using rawfile() and doesn't call us, so we + # can't clash with the file's content-type here in case we + # pygmentize a html file + if 'html' in mt: + style = web.config('web', 'pygments_style', 'colorful') + highlight.pygmentize('fileline', fctx, style, tmpl) return web_filerevision(web, tmpl, fctx) def annotate_highlight(web, req, tmpl): - fctx = webutil.filectx(web.repo, req) - style = web.config('web', 'pygments_style', 'colorful') - highlight.pygmentize('annotateline', fctx, style, tmpl) + mt = ''.join(tmpl('mimetype', encoding=web.encoding)) + if 'html' in mt: + fctx = webutil.filectx(web.repo, req) + style = web.config('web', 'pygments_style', 'colorful') + highlight.pygmentize('annotateline', fctx, style, tmpl) return web_annotate(web, req, tmpl) def generate_css(web, req, tmpl):
--- a/tests/test-highlight Fri Sep 05 10:39:19 2008 +0200 +++ b/tests/test-highlight Fri Sep 05 10:39:57 2008 +0200 @@ -18,14 +18,41 @@ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS -echo % hgweb filerevision +echo % hgweb filerevision, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \ | sed "s/[0-9]* years ago/long ago/g" -echo % hgweb fileannotate +echo % hgweb fileannotate, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \ | sed "s/[0-9]* years ago/long ago/g" +echo % hgweb fileannotate, raw +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py?style=raw') \ + | sed "s/test@//" > a + +echo "200 Script output follows" > b +echo "" >> b +echo "" >> b +hg annotate "get-with-headers.py" >> b +echo "" >> b +echo "" >> b +echo "" >> b +echo "" >> b + +diff -u b a + +echo +echo % hgweb filerevision, raw +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py?style=raw') \ + > a + +echo "200 Script output follows" > b +echo "" >> b +hg cat get-with-headers.py >> b + +diff -u b a + +echo echo % hgweb highlightcss friendly "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out head -n 4 out
--- a/tests/test-highlight.out Fri Sep 05 10:39:19 2008 +0200 +++ b/tests/test-highlight.out Fri Sep 05 10:39:57 2008 +0200 @@ -1,6 +1,6 @@ adding get-with-headers.py % hg serve -% hgweb filerevision +% hgweb filerevision, html 200 Script output follows <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -63,7 +63,7 @@ </body> </html> -% hgweb fileannotate +% hgweb fileannotate, html 200 Script output follows <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -130,6 +130,10 @@ </body> </html> +% hgweb fileannotate, raw + +% hgweb filerevision, raw + % hgweb highlightcss friendly 200 Script output follows