undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t8005: convert CP1251 character set to ISO8859-5

Browse Source 
On IRIX 6.5 CP1251 is unknown, but WIN1251 (which seems to be a
non-standard name) is known.  On Solaris 10, the opposite is true.  Solaris
also knows CP1251 as WINDOWS-1251, but this too is not recognized on IRIX.
I could not find a name that both platforms recognized for this character
set.

An alternative character set which covers the same alphabet seems to be the
ISO8859-5 character set.  Both platforms support this character set, so use
it instead.

This allows t8005.4 to pass on Solaris 7, and part of the test to pass on
IRIX. (My IRIX can't convert SJIS to UTF-8 :(

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2009-05-22 18:47:06 -05:00 committed by Junio C Hamano
parent bdb0a7e4e4
commit bb43414b37
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
t/t8005-blame-i18n.sh
View File

@ -4,7 +4,7 @@ test_description='git blame encoding conversion'
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/t8005/utf8.txt . "$TEST_DIRECTORY"/t8005/utf8.txt
. "$TEST_DIRECTORY"/t8005/cp1251.txt . "$TEST_DIRECTORY"/t8005/iso8859-5.txt
. "$TEST_DIRECTORY"/t8005/sjis.txt . "$TEST_DIRECTORY"/t8005/sjis.txt
test_expect_success 'setup the repository' ' test_expect_success 'setup the repository' '
@ -13,10 +13,10 @@ test_expect_success 'setup the repository' '
git add file && git add file &&
git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" && git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
echo "CP1251 LINE" >> file && echo "KOI8-R LINE" >> file &&
git add file && git add file &&
git config i18n.commitencoding cp1251 && git config i18n.commitencoding ISO8859-5 &&
git commit --author "$CP1251_NAME <cp1251@localhost>" -m "$CP1251_MSG" && git commit --author "$ISO8859_5_NAME <iso8859-5@localhost>" -m "$ISO8859_5_MSG" &&
echo "SJIS LINE" >> file && echo "SJIS LINE" >> file &&
git add file && git add file &&
@ -41,17 +41,17 @@ test_expect_success \
' '
cat >expected <<EOF cat >expected <<EOF
author $CP1251_NAME author $ISO8859_5_NAME
summary $CP1251_MSG summary $ISO8859_5_MSG
author $CP1251_NAME author $ISO8859_5_NAME
summary $CP1251_MSG summary $ISO8859_5_MSG
author $CP1251_NAME author $ISO8859_5_NAME
summary $CP1251_MSG summary $ISO8859_5_MSG
EOF EOF
test_expect_success \ test_expect_success \
'blame respects i18n.logoutputencoding' ' 'blame respects i18n.logoutputencoding' '
git config i18n.logoutputencoding cp1251 && git config i18n.logoutputencoding ISO8859-5 &&
git blame --incremental file | \ git blame --incremental file | \
egrep "^(author|summary) " > actual && egrep "^(author|summary) " > actual &&
test_cmp actual expected test_cmp actual expected
@ -76,8 +76,8 @@ test_expect_success \
cat >expected <<EOF cat >expected <<EOF
author $SJIS_NAME author $SJIS_NAME
summary $SJIS_MSG summary $SJIS_MSG
author $CP1251_NAME author $ISO8859_5_NAME
summary $CP1251_MSG summary $ISO8859_5_MSG
author $UTF8_NAME author $UTF8_NAME
summary $UTF8_MSG summary $UTF8_MSG
EOF EOF

2
t/t8005/cp1251.txt
View File

@ -1,2 +0,0 @@
CP1251_NAME="Иван Петрович Сидоров"
CP1251_MSG="Тестовое сообщение"

2
t/t8005/iso8859-5.txt Normal file
View File

@ -0,0 +1,2 @@
ISO8859_5_NAME="Иван Петрович Сидоров"
ISO8859_5_MSG="Тестовое сообщение"