git-send-email --cc-cmd

This new option allows an arbitrary "cmd" to generate per patch
file specific "Cc:"s.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index d243ed1e3a3c4f3e94d01b076e7715d37a1cd204..a63a3adab09a1563908114903ff1a6d82196ed97 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -34,6 +34,12 @@ The --bcc option must be repeated for each user you want on the bcc list.
 +
 The --cc option must be repeated for each user you want on the cc list.
 
 +
 The --cc option must be repeated for each user you want on the cc list.
 

+--cc-cmd::
+       Specify a command to execute once per patch file which
+       should generate patch file specific "Cc:" entries.
+       Output of this command must be single email address per line.
+       Default is the value of 'sendemail.cccmd' configuration value.
+

 --chain-reply-to, --no-chain-reply-to::
        If this is set, each email will be sent as a reply to the previous
        email sent.  If disabled with "--no-chain-reply-to", all emails after
 --chain-reply-to, --no-chain-reply-to::
        If this is set, each email will be sent as a reply to the previous
        email sent.  If disabled with "--no-chain-reply-to", all emails after


@@ -124,6 +130,9 @@ sendemail.aliasfiletype::
        Format of the file(s) specified in sendemail.aliasesfile. Must be
        one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
        Format of the file(s) specified in sendemail.aliasesfile. Must be
        one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 

+sendemail.cccmd::
+       Command to execute to generate per patch file specific "Cc:"s.
+

 sendemail.bcc::
        Email address (or alias) to always bcc.
 
 sendemail.bcc::
        Email address (or alias) to always bcc.
 

diff --git a/git-send-email.perl b/git-send-email.perl
index 69559b289a28acf7fd095260797535f62db8172e..4767249e6d9ef25a6618e99a2557cd909be1573c 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -46,6 +46,9 @@ sub usage {
    --cc           Specify an initial "Cc:" list for the entire series
                   of emails.
 
    --cc           Specify an initial "Cc:" list for the entire series
                   of emails.
 

+   --cc-cmd       Specify a command to execute per file which adds
+                  per file specific cc address entries
+

    --bcc          Specify a list of email addresses that should be Bcc:
                  on all the emails.
 
    --bcc          Specify a list of email addresses that should be Bcc:
                  on all the emails.
 


@@ -157,13 +160,14 @@ sub format_2822_time {
 my ($quiet, $dry_run) = (0, 0);
 
 # Variables with corresponding config settings
 my ($quiet, $dry_run) = (0, 0);
 
 # Variables with corresponding config settings

-my ($thread, $chain_reply_to, $suppress_from, $signed_off_cc);
+my ($thread, $chain_reply_to, $suppress_from, $signed_off_cc, $cc_cmd);

 
 my %config_settings = (
     "thread" => [\$thread, 1],
     "chainreplyto" => [\$chain_reply_to, 1],
     "suppressfrom" => [\$suppress_from, 0],
     "signedoffcc" => [\$signed_off_cc, 1],
 
 my %config_settings = (
     "thread" => [\$thread, 1],
     "chainreplyto" => [\$chain_reply_to, 1],
     "suppressfrom" => [\$suppress_from, 0],
     "signedoffcc" => [\$signed_off_cc, 1],

+    "cccmd" => [\$cc_cmd, ""],

 );
 
 foreach my $setting (keys %config_settings) {
 );
 
 foreach my $setting (keys %config_settings) {


@@ -189,6 +193,7 @@ sub format_2822_time {
                    "smtp-server=s" => \$smtp_server,
                    "compose" => \$compose,
                    "quiet" => \$quiet,
                    "smtp-server=s" => \$smtp_server,
                    "compose" => \$compose,
                    "quiet" => \$quiet,

+                   "cc-cmd=s" => \$cc_cmd,

                    "suppress-from!" => \$suppress_from,
                    "signed-off-cc|signed-off-by-cc!" => \$signed_off_cc,
                    "dry-run" => \$dry_run,
                    "suppress-from!" => \$suppress_from,
                    "signed-off-cc|signed-off-by-cc!" => \$signed_off_cc,
                    "dry-run" => \$dry_run,


@@ -652,11 +657,26 @@ sub send_message
                }
        }
        close F;
                }
        }
        close F;

+
+       if ($cc_cmd ne "") {
+               open(F, "$cc_cmd $t |")
+                       or die "(cc-cmd) Could not execute '$cc_cmd'";
+               while(<F>) {
+                       my $c = $_;
+                       $c =~ s/^\s*//g;
+                       $c =~ s/\n$//g;
+                       push @cc, $c;
+                       printf("(cc-cmd) Adding cc: %s from: '%s'\n",
+                               $c, $cc_cmd) unless $quiet;
+               }
+               close F
+                       or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
+       }
+

        if (defined $author) {
                $message = "From: $author\n\n$message";
        }
 
        if (defined $author) {
                $message = "From: $author\n\n$message";
        }
 

-

        send_message();
 
        # set up for the next message
        send_message();
 
        # set up for the next message