From: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@xxxxxxxxxxxxxxx>
Make it so that we can use a list of email in flags
instead of having to use one flag per email address.
The format of email list handled is pretty basic for now:
$ git send-email --to='Foo <foo@xxxxxxxxxxx>, bar@xxxxxxxxxxx'
We thought it would be nice to have a "first-step" version which works
before handling more complex ones such as:
$ git send-email --to='Foo, Bar <foobar@xxxxxxxxxxx>'
Signed-off-by: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@xxxxxxxxxxxxxxx>
Signed-off-by: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@xxxxxxxxxxxxxxx>
Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx>
---
Changes in the patch:
-Update documentation
-Removal of no-longer needed user input verification
-New function that splits email list into seperate email addresses
-New test to make sure it behaves the way intended
Documentation/git-send-email.txt | 21 +++++++++++++++------
git-send-email.perl | 38 ++++++++++++++++++++++++--------------
t/t9001-send-email.sh | 37 ++++++++++++++++++++++++++++++++++++-
3 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 40a9a9a..e3444cf 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -50,16 +50,22 @@ Composing
'sendemail.multiedit'.
--bcc=<address>::
+--bcc="[<address>,...]"::
Specify a "Bcc:" value for each email. Default is the value of
'sendemail.bcc'.
-+
-The --bcc option must be repeated for each user you want on the bcc list.
+ The format supported for email list is the following:
+ "Foo <foo@xxxxxxxxxxx>, bar@xxxxxxxxxxx".
+ Please notice that the email list does not handle commas in
+ email names such as "Foo, Bar <foobar@xxxxxxxxxxx>".
--cc=<address>::
+--cc="[<address>,...]"::
Specify a starting "Cc:" value for each email.
Default is the value of 'sendemail.cc'.
-+
-The --cc option must be repeated for each user you want on the cc list.
+ The format supported for email list is the following:
+ "Foo <foo@xxxxxxxxxxx>, bar@xxxxxxxxxxx".
+ Please notice that the email list does not handle commas in
+ email names such as "Foo, Bar <foobar@xxxxxxxxxxx>".
--compose::
Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])
@@ -111,12 +117,15 @@ is not set, this will be prompted for.
is not set, this will be prompted for.
--to=<address>::
+--to="[<address>,...]"::
Specify the primary recipient of the emails generated. Generally, this
will be the upstream maintainer of the project involved. Default is the
value of the 'sendemail.to' configuration value; if that is unspecified,
and --to-cmd is not specified, this will be prompted for.
-+
-The --to option must be repeated for each user you want on the to list.
+ The format supported for email list is the following:
+ "Foo <foo@xxxxxxxxxxx>, bar@xxxxxxxxxxx".
+ Please notice that the email list does not handle commas in
+ email names such as "Foo, Bar <foobar@xxxxxxxxxxx>".
--8bit-encoding=<encoding>::
When encountering a non-ASCII message or subject that does not
diff --git a/git-send-email.perl b/git-send-email.perl
index 671762b..d7e4887 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -426,20 +426,6 @@ my ($repoauthor, $repocommitter);
($repoauthor) = Git::ident_person(@repo, 'author');
($repocommitter) = Git::ident_person(@repo, 'committer');
-# Verify the user input
-
-foreach my $entry (@initial_to) {
- die "Comma in --to entry: $entry'\n" unless $entry !~ m/,/;
-}
-
-foreach my $entry (@initial_cc) {
- die "Comma in --cc entry: $entry'\n" unless $entry !~ m/,/;
-}
-
-foreach my $entry (@bcclist) {
- die "Comma in --bcclist entry: $entry'\n" unless $entry !~ m/,/;
-}
-
sub parse_address_line {
if ($have_mail_address) {
return map { $_->format } Mail::Address->parse($_[0]);
@@ -1079,6 +1065,27 @@ sub smtp_auth_maybe {
return $auth;
}
+sub split_email_list {
+ my(@list) = @_;
+ my @tmp;
+ my @emails;
+ for (my $i = 0; $i <= $#list; $i++) {
+ if ($list[$i] =~ /,/) {
+ @emails = split(/,/, $list[$i]);
+ } else {
+ @emails = $list[$i];
+ }
+ # Removal of unwanted spaces
+ for (my $j = 0; $j <= $#emails; $j++) {
+ $emails[$j] =~ s/^\s+//;
+ $emails[$j] =~ s/\s+$//;
+ }
+ @tmp = (@tmp, @emails);
+ }
+ return(@tmp);
+}
+
+
# Returns 1 if the message was sent, and 0 otherwise.
# In actuality, the whole program dies when there
# is an error sending a message.
@@ -1089,6 +1096,9 @@ sub send_message {
not grep { $cc eq $_ || $_ =~ /<\Q${cc}\E>$/ } @recipients
}
@cc);
+ @cc = split_email_list(@cc);
+ @bcclist = split_email_list(@bcclist);
+ @recipients = split_email_list(@recipients);
my $to = join (",\n\t", @recipients);
@recipients = unique_email_list(@recipients,@cc,@bcclist);
@recipients = (map { extract_valid_address_or_die($_) } @recipients);
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9f46f22..87641bc 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1349,4 +1349,39 @@ test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
grep "^!someone@example\.org!$" commandline1
'
-test_done
+test_expect_success $PREREQ 'setup expected-list' '
+ git send-email \
+ --dry-run \
+ --suppress-cc=sob \
+ --from="Example <from@xxxxxxxxxxx>" \
+ --to="to1@xxxxxxxxxxx" --to="to2@xxxxxxxxxxx" \
+ --to="to3@xxxxxxxxxxx" --cc="cc0@xxxxxxxxxxx" \
+ --cc="Cc 1 <cc1@xxxxxxxxxxx>" --cc="Cc 2 <cc2@xxxxxxxxxxx>" \
+ --bcc="bcc1@xxxxxxxxxxx" --bcc="bcc2@xxxxxxxxxxx" \
+ -1 >output
+ sed -e "s/^\(\/tmp\/\).*/\1patch/" \
+ -e "s/^\(Date:\).*/\1 DATE-STRING/" \
+ -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
+ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
+ <output >expected-list
+'
+
+test_expect_success $PREREQ 'use email list in --cc --to and --bcc' '
+ git send-email \
+ --dry-run \
+ --suppress-cc=sob \
+ --from="Example <from@xxxxxxxxxxx>" \
+ --to="to1@xxxxxxxxxxx, to2@xxxxxxxxxxx,to3@xxxxxxxxxxx" \
+ --cc="cc0@xxxxxxxxxxx" \
+ --cc="Cc 1 <cc1@xxxxxxxxxxx>, Cc 2 <cc2@xxxxxxxxxxx>" \
+ --bcc="bcc1@xxxxxxxxxxx, bcc2@xxxxxxxxxxx" \
+ -1 >output
+ sed -e "s/^\(\/tmp\/\).*/\1patch/" \
+ -e "s/^\(Date:\).*/\1 DATE-STRING/" \
+ -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
+ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
+ <output >actual-list &&
+ test_cmp expected-list actual-list
+'
+
+test_done
\ No newline at end of file
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html