view tests/test-issue522 @ 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 6c82beaaa11a
children
line wrap: on
line source

#!/bin/sh

# In the merge below, the file "foo" has the same contents in both
# parents, but if we look at the file-level history, we'll notice that
# the version in p1 is an ancestor of the version in p2.  This test
# makes sure that we'll use the version from p2 in the manifest of the
# merge revision.

hg init repo
cd repo

echo foo > foo
hg ci -qAm 'add foo'

echo bar >> foo
hg ci -m 'change foo'

hg backout -r tip -m 'backout changed foo'

hg up -C 0
touch bar
hg ci -qAm 'add bar'

hg merge --debug
hg debugstate | grep foo
hg st -A foo
hg ci -m 'merge'

hg manifest --debug | grep foo
hg debugindex .hg/store/data/foo.i