Mercurial > public > mercurial-scm > hg-stable
diff tests/test-hgweb-commands @ 11765:aff419e260f9 stable
templatefilters: make json filter handle multibyte characters correctly
It aims to fix javascript error of hgweb's graph view in Japanese 'cp932'
encoding.
'cp932' contains multibyte characters ending with '\x5c' (backslash),
e.g. '\x94\x5c' for Japanese Kanji 'Noh'.
Due to json filter escapes '\' to '\\', multibyte string ending with
'\x5c' is translated to "xxx\", resulting javascript parse error on
a web browser.
This patch changes json() to pass unicode to jsonescape().
Unicode decoding error handler changed to 'replace' by Patrick M?zard.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 07 Aug 2010 16:27:16 +0900 |
| parents | 1a8df80dfdde |
| children | a65ea28269ef |
line wrap: on
line diff
--- a/tests/test-hgweb-commands Fri Aug 06 12:18:33 2010 -0500 +++ b/tests/test-hgweb-commands Sat Aug 07 16:27:16 2010 +0900 @@ -60,5 +60,19 @@ echo % Static files "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/static/style.css' +echo % Stop and restart with HGENCODING=cp932 +"$TESTDIR/killdaemons.py" +HGENCODING=cp932 hg serve --config server.uncompressed=False -n test \ + -p $HGPORT -d --pid-file=hg.pid -E errors.log +cat hg.pid >> $DAEMON_PIDS + +# commit message with Japanese Kanji 'Noh', which ends with '\x5c' +echo foo >> foo +HGENCODING=cp932 hg ci -m `python -c 'print("\x94\x5c")'` + +echo % Graph json escape of multibyte character +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \ + | grep '^var data =' + echo % ERRORS ENCOUNTERED cat errors.log