Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatefilters: make json filter handle multibyte characters correctly stable
authorYuya Nishihara <yuya@tcha.org>
Sat, 07 Aug 2010 16:27:16 +0900
branchstable
changeset 11765 aff419e260f9
parent 11758 a79214972da2
child 11766 a65ea28269ef
child 11769 ca6cebd8734e
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.
mercurial/templatefilters.py file | annotate | diff | comparison | revisions
tests/test-hgweb-commands file | annotate | diff | comparison | revisions
tests/test-hgweb-commands.out file | annotate | diff | comparison | revisions 
--- a/mercurial/templatefilters.py	Fri Aug 06 12:18:33 2010 -0500
+++ b/mercurial/templatefilters.py	Sat Aug 07 16:27:16 2010 +0900
@@ -156,9 +156,10 @@
     elif isinstance(obj, int) or isinstance(obj, float):
         return str(obj)
     elif isinstance(obj, str):
-        return '"%s"' % jsonescape(obj)
+        u = unicode(obj, encoding.encoding, 'replace')
+        return '"%s"' % jsonescape(u).encode('utf-8')
     elif isinstance(obj, unicode):
-        return json(obj.encode('utf-8'))
+        return '"%s"' % jsonescape(obj).encode('utf-8')
     elif hasattr(obj, 'keys'):
         out = []
         for k, v in obj.iteritems():
--- 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
--- a/tests/test-hgweb-commands.out	Fri Aug 06 12:18:33 2010 -0500
+++ b/tests/test-hgweb-commands.out	Sat Aug 07 16:27:16 2010 +0900
@@ -982,4 +982,7 @@
 	position: relative;
 	top: -1px;
 }
+% Stop and restart with HGENCODING=cp932
+% Graph json escape of multibyte character
+var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "能", "test", "1970-01-01", ["stable", true], ["tip"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"]]];
 % ERRORS ENCOUNTERED
mercurial