diff mercurial/simplemerge.py @ 26856:baa77652be68 stable

templatefilters: try round-trip utf-8 conversion by json filter (issue4933) As JSON string is known to be a unicode, we should try round-trip conversion for localstr type. This patch tests localstr type explicitly because encoding.fromlocal() may raise Abort for undecodable str, which is probably not what we want. Maybe we can refactor json filter to use encoding module more later. Still "{desc|json}" can't round-trip because showdescription() modifies a localstr object.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 04 Nov 2015 23:48:15 +0900
parents ef1eb6df7071
children a504794cee29
line wrap: on
line diff