test-encoding: make test output easier to follow

tests/test-encoding

@@ -1,61 +1,62 b''
 #!/bin/sh
 
 hg init t
 cd t
 
 # we need a repo with some legacy latin-1 changesets
 hg unbundle $TESTDIR/legacy-encoding.hg
 hg co
 
 python << EOF
 f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close()
 f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close()
 f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close()
 EOF
 
 echo % should fail with encoding error
 echo "plain old ascii" > a
 hg st
 HGENCODING=ascii hg ci -l latin-1 -d "1000000 0"
 
 echo % these should work
 echo "latin-1" > a
 HGENCODING=latin-1 hg ci -l latin-1 -d "1000000 0"
 echo "utf-8" > a
 HGENCODING=utf-8 hg ci -l utf-8 -d "1000000 0"
 
 HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag`
 HGENCODING=latin-1 hg branch `cat latin-1-tag`
 HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch'
 rm .hg/branch
 
-echo % ascii
+echo "% hg log (ascii)"
 hg --encoding ascii log
-echo % latin-1
+echo "% hg log (latin-1)"
 hg --encoding latin-1 log
-echo % utf-8
+echo "% hg log (utf-8)"
 hg --encoding utf-8 log
-echo % ascii
+echo "% hg tags (ascii)"
 HGENCODING=ascii hg tags
-echo % latin-1
+echo "% hg tags (latin-1)"
 HGENCODING=latin-1 hg tags
-echo % utf-8
+echo "% hg tags (utf-8)"
 HGENCODING=utf-8 hg tags
-echo % ascii
+echo "% hg branches (ascii)"
 HGENCODING=ascii hg branches
-echo % latin-1
+echo "% hg branches (latin-1)"
 HGENCODING=latin-1 hg branches
-echo % utf-8
+echo "% hg branches (utf-8)"
 HGENCODING=utf-8 hg branches
 
 echo '[ui]' >> .hg/hgrc
 echo 'fallbackencoding = koi8-r' >> .hg/hgrc
-echo % utf-8
+echo "% hg log (utf-8)"
 HGENCODING=utf-8 hg log
 
+echo "% hg log (dolphin)"
 HGENCODING=dolphin hg log
 
 HGENCODING=ascii hg branch `cat latin-1-tag`
 cp latin-1-tag .hg/branch
 HGENCODING=latin-1 hg ci -d "1000000 0" -m 'should fail'
 exit 0

tests/test-encoding.out

@@ -1,173 +1,174 b''
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail with encoding error
 M a
 ? latin-1
 ? latin-1-tag
 ? utf-8
 transaction abort!
 rollback completed
 abort: decoding near ' encoded: �': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!
 % these should work
 marked working directory as branch �
-% ascii
+% hg log (ascii)
 changeset:   5:db5520b4645f
 branch:      ?
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin1 branch
 
 changeset:   4:9cff3c980b58
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added tag ? for changeset 770b9b11621d
 
 changeset:   3:770b9b11621d
 tag:         ?
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     utf-8 e' encoded: ?
 
 changeset:   2:0572af48b948
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e' encoded: ?
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': ? = u'\xe9'
 
-% latin-1
+% hg log (latin-1)
 changeset:   5:db5520b4645f
 branch:      �
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin1 branch
 
 changeset:   4:9cff3c980b58
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added tag � for changeset 770b9b11621d
 
 changeset:   3:770b9b11621d
 tag:         �
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     utf-8 e' encoded: �
 
 changeset:   2:0572af48b948
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e' encoded: �
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ����� = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': � = u'\xe9'
 
-% utf-8
+% hg log (utf-8)
 changeset:   5:db5520b4645f
 branch:      é
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin1 branch
 
 changeset:   4:9cff3c980b58
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added tag é for changeset 770b9b11621d
 
 changeset:   3:770b9b11621d
 tag:         é
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     utf-8 e' encoded: é
 
 changeset:   2:0572af48b948
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e' encoded: é
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': é = u'\xe9'
 
-% ascii
+% hg tags (ascii)
 tip                                5:db5520b4645f
 ?                                  3:770b9b11621d
-% latin-1
+% hg tags (latin-1)
 tip                                5:db5520b4645f
 �                                  3:770b9b11621d
-% utf-8
+% hg tags (utf-8)
 tip                                5:db5520b4645f
 é                                  3:770b9b11621d
-% ascii
+% hg branches (ascii)
 ?                              5:db5520b4645f
 default                        4:9cff3c980b58 (inactive)
-% latin-1
+% hg branches (latin-1)
 �                              5:db5520b4645f
 default                        4:9cff3c980b58 (inactive)
-% utf-8
+% hg branches (utf-8)
 é                              5:db5520b4645f
 default                        4:9cff3c980b58 (inactive)
-% utf-8
+% hg log (utf-8)
 changeset:   5:db5520b4645f
 branch:      é
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin1 branch
 
 changeset:   4:9cff3c980b58
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added tag é for changeset 770b9b11621d
 
 changeset:   3:770b9b11621d
 tag:         é
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     utf-8 e' encoded: é
 
 changeset:   2:0572af48b948
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e' encoded: é
 
 changeset:   1:0e5b7e3f9c4a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c'
 
 changeset:   0:1e78a93102a3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     latin-1 e': И = u'\xe9'
 
+% hg log (dolphin)
 abort: unknown encoding: dolphin, please check your locale settings
 abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
 abort: branch name not in UTF-8!