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

t9139 uses ancient, backwards-compatible iconv names

Browse Source 
This resolves a semantic conflicts early to work with 5ae93df (t3900: use
ancient iconv names for backward compatibility, 2009-05-18).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Wong 2009-05-29 17:14:47 -07:00 committed by Junio C Hamano
commit 188643140b
17 changed files with 91 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-log.c
View File

@ -619,7 +619,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct shortlog log; struct shortlog log;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
int i; int i;
const char *encoding = "utf-8"; const char *encoding = "UTF-8";
struct diff_options opts; struct diff_options opts;
int need_8bit_cte = 0; int need_8bit_cte = 0;
struct commit *commit = NULL; struct commit *commit = NULL;

10
builtin-mailinfo.c
View File

@ -193,8 +193,7 @@ static void handle_content_type(struct strbuf *line)
*content_top = boundary; *content_top = boundary;
boundary = NULL; boundary = NULL;
} }
if (slurp_attr(line->buf, "charset=", &charset)) slurp_attr(line->buf, "charset=", &charset);
strbuf_tolower(&charset);
if (boundary) { if (boundary) {
strbuf_release(boundary); strbuf_release(boundary);
@ -481,7 +480,7 @@ static const char *guess_charset(const struct strbuf *line, const char *target_c
if (is_utf8(line->buf)) if (is_utf8(line->buf))
return NULL; return NULL;
} }
return "latin1"; return "ISO8859-1";
} }
static void convert_to_utf8(struct strbuf *line, const char *charset) static void convert_to_utf8(struct strbuf *line, const char *charset)
@ -494,7 +493,7 @@ static void convert_to_utf8(struct strbuf *line, const char *charset)
return; return;
} }
if (!strcmp(metainfo_charset, charset)) if (!strcasecmp(metainfo_charset, charset))
return; return;
out = reencode_string(line->buf, metainfo_charset, charset); out = reencode_string(line->buf, metainfo_charset, charset);
if (!out) if (!out)
@ -550,7 +549,6 @@ static int decode_header_bq(struct strbuf *it)
if (cp + 3 - it->buf > it->len) if (cp + 3 - it->buf > it->len)
goto decode_header_bq_out; goto decode_header_bq_out;
strbuf_add(&charset_q, ep, cp - ep); strbuf_add(&charset_q, ep, cp - ep);
strbuf_tolower(&charset_q);
encoding = cp[1]; encoding = cp[1];
if (!encoding || cp[2] != '?') if (!encoding || cp[2] != '?')
@ -944,7 +942,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
*/ */
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
def_charset = (git_commit_encoding ? git_commit_encoding : "utf-8"); def_charset = (git_commit_encoding ? git_commit_encoding : "UTF-8");
metainfo_charset = def_charset; metainfo_charset = def_charset;
while (1 < argc && argv[1][0] == '-') { while (1 < argc && argv[1][0] == '-') {

4
builtin-revert.c
View File

@ -323,9 +323,9 @@ static int revert_or_cherry_pick(int argc, const char **argv)
encoding = get_encoding(message); encoding = get_encoding(message);
if (!encoding) if (!encoding)
encoding = "utf-8"; encoding = "UTF-8";
if (!git_commit_encoding) if (!git_commit_encoding)
git_commit_encoding = "utf-8"; git_commit_encoding = "UTF-8";
if ((reencoded_message = reencode_string(message, if ((reencoded_message = reencode_string(message,
git_commit_encoding, encoding))) git_commit_encoding, encoding)))
message = reencoded_message; message = reencoded_message;

4
pretty.c
View File

@ -284,7 +284,7 @@ static char *replace_encoding_header(char *buf, const char *encoding)
static char *logmsg_reencode(const struct commit *commit, static char *logmsg_reencode(const struct commit *commit,
const char *output_encoding) const char *output_encoding)
{ {
static const char *utf8 = "utf-8"; static const char *utf8 = "UTF-8";
const char *use_encoding; const char *use_encoding;
char *encoding; char *encoding;
char *out; char *out;
@ -881,7 +881,7 @@ char *reencode_commit_message(const struct commit *commit, const char **encoding
? git_log_output_encoding ? git_log_output_encoding
: git_commit_encoding); : git_commit_encoding);
if (!encoding) if (!encoding)
encoding = "utf-8"; encoding = "UTF-8";
if (encoding_p) if (encoding_p)
*encoding_p = encoding; *encoding_p = encoding;
return logmsg_reencode(commit, encoding); return logmsg_reencode(commit, encoding);

28
t/t3900-i18n-commit.sh
View File

@ -34,7 +34,7 @@ test_expect_success 'no encoding header for base case' '
test z = "z$E" test z = "z$E"
' '
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "$H setup" ' test_expect_success "$H setup" '
git config i18n.commitencoding $H && git config i18n.commitencoding $H &&
@ -44,7 +44,7 @@ do
' '
done done
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "check encoding header for $H" ' test_expect_success "check encoding header for $H" '
E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") && E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") &&
@ -61,14 +61,14 @@ test_expect_success 'config to remove customization' '
else else
test z = "z$Z" test z = "z$Z"
fi && fi &&
git config i18n.commitencoding utf-8 git config i18n.commitencoding UTF-8
' '
test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' ' test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
compare_with ISO-8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
' '
for H in EUCJP ISO-2022-JP for H in eucJP ISO-2022-JP
do do
test_expect_success "$H should be shown in UTF-8 now" ' test_expect_success "$H should be shown in UTF-8 now" '
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
@ -86,7 +86,7 @@ test_expect_success 'config to add customization' '
fi fi
' '
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "$H should be shown in itself now" ' test_expect_success "$H should be shown in itself now" '
git config i18n.commitencoding '$H' && git config i18n.commitencoding '$H' &&
@ -95,21 +95,21 @@ do
done done
test_expect_success 'config to tweak customization' ' test_expect_success 'config to tweak customization' '
git config i18n.logoutputencoding utf-8 git config i18n.logoutputencoding UTF-8
' '
test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' ' test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
compare_with ISO-8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
' '
for H in EUCJP ISO-2022-JP for H in eucJP ISO-2022-JP
do do
test_expect_success "$H should be shown in UTF-8 now" ' test_expect_success "$H should be shown in UTF-8 now" '
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
' '
done done
for J in EUCJP ISO-2022-JP for J in eucJP ISO-2022-JP
do do
if test "$J" = ISO-2022-JP if test "$J" = ISO-2022-JP
then then
@ -118,7 +118,7 @@ do
ICONV= ICONV=
fi fi
git config i18n.logoutputencoding $J git config i18n.logoutputencoding $J
for H in EUCJP ISO-2022-JP for H in eucJP ISO-2022-JP
do do
test_expect_success "$H should be shown in $J now" ' test_expect_success "$H should be shown in $J now" '
compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV
@ -126,7 +126,7 @@ do
done done
done done
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "No conversion with $H" ' test_expect_success "No conversion with $H" '
compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt

0
t/t3900/ISO-8859-1.txt → t/t3900/ISO8859-1.txt
View File

0
t/t3900/EUCJP.txt → t/t3900/eucJP.txt
View File

40
t/t3901-i18n-patch.sh
View File

@ -17,9 +17,9 @@ check_encoding () {
git cat-file commit HEAD~$j | git cat-file commit HEAD~$j |
case "$header" in case "$header" in
8859) 8859)
grep "^encoding ISO-8859-1" ;; grep "^encoding ISO8859-1" ;;
*) *)
! grep "^encoding ISO-8859-1" ;; grep "^encoding ISO8859-1"; test "$?" != 0 ;;
esac || { esac || {
bad=1 bad=1
break break
@ -55,7 +55,7 @@ test_expect_success setup '
git commit -s -m "Second on side" && git commit -s -m "Second on side" &&
# the second one on the side branch is ISO-8859-1 # the second one on the side branch is ISO-8859-1
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
# use author and committer name in ISO-8859-1 to match it. # use author and committer name in ISO-8859-1 to match it.
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
test_tick && test_tick &&
@ -68,14 +68,14 @@ test_expect_success setup '
' '
test_expect_success 'format-patch output (ISO-8859-1)' ' test_expect_success 'format-patch output (ISO-8859-1)' '
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
git format-patch --stdout master..HEAD^ >out-l1 && git format-patch --stdout master..HEAD^ >out-l1 &&
git format-patch --stdout HEAD^ >out-l2 && git format-patch --stdout HEAD^ >out-l2 &&
grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l1 && grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
grep "^From: =?ISO-8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 && grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l2 && grep "^Content-Type: text/plain; charset=ISO8859-1" out-l2 &&
grep "^From: =?ISO-8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2 grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2
' '
test_expect_success 'format-patch output (UTF-8)' ' test_expect_success 'format-patch output (UTF-8)' '
@ -110,7 +110,7 @@ test_expect_success 'rebase (U/U)' '
test_expect_success 'rebase (U/L)' ' test_expect_success 'rebase (U/L)' '
git config i18n.commitencoding UTF-8 && git config i18n.commitencoding UTF-8 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-utf8.txt && . "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard side && git reset --hard side &&
@ -121,8 +121,8 @@ test_expect_success 'rebase (U/L)' '
test_expect_success 'rebase (L/L)' ' test_expect_success 'rebase (L/L)' '
# In this test we want ISO-8859-1 encoded commits as the result # In this test we want ISO-8859-1 encoded commits as the result
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side && git reset --hard side &&
@ -134,7 +134,7 @@ test_expect_success 'rebase (L/L)' '
test_expect_success 'rebase (L/U)' ' test_expect_success 'rebase (L/U)' '
# This is pathological -- use UTF-8 as intermediate form # This is pathological -- use UTF-8 as intermediate form
# to get ISO-8859-1 results. # to get ISO-8859-1 results.
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding UTF-8 && git config i18n.logoutputencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
@ -162,8 +162,8 @@ test_expect_success 'cherry-pick(U/U)' '
test_expect_success 'cherry-pick(L/L)' ' test_expect_success 'cherry-pick(L/L)' '
# Both the commitencoding and logoutputencoding is set to ISO-8859-1 # Both the commitencoding and logoutputencoding is set to ISO-8859-1
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard master && git reset --hard master &&
@ -178,7 +178,7 @@ test_expect_success 'cherry-pick(U/L)' '
# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1 # Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
git config i18n.commitencoding UTF-8 && git config i18n.commitencoding UTF-8 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-utf8.txt && . "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard master && git reset --hard master &&
@ -193,7 +193,7 @@ test_expect_success 'cherry-pick(L/U)' '
# Again, the commitencoding is set to ISO-8859-1 but # Again, the commitencoding is set to ISO-8859-1 but
# logoutputencoding is set to UTF-8. # logoutputencoding is set to UTF-8.
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding UTF-8 && git config i18n.logoutputencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
@ -218,7 +218,7 @@ test_expect_success 'rebase --merge (U/U)' '
test_expect_success 'rebase --merge (U/L)' ' test_expect_success 'rebase --merge (U/L)' '
git config i18n.commitencoding UTF-8 && git config i18n.commitencoding UTF-8 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-utf8.txt && . "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard side && git reset --hard side &&
@ -229,8 +229,8 @@ test_expect_success 'rebase --merge (U/L)' '
test_expect_success 'rebase --merge (L/L)' ' test_expect_success 'rebase --merge (L/L)' '
# In this test we want ISO-8859-1 encoded commits as the result # In this test we want ISO-8859-1 encoded commits as the result
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding ISO-8859-1 && git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side && git reset --hard side &&
@ -242,7 +242,7 @@ test_expect_success 'rebase --merge (L/L)' '
test_expect_success 'rebase --merge (L/U)' ' test_expect_success 'rebase --merge (L/U)' '
# This is pathological -- use UTF-8 as intermediate form # This is pathological -- use UTF-8 as intermediate form
# to get ISO-8859-1 results. # to get ISO-8859-1 results.
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
git config i18n.logoutputencoding UTF-8 && git config i18n.logoutputencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&

32
t/t5100/rfc2047-samples.mbox
View File

@ -1,48 +1,48 @@
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
From: =?US-ASCII?Q?Keith_Moore?= <moore@cs.utk.edu> From: =?US-ASCII?Q?Keith_Moore?= <moore@cs.utk.edu>
To: =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= <keld@dkuug.dk> To: =?ISO8859-1?Q?Keld_J=F8rn_Simonsen?= <keld@dkuug.dk>
CC: =?ISO-8859-1?Q?Andr=E9?= Pirard <PIRARD@vm1.ulg.ac.be> CC: =?ISO8859-1?Q?Andr=E9?= Pirard <PIRARD@vm1.ulg.ac.be>
Subject: =?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?= Subject: =?ISO8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?=
=?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?= =?ISO8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
From: =?ISO-8859-1?Q?Olle_J=E4rnefors?= <ojarnef@admin.kth.se> From: =?ISO8859-1?Q?Olle_J=E4rnefors?= <ojarnef@admin.kth.se>
To: ietf-822@dimacs.rutgers.edu, ojarnef@admin.kth.se To: ietf-822@dimacs.rutgers.edu, ojarnef@admin.kth.se
Subject: Time for ISO 10646? Subject: Time for ISO 10646?
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
To: Dave Crocker <dcrocker@mordor.stanford.edu> To: Dave Crocker <dcrocker@mordor.stanford.edu>
Cc: ietf-822@dimacs.rutgers.edu, paf@comsol.se Cc: ietf-822@dimacs.rutgers.edu, paf@comsol.se
From: =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <paf@nada.kth.se> From: =?ISO8859-1?Q?Patrik_F=E4ltstr=F6m?= <paf@nada.kth.se>
Subject: Re: RFC-HDR care and feeding Subject: Re: RFC-HDR care and feeding
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
From: Nathaniel Borenstein <nsb@thumper.bellcore.com> From: Nathaniel Borenstein <nsb@thumper.bellcore.com>
(=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=) (=?ISO8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
To: Greg Vaudreuil <gvaudre@NRI.Reston.VA.US>, Ned Freed To: Greg Vaudreuil <gvaudre@NRI.Reston.VA.US>, Ned Freed
<ned@innosoft.com>, Keith Moore <moore@cs.utk.edu> <ned@innosoft.com>, Keith Moore <moore@cs.utk.edu>
Subject: Test of new header generator Subject: Test of new header generator
MIME-Version: 1.0 MIME-Version: 1.0
Content-type: text/plain; charset=ISO-8859-1 Content-type: text/plain; charset=ISO8859-1
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?=) Subject: (=?ISO8859-1?Q?a?=)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?= b) Subject: (=?ISO8859-1?Q?a?= b)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=) Subject: (=?ISO8859-1?Q?a?= =?ISO8859-1?Q?b?=)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=) Subject: (=?ISO8859-1?Q?a?= =?ISO8859-1?Q?b?=)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?= Subject: (=?ISO8859-1?Q?a?=
=?ISO-8859-1?Q?b?=) =?ISO8859-1?Q?b?=)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a_b?=) Subject: (=?ISO8859-1?Q?a_b?=)
From nobody Mon Sep 17 00:00:00 2001 From nobody Mon Sep 17 00:00:00 2001
Subject: (=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=) Subject: (=?ISO8859-1?Q?a?= =?ISO8859-2?Q?_b?=)

8
t/t5100/sample.mbox
View File

@ -99,7 +99,7 @@ index 9123cdc..918dcf8 100644
From nobody Sat Aug 27 23:07:49 2005 From nobody Sat Aug 27 23:07:49 2005
Path: news.gmane.org!not-for-mail Path: news.gmane.org!not-for-mail
Message-ID: <20050721.091036.01119516.yoshfuji@linux-ipv6.org> Message-ID: <20050721.091036.01119516.yoshfuji@linux-ipv6.org>
From: YOSHIFUJI Hideaki / =?iso-2022-jp?B?GyRCNUhGIzFRTEAbKEI=?= From: YOSHIFUJI Hideaki / =?ISO-2022-JP?B?GyRCNUhGIzFRTEAbKEI=?=
<yoshfuji@linux-ipv6.org> <yoshfuji@linux-ipv6.org>
Newsgroups: gmane.comp.version-control.git Newsgroups: gmane.comp.version-control.git
Subject: [PATCH 1/2] GIT: Try all addresses for given remote name Subject: [PATCH 1/2] GIT: Try all addresses for given remote name
@ -218,7 +218,7 @@ GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
From nobody Sat Aug 27 23:07:49 2005 From nobody Sat Aug 27 23:07:49 2005
Path: news.gmane.org!not-for-mail Path: news.gmane.org!not-for-mail
Message-ID: <u5tacjjdpxq.fsf@lysator.liu.se> Message-ID: <u5tacjjdpxq.fsf@lysator.liu.se>
From: =?iso-8859-1?Q?David_K=E5gedal?= <davidk@lysator.liu.se> From: =?ISO8859-1?Q?David_K=E5gedal?= <davidk@lysator.liu.se>
Newsgroups: gmane.comp.version-control.git Newsgroups: gmane.comp.version-control.git
Subject: [PATCH] Fixed two bugs in git-cvsimport-script. Subject: [PATCH] Fixed two bugs in git-cvsimport-script.
Date: Mon, 15 Aug 2005 20:18:25 +0200 Date: Mon, 15 Aug 2005 20:18:25 +0200
@ -226,7 +226,7 @@ Lines: 83
Approved: news@gmane.org Approved: news@gmane.org
NNTP-Posting-Host: main.gmane.org NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0 Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1 Content-Type: text/plain; charset=ISO8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE Content-Transfer-Encoding: QUOTED-PRINTABLE
X-Trace: sea.gmane.org 1124130247 31839 80.91.229.2 (15 Aug 2005 18:24:07 GMT) X-Trace: sea.gmane.org 1124130247 31839 80.91.229.2 (15 Aug 2005 18:24:07 GMT)
X-Complaints-To: usenet@sea.gmane.org X-Complaints-To: usenet@sea.gmane.org
@ -476,7 +476,7 @@ MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-=" Content-Type: multipart/mixed; boundary="=-=-="
--=-=-= --=-=-=
Content-Type: text/plain; charset=iso-8859-15 Content-Type: text/plain; charset=ISO8859-15
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
Here comes a commit log message, and Here comes a commit log message, and

32
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,14 +13,14 @@ 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 "ISO-8859-5 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 &&
git config i18n.commitencoding shift-jis && git config i18n.commitencoding SJIS &&
git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG" git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
' '
@ -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
@ -67,8 +67,8 @@ summary $UTF8_MSG
EOF EOF
test_expect_success \ test_expect_success \
'blame respects --encoding=utf-8' ' 'blame respects --encoding=UTF-8' '
git blame --incremental --encoding=utf-8 file | \ git blame --incremental --encoding=UTF-8 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="Тестовое сообщение"

10
t/t9129-git-svn-i18n-commitencoding.sh
View File

@ -29,7 +29,7 @@ compare_svn_head_with () {
test_cmp current "$1" test_cmp current "$1"
} }
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "$H setup" ' test_expect_success "$H setup" '
mkdir $H && mkdir $H &&
@ -38,7 +38,7 @@ do
' '
done done
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "$H commit on git side" ' test_expect_success "$H commit on git side" '
( (
@ -55,7 +55,7 @@ do
' '
done done
for H in ISO-8859-1 EUCJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP
do do
test_expect_success "$H dcommit to svn" ' test_expect_success "$H dcommit to svn" '
( (
@ -77,12 +77,12 @@ fi
test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' ' test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
( (
cd ISO-8859-1 && cd ISO8859-1 &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
) )
' '
for H in EUCJP ISO-2022-JP for H in eucJP ISO-2022-JP
do do
test_expect_success UTF8 "$H should match UTF-8 in svn" ' test_expect_success UTF8 "$H should match UTF-8 in svn" '
( (

6
t/t9139-git-svn-non-utf8-commitencoding.sh
View File

@ -8,7 +8,7 @@ test_description='git svn refuses to dcommit non-UTF8 messages'
# ISO-2022-JP can pass for valid UTF-8, so skipping that in this test # ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
for H in ISO-8859-1 EUCJP for H in ISO8859-1 eucJP
do do
test_expect_success "$H setup" ' test_expect_success "$H setup" '
mkdir $H && mkdir $H &&
@ -17,7 +17,7 @@ do
' '
done done
for H in ISO-8859-1 EUCJP for H in ISO8859-1 eucJP
do do
test_expect_success "$H commit on git side" ' test_expect_success "$H commit on git side" '
( (
@ -33,7 +33,7 @@ do
' '
done done
for H in ISO-8859-1 EUCJP for H in ISO8859-1 eucJP
do do
test_expect_success "$H dcommit to svn" ' test_expect_success "$H dcommit to svn" '
( (

2
t/t9301-fast-export.sh
View File

@ -68,7 +68,7 @@ test_expect_success 'fast-export master~2..master' '
test_expect_success 'iso-8859-1' ' test_expect_success 'iso-8859-1' '
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO8859-1 &&
# use author and committer name in ISO-8859-1 to match it. # use author and committer name in ISO-8859-1 to match it.
. "$TEST_DIRECTORY"/t3901-8859-1.txt && . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
test_tick && test_tick &&

2
t/t9500-gitweb-standalone-no-errors.sh
View File

@ -590,7 +590,7 @@ test_expect_success \
echo "ISO-8859-1" >> file && echo "ISO-8859-1" >> file &&
git add file && git add file &&
git config i18n.commitencoding ISO-8859-1 && git config i18n.commitencoding ISO-8859-1 &&
git commit -F "$TEST_DIRECTORY"/t3900/ISO-8859-1.txt && git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
git config --unset i18n.commitencoding && git config --unset i18n.commitencoding &&
gitweb_run "p=.git;a=commit"' gitweb_run "p=.git;a=commit"'
test_debug 'cat gitweb.log' test_debug 'cat gitweb.log'