From: Junio C Hamano <gitster@pobox.com>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] send-email: extract execute_cmd from recipients_cmd
Date: Mon, 24 Apr 2023 14:46:13 -0700 [thread overview]
Message-ID: <xmqqedo99cnu.fsf@gitster.g> (raw)
In-Reply-To: <20230423122744.4865-2-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 23 Apr 2023 08:27:43 -0400")
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> This refactor is to pave the way for the addition of the new
> '--header-cmd' option to the send-email command.
> ---
> git-send-email.perl | 26 ++++++++++++++++++++------
> 1 file changed, 20 insertions(+), 6 deletions(-)
Missing sign-off?
> diff --git a/git-send-email.perl b/git-send-email.perl
> index fd8cd0d46f..d2febbda1f 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -2,6 +2,7 @@
> #
> # Copyright 2002,2005 Greg Kroah-Hartman <greg@kroah.com>
> # Copyright 2005 Ryan Anderson <ryan@michonline.com>
> +# Copyright 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> #
> # GPL v2 (See COPYING)
> #
> @@ -2006,15 +2007,30 @@ sub process_file {
> }
> }
>
> +# Execute a command (e.g., $x_cmd) and return its output lines as an
> +# array.
> +sub execute_cmd {
> + my ($prefix, $cmd, $file) = @_;
> + my @lines = ();
> + open my $fh, "-|", "$cmd \Q$file\E"
> + or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
> + while (my $line = <$fh>) {
> + last if $line =~ /^$/;
> + push @lines, $line;
> + }
> + close $fh
> + or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
> + return @lines;
> +}
> +
> # Execute a command (e.g. $to_cmd) to get a list of email addresses
> # and return a results array
> sub recipients_cmd {
> my ($prefix, $what, $cmd, $file) = @_;
> -
> + my @lines = ();
> my @addresses = ();
> - open my $fh, "-|", "$cmd \Q$file\E"
> - or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
> - while (my $address = <$fh>) {
> + @lines = execute_cmd($prefix, $cmd, $file);
> + for my $address (@lines) {
> $address =~ s/^\s*//g;
> $address =~ s/\s*$//g;
> $address = sanitize_address($address);
> @@ -2023,8 +2039,6 @@ sub recipients_cmd {
> printf(__("(%s) Adding %s: %s from: '%s'\n"),
> $prefix, $what, $address, $cmd) unless $quiet;
> }
> - close $fh
> - or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
> return @addresses;
> }
next prev parent reply other threads:[~2023-04-24 21:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-23 12:27 [PATCH 0/2] send-email: add --header-cmd option Maxim Cournoyer
2023-04-23 12:27 ` [PATCH 1/2] send-email: extract execute_cmd from recipients_cmd Maxim Cournoyer
2023-04-24 21:46 ` Junio C Hamano [this message]
2023-04-25 1:55 ` Maxim Cournoyer
2023-04-23 12:27 ` [PATCH 2/2] send-email: add --header-cmd option Maxim Cournoyer
2023-04-24 22:09 ` Junio C Hamano
2023-04-25 16:22 ` Maxim Cournoyer
2023-04-25 16:29 ` Junio C Hamano
2023-04-25 18:50 ` [PATCH v3 0/3] " Maxim Cournoyer
2023-04-25 18:50 ` [PATCH v3 1/3] send-email: extract execute_cmd from recipients_cmd Maxim Cournoyer
2023-04-25 18:50 ` [PATCH v3 2/3] send-email: add --header-cmd option Maxim Cournoyer
2023-04-25 18:50 ` [PATCH v3 3/3] send-email: detect empty blank lines in command output Maxim Cournoyer
2023-04-25 18:53 ` [PATCH 2/2] send-email: add --header-cmd option Maxim Cournoyer
2023-05-01 14:38 ` [PATCH v4 0/3] " Maxim Cournoyer
2023-05-01 14:38 ` [PATCH v4 1/3] send-email: extract execute_cmd from recipients_cmd Maxim Cournoyer
2023-05-01 14:38 ` [PATCH v4 2/3] send-email: add --header-cmd, --no-header-cmd options Maxim Cournoyer
2023-05-01 14:38 ` [PATCH v4 3/3] send-email: detect empty blank lines in command output Maxim Cournoyer
2023-05-08 15:07 ` [PATCH v4 0/3] send-email: add --header-cmd option Maxim Cournoyer
2023-05-08 16:59 ` Eric Sunshine
2023-05-08 19:18 ` Maxim Cournoyer
2023-04-25 16:26 ` [PATCH v2 0/2] " Maxim Cournoyer
2023-04-25 16:26 ` [PATCH v2 1/2] send-email: extract execute_cmd from recipients_cmd Maxim Cournoyer
2023-04-25 17:04 ` Eric Sunshine
2023-04-25 19:09 ` Maxim Cournoyer
2023-05-02 18:39 ` Felipe Contreras
2023-05-02 20:46 ` Maxim Cournoyer
2023-05-02 21:50 ` Felipe Contreras
2023-04-25 16:26 ` [PATCH v2 2/2] send-email: add --header-cmd option Maxim Cournoyer
2023-04-24 21:45 ` [PATCH 0/2] " Junio C Hamano
2023-04-25 1:50 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqedo99cnu.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).