view tests/test-subrepo-deep-nested-change @ 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.

#!/bin/sh

echo % Preparing the subrepository 'sub2'
hg init sub2
echo sub2 > sub2/sub2
hg add -R sub2
hg commit -R sub2 -m "sub2 import"

echo % Preparing the 'sub1' repo which depends on the subrepo 'sub2'
hg init sub1
echo sub1 > sub1/sub1
echo "sub2 = ../sub2" > sub1/.hgsub
hg clone sub2 sub1/sub2 | sed 's/ .*sub/ ...sub/g'
hg add -R sub1
hg commit -R sub1 -m "sub1 import"

echo % Preparing the 'main' repo which depends on the subrepo 'sub1'
hg init main
echo main > main/main
echo "sub1 = ../sub1" > main/.hgsub
hg clone sub1 main/sub1  | sed 's/ .*sub/ ...sub/g'
hg add -R main
hg commit -R main -m "main import"

echo % Cleaning both repositories, just as a clone -U
hg up -C -R sub2 null
hg up -C -R sub1 null
hg up -C -R main null
rm -rf main/sub1
rm -rf sub1/sub2

echo % Clone main
hg clone main cloned | sed 's/ .*sub/ ...sub/g' 

echo % Checking cloned repo ids
printf "cloned " ; hg id -R cloned
printf "cloned/sub1 " ; hg id -R cloned/sub1
printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2

echo % debugsub output for main and sub1
hg debugsub -R cloned
hg debugsub -R cloned/sub1

echo % Modifying deeply nested 'sub2'
echo modified > cloned/sub1/sub2/sub2
hg commit -m "deep nested modif should trigger a commit" -R cloned

echo % Checking modified node ids
printf "cloned " ; hg id -R cloned
printf "cloned/sub1 " ; hg id -R cloned/sub1
printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2

echo % debugsub output for main and sub1
hg debugsub -R cloned
hg debugsub -R cloned/sub1

exit 0