Mercurial > public > mercurial-scm > hg-stable
diff hgext/highlight/highlight.py @ 7120:db7557359636
highlight: convert text to local before passing to pygmentize (issue1341)
Example case:
Display file written in iso-8859-1 with current HGENCODING utf-8.
At the moment only an Error page appears because pygmentize
chokes on the replacement chars.
Alternatives:
1) Turn off highlighting and avoid UnicodeDecodeError
for files that are not in HGENCODING.
2) [this patch] use util.tolocal to display these files.
Alternative 2) seems ok, as this only concerns display and
readability.
See also: fe38b0a3a928, apparently put aside during refactor of
highlight.
Add test for UnicodeDecodeError with iso-8859-1 file contents.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 17 Oct 2008 12:12:33 +0200 |
parents | ce94b3236ea4 |
children | de377b1a9a84 |
line wrap: on
line diff
--- a/hgext/highlight/highlight.py Sat Oct 18 04:26:06 2008 -0500 +++ b/hgext/highlight/highlight.py Fri Oct 17 12:12:33 2008 +0200 @@ -29,6 +29,9 @@ if util.binary(text): return + # avoid UnicodeDecodeError in pygments + text = util.tolocal(text) + # To get multi-line strings right, we can't format line-by-line try: lexer = guess_lexer_for_filename(fctx.path(), text[:1024],