Mercurial > hg
view tests/test-status @ 12252:4481f8a93c7a stable
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | 54cd28258ea7 |
children |
line wrap: on
line source
#!/bin/sh hg init repo1 cd repo1 mkdir a b a/1 b/1 b/2 touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 echo "hg status in repo root:" hg status echo "hg status . in repo root:" hg status . for dir in a b a/1 b/1 b/2; do echo "hg status in $dir:" hg status --cwd "$dir" echo "hg status . in $dir:" hg status --cwd "$dir" . echo "hg status .. in $dir:" hg status --cwd "$dir" .. done cd .. hg init repo2 cd repo2 touch modified removed deleted ignored echo "^ignored$" > .hgignore hg ci -A -m 'initial checkin' -d "1000000 0" touch modified added unknown ignored hg add added hg remove removed rm deleted echo "hg status:" hg status echo "hg status modified added removed deleted unknown never-existed ignored:" hg status modified added removed deleted unknown never-existed ignored hg copy modified copied echo "hg status -C:" hg status -C echo "hg status -A:" hg status -A echo "^ignoreddir$" > .hgignore mkdir ignoreddir touch ignoreddir/file echo "hg status ignoreddir/file:" hg status ignoreddir/file echo "hg status -i ignoreddir/file:" hg status -i ignoreddir/file cd .. # check 'status -q' and some combinations hg init repo3 cd repo3 touch modified removed deleted ignored echo "^ignored$" > .hgignore hg commit -A -m 'initial checkin' touch added unknown ignored hg add added echo "test" >> modified hg remove removed rm deleted hg copy modified copied # Run status with 2 different flags. # Check if result is the same or different. # If result is not as expected, raise error assert() { hg status $1 > ../a hg status $2 > ../b out=`diff ../a ../b` if [ $? -ne 0 ]; then out=1 else out=0 fi if [ $3 -eq 0 ]; then df="same" else df="different" fi if [ $out -ne $3 ]; then echo "Error on $1 and $2, should be $df." fi } # assert flag1 flag2 [0-same | 1-different] assert "-q" "-mard" 0 assert "-A" "-marduicC" 0 assert "-qA" "-mardcC" 0 assert "-qAui" "-A" 0 assert "-qAu" "-marducC" 0 assert "-qAi" "-mardicC" 0 assert "-qu" "-u" 0 assert "-q" "-u" 1 assert "-m" "-a" 1 assert "-r" "-d" 1 cd .. hg init repo4 cd repo4 touch modified removed deleted hg ci -q -A -m 'initial checkin' -d "1000000 0" touch added unknown hg add added hg remove removed rm deleted echo x > modified hg copy modified copied hg ci -m 'test checkin' -d "1000001 0" rm * touch unrelated hg ci -q -A -m 'unrelated checkin' -d "1000002 0" echo "hg status --change 1:" hg status --change 1 echo "hg status --change 1 unrelated:" hg status --change 1 unrelated echo "hg status -C --change 1 added modified copied removed deleted:" hg status -C --change 1 added modified copied removed deleted echo "hg status -A --change 1" hg status -A --change 1