mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'tr/send-email-8bit'
* tr/send-email-8bit: send-email: ask about and declare 8bit mails
This commit is contained in:
commit
a278aa61a4
|
@ -101,6 +101,15 @@ See the CONFIGURATION section for 'sendemail.multiedit'.
|
||||||
+
|
+
|
||||||
The --to option must be repeated for each user you want on the to list.
|
The --to option must be repeated for each user you want on the to list.
|
||||||
|
|
||||||
|
--8bit-encoding=<encoding>::
|
||||||
|
When encountering a non-ASCII message or subject that does not
|
||||||
|
declare its encoding, add headers/quoting to indicate it is
|
||||||
|
encoded in <encoding>. Default is the value of the
|
||||||
|
'sendemail.assume8bitEncoding'; if that is unspecified, this
|
||||||
|
will be prompted for if any non-ASCII files are encountered.
|
||||||
|
+
|
||||||
|
Note that no attempts whatsoever are made to validate the encoding.
|
||||||
|
|
||||||
|
|
||||||
Sending
|
Sending
|
||||||
~~~~~~~
|
~~~~~~~
|
||||||
|
|
|
@ -54,6 +54,7 @@ sub usage {
|
||||||
--in-reply-to <str> * Email "In-Reply-To:"
|
--in-reply-to <str> * Email "In-Reply-To:"
|
||||||
--annotate * Review each patch that will be sent in an editor.
|
--annotate * Review each patch that will be sent in an editor.
|
||||||
--compose * Open an editor for introduction.
|
--compose * Open an editor for introduction.
|
||||||
|
--8bit-encoding <str> * Encoding to assume 8bit mails if undeclared
|
||||||
|
|
||||||
Sending:
|
Sending:
|
||||||
--envelope-sender <str> * Email envelope sender.
|
--envelope-sender <str> * Email envelope sender.
|
||||||
|
@ -191,6 +192,7 @@ sub do_edit {
|
||||||
my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
|
my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
|
||||||
my ($validate, $confirm);
|
my ($validate, $confirm);
|
||||||
my (@suppress_cc);
|
my (@suppress_cc);
|
||||||
|
my ($auto_8bit_encoding);
|
||||||
|
|
||||||
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
|
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
|
||||||
|
|
||||||
|
@ -222,6 +224,7 @@ sub do_edit {
|
||||||
"multiedit" => \$multiedit,
|
"multiedit" => \$multiedit,
|
||||||
"confirm" => \$confirm,
|
"confirm" => \$confirm,
|
||||||
"from" => \$sender,
|
"from" => \$sender,
|
||||||
|
"assume8bitencoding" => \$auto_8bit_encoding,
|
||||||
);
|
);
|
||||||
|
|
||||||
# Help users prepare for 1.7.0
|
# Help users prepare for 1.7.0
|
||||||
|
@ -297,6 +300,7 @@ sub signal_handler {
|
||||||
"thread!" => \$thread,
|
"thread!" => \$thread,
|
||||||
"validate!" => \$validate,
|
"validate!" => \$validate,
|
||||||
"format-patch!" => \$format_patch,
|
"format-patch!" => \$format_patch,
|
||||||
|
"8bit-encoding=s" => \$auto_8bit_encoding,
|
||||||
);
|
);
|
||||||
|
|
||||||
unless ($rc) {
|
unless ($rc) {
|
||||||
|
@ -669,6 +673,35 @@ sub ask {
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my %broken_encoding;
|
||||||
|
|
||||||
|
sub file_declares_8bit_cte($) {
|
||||||
|
my $fn = shift;
|
||||||
|
open (my $fh, '<', $fn);
|
||||||
|
while (my $line = <$fh>) {
|
||||||
|
last if ($line =~ /^$/);
|
||||||
|
return 1 if ($line =~ /^Content-Transfer-Encoding: .*8bit.*$/);
|
||||||
|
}
|
||||||
|
close $fh;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach my $f (@files) {
|
||||||
|
next unless (body_or_subject_has_nonascii($f)
|
||||||
|
&& !file_declares_8bit_cte($f));
|
||||||
|
$broken_encoding{$f} = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!defined $auto_8bit_encoding && scalar %broken_encoding) {
|
||||||
|
print "The following files are 8bit, but do not declare " .
|
||||||
|
"a Content-Transfer-Encoding.\n";
|
||||||
|
foreach my $f (sort keys %broken_encoding) {
|
||||||
|
print " $f\n";
|
||||||
|
}
|
||||||
|
$auto_8bit_encoding = ask("Which 8bit encoding should I declare [UTF-8]? ",
|
||||||
|
default => "UTF-8");
|
||||||
|
}
|
||||||
|
|
||||||
my $prompting = 0;
|
my $prompting = 0;
|
||||||
if (!defined $sender) {
|
if (!defined $sender) {
|
||||||
$sender = $repoauthor || $repocommitter || '';
|
$sender = $repoauthor || $repocommitter || '';
|
||||||
|
@ -1221,6 +1254,18 @@ sub send_message {
|
||||||
or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
|
or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($broken_encoding{$t} && !$has_content_type) {
|
||||||
|
$has_content_type = 1;
|
||||||
|
push @xh, "MIME-Version: 1.0",
|
||||||
|
"Content-Type: text/plain; charset=$auto_8bit_encoding",
|
||||||
|
"Content-Transfer-Encoding: 8bit";
|
||||||
|
$body_encoding = $auto_8bit_encoding;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($broken_encoding{$t} && !is_rfc2047_quoted($subject)) {
|
||||||
|
$subject = quote_rfc2047($subject, $auto_8bit_encoding);
|
||||||
|
}
|
||||||
|
|
||||||
if (defined $author and $author ne $sender) {
|
if (defined $author and $author ne $sender) {
|
||||||
$message = "From: $author\n\n$message";
|
$message = "From: $author\n\n$message";
|
||||||
if (defined $author_encoding) {
|
if (defined $author_encoding) {
|
||||||
|
@ -1233,6 +1278,7 @@ sub send_message {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
$has_content_type = 1;
|
||||||
push @xh,
|
push @xh,
|
||||||
'MIME-Version: 1.0',
|
'MIME-Version: 1.0',
|
||||||
"Content-Type: text/plain; charset=$author_encoding",
|
"Content-Type: text/plain; charset=$author_encoding",
|
||||||
|
@ -1310,3 +1356,17 @@ sub file_has_nonascii {
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub body_or_subject_has_nonascii {
|
||||||
|
my $fn = shift;
|
||||||
|
open(my $fh, '<', $fn)
|
||||||
|
or die "unable to open $fn: $!\n";
|
||||||
|
while (my $line = <$fh>) {
|
||||||
|
last if $line =~ /^$/;
|
||||||
|
return 1 if $line =~ /^Subject.*[^[:ascii:]]/;
|
||||||
|
}
|
||||||
|
while (my $line = <$fh>) {
|
||||||
|
return 1 if $line =~ /[^[:ascii:]]/;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -918,4 +918,81 @@ test_expect_success '--no-bcc overrides sendemail.bcc' '
|
||||||
! grep "RCPT TO:<other@ex.com>" stdout
|
! grep "RCPT TO:<other@ex.com>" stdout
|
||||||
'
|
'
|
||||||
|
|
||||||
|
cat >email-using-8bit <<EOF
|
||||||
|
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <bogus-message-id@example.com>
|
||||||
|
From: author@example.com
|
||||||
|
Date: Sat, 12 Jun 2010 15:53:58 +0200
|
||||||
|
Subject: subject goes here
|
||||||
|
|
||||||
|
Dieser deutsche Text enthält einen Umlaut!
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat >content-type-decl <<EOF
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_expect_success 'asks about and fixes 8bit encodings' '
|
||||||
|
clean_fake_sendmail &&
|
||||||
|
echo |
|
||||||
|
git send-email --from=author@example.com --to=nobody@example.com \
|
||||||
|
--smtp-server="$(pwd)/fake.sendmail" \
|
||||||
|
email-using-8bit >stdout &&
|
||||||
|
grep "do not declare a Content-Transfer-Encoding" stdout &&
|
||||||
|
grep email-using-8bit stdout &&
|
||||||
|
grep "Which 8bit encoding" stdout &&
|
||||||
|
grep "Content\\|MIME" msgtxt1 >actual &&
|
||||||
|
test_cmp actual content-type-decl
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'sendemail.8bitEncoding works' '
|
||||||
|
clean_fake_sendmail &&
|
||||||
|
git config sendemail.assume8bitEncoding UTF-8 &&
|
||||||
|
echo bogus |
|
||||||
|
git send-email --from=author@example.com --to=nobody@example.com \
|
||||||
|
--smtp-server="$(pwd)/fake.sendmail" \
|
||||||
|
email-using-8bit >stdout &&
|
||||||
|
grep "Content\\|MIME" msgtxt1 >actual &&
|
||||||
|
test_cmp actual content-type-decl
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '--8bit-encoding overrides sendemail.8bitEncoding' '
|
||||||
|
clean_fake_sendmail &&
|
||||||
|
git config sendemail.assume8bitEncoding "bogus too" &&
|
||||||
|
echo bogus |
|
||||||
|
git send-email --from=author@example.com --to=nobody@example.com \
|
||||||
|
--smtp-server="$(pwd)/fake.sendmail" \
|
||||||
|
--8bit-encoding=UTF-8 \
|
||||||
|
email-using-8bit >stdout &&
|
||||||
|
grep "Content\\|MIME" msgtxt1 >actual &&
|
||||||
|
test_cmp actual content-type-decl
|
||||||
|
'
|
||||||
|
|
||||||
|
cat >email-using-8bit <<EOF
|
||||||
|
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <bogus-message-id@example.com>
|
||||||
|
From: author@example.com
|
||||||
|
Date: Sat, 12 Jun 2010 15:53:58 +0200
|
||||||
|
Subject: Dieser Betreff enthält auch einen Umlaut!
|
||||||
|
|
||||||
|
Nothing to see here.
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat >expected <<EOF
|
||||||
|
Subject: =?UTF-8?q?Dieser=20Betreff=20enth=C3=A4lt=20auch=20einen=20Umlaut!?=
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_expect_success '--8bit-encoding also treats subject' '
|
||||||
|
clean_fake_sendmail &&
|
||||||
|
echo bogus |
|
||||||
|
git send-email --from=author@example.com --to=nobody@example.com \
|
||||||
|
--smtp-server="$(pwd)/fake.sendmail" \
|
||||||
|
--8bit-encoding=UTF-8 \
|
||||||
|
email-using-8bit >stdout &&
|
||||||
|
grep "Subject" msgtxt1 >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue