diff --git a/tests/legacy-encoding.hg b/tests/legacy-encoding.hg index 7b1a00d39063a15a9f92d6cb3d253117063b4a26..b3b9b25304ced2aba95f885f08b3117190181ea0 GIT binary patch literal 548 zc$@(w0^9vaM=>x$T4*^jL0KkKS=^;|T>t zwXP9CR%FN_O|~!rnPAKkrB72vjUJ;Q(?HO`gAmXLngB8~0ie@BGBjxQ8aAezQ`1mt zrqf1)Q)nd6Xvhs4P|yGYri~2%&;Sg8XaEC1NlGE=X`mV!0B9OCG-w8Z0001JVl>DB zp_4!ctjBG*f@HCcrrH`3tggLra?CbR&`zKf(83tRS~1jATOqm~J8ZHXU9s~uoY68l z6SR1lD4$mp!4?QuLm#Uim)2BOzKB)?LV(#DkyH#Gaov8nl24(QC^+9bzmSmHMyo4C z6}8f$JnVzBEtI+-31kA)_USxWXl)Lr4%*s8aEDDw1}Vy7xReHfVI~uGaxA+{BnlTS z@DQ1pK~9+_fIy*E6OKqQ%w}`dLys9pR#n#+GP|;2q9Ent16oKDzJk^{pi+(nw_rqO z>4I~p=S&x(M97gNLW+jB`NVhFv{cK&1Uj|^D(ZvLfElum+DA<37Q7)vAkArD`(}NY z+K}?6c7c 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 @@ echo % utf-8 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 --git a/tests/test-encoding.out b/tests/test-encoding.out --- a/tests/test-encoding.out +++ b/tests/test-encoding.out @@ -15,153 +15,153 @@ transaction abort! 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'