# HG changeset patch # User Thomas Arendsen Hein # Date 1165659387 -3600 # Node ID 3820385fb113d1fee9caae86ab9975be9cc07630 # Parent dec4eba7ccad37bebd7ebb788ab25ae69b7ea776 Fixes test-encoding for python2.3 and minor cleanups: - Use koi8-r instead of euc-jp, as the later isn't available in python2.3. - Add unicode representation for latin1 e', too. - Use date "1000000 0" like in other tests (though not strictly needed because we no longer use %c as default datestr format). diff -r dec4eba7ccad -r 3820385fb113 tests/legacy-encoding.hg Binary file tests/legacy-encoding.hg has changed diff -r dec4eba7ccad -r 3820385fb113 tests/test-encoding --- a/tests/test-encoding Sat Dec 09 09:30:29 2006 +0100 +++ b/tests/test-encoding Sat Dec 09 11:16:27 2006 +0100 @@ -16,17 +16,17 @@ echo % should fail with encoding error echo "plain old ascii" > a hg st -HGENCODING=ascii hg ci -l latin-1 -d "0 0" +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 "0 0" +HGENCODING=latin-1 hg ci -l latin-1 -d "1000000 0" echo "utf-8" > a -HGENCODING=utf-8 hg ci -l utf-8 -d "0 0" +HGENCODING=utf-8 hg ci -l utf-8 -d "1000000 0" -HGENCODING=latin-1 hg tag -d "0 0" `cat latin-1-tag` +HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag` cp latin-1-tag .hg/branch -HGENCODING=latin-1 hg ci -d "0 0" -m 'latin1 branch' +HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch' rm .hg/branch echo % ascii @@ -49,6 +49,6 @@ HGENCODING=utf-8 hg branches echo '[ui]' >> .hg/hgrc -echo 'fallbackencoding = euc-jp' >> .hg/hgrc +echo 'fallbackencoding = koi8-r' >> .hg/hgrc echo % utf-8 HGENCODING=utf-8 hg log diff -r dec4eba7ccad -r 3820385fb113 tests/test-encoding.out --- a/tests/test-encoding.out Sat Dec 09 09:30:29 2006 +0100 +++ b/tests/test-encoding.out Sat Dec 09 11:16:27 2006 +0100 @@ -15,153 +15,153 @@ rollback completed % these should work % ascii -changeset: 5:e4ed49b8a8f0 +changeset: 5:db5520b4645f branch: ? tag: tip user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch -changeset: 4:a02ca5a58e99 +changeset: 4:9cff3c980b58 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added tag ? for changeset d47908dab82f +date: Mon Jan 12 13:46:40 1970 +0000 +summary: Added tag ? for changeset 770b9b11621d -changeset: 3:d47908dab82f +changeset: 3:770b9b11621d tag: ? user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: ? -changeset: 2:9db1985f3097 +changeset: 2:0572af48b948 user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: ? -changeset: 1:af6e0db4427c +changeset: 1:0e5b7e3f9c4a user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: euc-jp: ?????? = u'\u65e5\u672c\u8a9e' +date: Mon Jan 12 13:46:40 1970 +0000 +summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' -changeset: 0:60aad1dd20a9 +changeset: 0:1e78a93102a3 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: latin-1 e': ? +date: Mon Jan 12 13:46:40 1970 +0000 +summary: latin-1 e': ? = u'\xe9' % latin-1 -changeset: 5:e4ed49b8a8f0 +changeset: 5:db5520b4645f branch: é tag: tip user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch -changeset: 4:a02ca5a58e99 +changeset: 4:9cff3c980b58 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added tag é for changeset d47908dab82f +date: Mon Jan 12 13:46:40 1970 +0000 +summary: Added tag é for changeset 770b9b11621d -changeset: 3:d47908dab82f +changeset: 3:770b9b11621d tag: é user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é -changeset: 2:9db1985f3097 +changeset: 2:0572af48b948 user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é -changeset: 1:af6e0db4427c +changeset: 1:0e5b7e3f9c4a user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: euc-jp: ÆüËܸì = u'\u65e5\u672c\u8a9e' +date: Mon Jan 12 13:46:40 1970 +0000 +summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' -changeset: 0:60aad1dd20a9 +changeset: 0:1e78a93102a3 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: latin-1 e': é +date: Mon Jan 12 13:46:40 1970 +0000 +summary: latin-1 e': é = u'\xe9' % utf-8 -changeset: 5:e4ed49b8a8f0 +changeset: 5:db5520b4645f branch: é tag: tip user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch -changeset: 4:a02ca5a58e99 +changeset: 4:9cff3c980b58 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added tag é for changeset d47908dab82f +date: Mon Jan 12 13:46:40 1970 +0000 +summary: Added tag é for changeset 770b9b11621d -changeset: 3:d47908dab82f +changeset: 3:770b9b11621d tag: é user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é -changeset: 2:9db1985f3097 +changeset: 2:0572af48b948 user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é -changeset: 1:af6e0db4427c +changeset: 1:0e5b7e3f9c4a user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: euc-jp: ÆüËܸì = u'\u65e5\u672c\u8a9e' +date: Mon Jan 12 13:46:40 1970 +0000 +summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' -changeset: 0:60aad1dd20a9 +changeset: 0:1e78a93102a3 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: latin-1 e': é +date: Mon Jan 12 13:46:40 1970 +0000 +summary: latin-1 e': é = u'\xe9' % ascii -tip 5:e4ed49b8a8f0 -? 3:d47908dab82f +tip 5:db5520b4645f +? 3:770b9b11621d % latin-1 -tip 5:e4ed49b8a8f0 -é 3:d47908dab82f +tip 5:db5520b4645f +é 3:770b9b11621d % utf-8 -tip 5:e4ed49b8a8f0 -é 3:d47908dab82f +tip 5:db5520b4645f +é 3:770b9b11621d % ascii -? 5:e4ed49b8a8f0 +? 5:db5520b4645f % latin-1 -é 5:e4ed49b8a8f0 +é 5:db5520b4645f % utf-8 -é 5:e4ed49b8a8f0 +é 5:db5520b4645f % utf-8 -changeset: 5:e4ed49b8a8f0 +changeset: 5:db5520b4645f branch: é tag: tip user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch -changeset: 4:a02ca5a58e99 +changeset: 4:9cff3c980b58 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added tag é for changeset d47908dab82f +date: Mon Jan 12 13:46:40 1970 +0000 +summary: Added tag é for changeset 770b9b11621d -changeset: 3:d47908dab82f +changeset: 3:770b9b11621d tag: é user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é -changeset: 2:9db1985f3097 +changeset: 2:0572af48b948 user: test -date: Thu Jan 01 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é -changeset: 1:af6e0db4427c +changeset: 1:0e5b7e3f9c4a user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: euc-jp: 日本語 = u'\u65e5\u672c\u8a9e' +date: Mon Jan 12 13:46:40 1970 +0000 +summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' -changeset: 0:60aad1dd20a9 +changeset: 0:1e78a93102a3 user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: latin-1 e': � +date: Mon Jan 12 13:46:40 1970 +0000 +summary: latin-1 e': И = u'\xe9'