git-send-email.perl: Add --to-cmd
Add the ability to use a command line --to-cmd=cmd to create the list of "To:" addresses. Used a shared routine for --cc-cmd and --to-cmd. Did not use IPC::Open2, leaving that for Ævar if ever he decides to fix the other bugs he might find. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Joe Perches committed
Sep 24, 2010 at 10:03 UTC
6e74e075d25aea67cf973e456a6804c0c3741235
3 files changed
+59
-18
Documentation/git-send-email.txt
+7
-1
@@ -97,7 +97,7 @@ See the CONFIGURATION section for 'sendemail.multiedit'.
97
Specify the primary recipient of the emails generated. Generally, this
98
will be the upstream maintainer of the project involved. Default is the
99
value of the 'sendemail.to' configuration value; if that is unspecified,
100
- this will be prompted for.
100
+ and --to-cmd is not specified, this will be prompted for.
101
+
102
The --to option must be repeated for each user you want on the to list.
103
@@ -177,6 +177,12 @@ user is prompted for a password while the input is masked for privacy.
177
Automating
178
~~~~~~~~~~
179
180
+--to-cmd=<command>::
181
+ Specify a command to execute once per patch file which
182
+ should generate patch file specific "To:" entries.
183
+ Output of this command must be single email address per line.
184
+ Default is the value of 'sendemail.tocmd' configuration value.
185
+
186
--cc-cmd=<command>::
187
Specify a command to execute once per patch file which
188
should generate patch file specific "Cc:" entries.
git-send-email.perl
+34
-17
@@ -70,6 +70,7 @@ git send-email [options] <file | directory | rev-list options >
70
71
Automating:
72
--identity <str> * Use the sendemail.<id> options.
73
+ --to-cmd <str> * Email To: via `<str> \$patch_path`
74
--cc-cmd <str> * Email Cc: via `<str> \$patch_path`
75
--suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, all.
76
--[no-]signed-off-by-cc * Send to Signed-off-by: addresses. Default on.
@@ -187,7 +188,8 @@ sub do_edit {
188
}
189
190
# Variables with corresponding config settings
190
-my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
191
+my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc);
192
+my ($to_cmd, $cc_cmd);
193
my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
194
my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
195
my ($validate, $confirm);
@@ -214,6 +216,7 @@ my %config_settings = (
216
"smtppass" => \$smtp_authpass,
217
"smtpdomain" => \$smtp_domain,
218
"to" => \@to,
219
+ "tocmd" => \$to_cmd,
220
"cc" => \@initial_cc,
221
"cccmd" => \$cc_cmd,
222
"aliasfiletype" => \$aliasfiletype,
@@ -272,6 +275,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
275
"in-reply-to=s" => \$initial_reply_to,
276
"subject=s" => \$initial_subject,
277
"to=s" => \@to,
278
+ "to-cmd=s" => \$to_cmd,
279
"no-to" => \$no_to,
280
"cc=s" => \@initial_cc,
281
"no-cc" => \$no_cc,
@@ -711,7 +715,7 @@ if (!defined $sender) {
715
$prompting++;
716
}
717
714
-if (!@to) {
718
+if (!@to && !defined $to_cmd) {
719
my $to = ask("Who should the emails be sent to? ");
720
push @to, parse_address_line($to) if defined $to; # sanitized/validated later
721
$prompting++;
@@ -1238,21 +1242,10 @@ foreach my $t (@files) {
1242
}
1243
close F;
1244
1241
- if (defined $cc_cmd && !$suppress_cc{'cccmd'}) {
1242
- open(F, "$cc_cmd \Q$t\E |")
1243
- or die "(cc-cmd) Could not execute '$cc_cmd'";
1244
- while(<F>) {
1245
- my $c = $_;
1246
- $c =~ s/^\s*//g;
1247
- $c =~ s/\n$//g;
1248
- next if ($c eq $sender and $suppress_from);
1249
- push @cc, $c;
1250
- printf("(cc-cmd) Adding cc: %s from: '%s'\n",
1251
- $c, $cc_cmd) unless $quiet;
1252
- }
1253
- close F
1254
- or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
1255
- }
1245
+ push @to, recipients_cmd("to-cmd", "to", $to_cmd, $t)
1246
+ if defined $to_cmd;
1247
+ push @cc, recipients_cmd("cc-cmd", "cc", $cc_cmd, $t)
1248
+ if defined $cc_cmd && !$suppress_cc{'cccmd'};
1249
1250
if ($broken_encoding{$t} && !$has_content_type) {
1251
$has_content_type = 1;
@@ -1310,6 +1303,30 @@ foreach my $t (@files) {
1303
$message_id = undef;
1304
}
1305
1306
+# Execute a command (e.g. $to_cmd) to get a list of email addresses
1307
+# and return a results array
1308
+sub recipients_cmd {
1309
+ my ($prefix, $what, $cmd, $file) = @_;
1310
+
1311
+ my $sanitized_sender = sanitize_address($sender);
1312
+ my @addresses = ();
1313
+ open(F, "$cmd \Q$file\E |")
1314
+ or die "($prefix) Could not execute '$cmd'";
1315
+ while(<F>) {
1316
+ my $address = $_;
1317
+ $address =~ s/^\s*//g;
1318
+ $address =~ s/\s*$//g;
1319
+ $address = sanitize_address($address);
1320
+ next if ($address eq $sanitized_sender and $suppress_from);
1321
+ push @addresses, $address;
1322
+ printf("($prefix) Adding %s: %s from: '%s'\n",
1323
+ $what, $address, $cmd) unless $quiet;
1324
+ }
1325
+ close F
1326
+ or die "($prefix) failed to close pipe to '$cmd'";
1327
+ return @addresses;
1328
+}
1329
+
1330
cleanup_compose_files();
1331
1332
sub cleanup_compose_files() {
t/t9001-send-email.sh
+18
@@ -201,6 +201,24 @@ test_expect_success $PREREQ 'Prompting works' '
201
grep "^To: to@example.com\$" msgtxt1
202
'
203
204
+test_expect_success $PREREQ 'tocmd works' '
205
+ clean_fake_sendmail &&
206
+ cp $patches tocmd.patch &&
207
+ echo tocmd--tocmd@example.com >>tocmd.patch &&
208
+ {
209
+ echo "#!$SHELL_PATH"
210
+ echo sed -n -e s/^tocmd--//p \"\$1\"
211
+ } > tocmd-sed &&
212
+ chmod +x tocmd-sed &&
213
+ git send-email \
214
+ --from="Example <nobody@example.com>" \
215
+ --to-cmd=./tocmd-sed \
216
+ --smtp-server="$(pwd)/fake.sendmail" \
217
+ tocmd.patch \
218
+ &&
219
+ grep "^To: tocmd@example.com" msgtxt1
220
+'
221
+
222
test_expect_success $PREREQ 'cccmd works' '
223
clean_fake_sendmail &&
224
cp $patches cccmd.patch &&