git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Dmitry Safonov <dima@arista.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Dmitry Safonov <0x7f454c46@gmail.com>,
	Andrei Vagin <avagin@openvz.org>
Subject: Re: [PATCH] send-email: Ask if a patch should be sent twice
Date: Tue, 30 Jul 2019 13:50:05 +0100	[thread overview]
Message-ID: <59e47154-5b07-4ef0-9883-dc3f53b31fc2@arista.com> (raw)
In-Reply-To: <87r26768lc.fsf@evledraar.gmail.com>

On 7/30/19 12:54 PM, Ævar Arnfjörð Bjarmason wrote:
> 
> On Tue, Jul 30 2019, Dmitry Safonov wrote:
> 
>> I was almost certain that git won't let me send the same patch twice,
>> but today I've managed to double-send a directory by a mistake:
>> 	git send-email --to linux-kernel@vger.kernel.org /tmp/timens/
>> 	    --cc 'Dmitry Safonov <0x7f454c46@gmail.com>' /tmp/timens/`
>>
>> [I haven't noticed that I put the directory twice ^^]
>>
>> Prevent this shipwreck from happening again by asking if a patch
>> is sent multiple times on purpose.
>>
>> link: https://lkml.kernel.org/r/4d53ebc7-d5b2-346e-c383-606401d19d3a@gmail.com
>> Cc: Andrei Vagin <avagin@openvz.org>
>> Signed-off-by: Dmitry Safonov <dima@arista.com>
>> ---
>>  git-send-email.perl | 23 ++++++++++++++++++++++-
>>  1 file changed, 22 insertions(+), 1 deletion(-)
> 
> There's tests for send-email in t/t9001-send-email.sh. See if what
> you're adding can have a test added, seems simple enough in this case.

I wasn't sure if that needs a test or some `--send-them-twice` option.
Decided to send it early.. Will add a test.

> 
>> diff --git a/git-send-email.perl b/git-send-email.perl
>> index 5f92c89c1c1b..0caafc104478 100755
>> --- a/git-send-email.perl
>> +++ b/git-send-email.perl
>> @@ -33,6 +33,7 @@
>>  use Net::Domain ();
>>  use Net::SMTP ();
>>  use Git::LoadCPAN::Mail::Address;
>> +use experimental 'smartmatch';
> 
> We depend on Perl 5.8, this bumps the requirenment to 5.10. Aside from
> that ~~ is its own can of worms in Perl and is best avoided.

Yeah, I'm not very into Perl and Stackoverflow *blush* suggested to use
~~. Will drop.

> 
>>  Getopt::Long::Configure qw/ pass_through /;
>>
>> @@ -658,6 +659,17 @@ sub is_format_patch_arg {
>>  	}
>>  }
>>
>> +sub send_file_twice {
>> +	my $f = shift;
>> +	$_ = ask(__("Patch $f will be sent twice, continue? [y]/n "),
> 
> These cases with a default should have "Y/n", not "y/n". See other
> expamples in the file.

Ok.

> 
>> +		default => "y",
>> +		valid_re => qr/^(?:yes|y|no|n)/i);
>> +	if (/^n/i) {
>> +		cleanup_compose_files();
>> +		exit(0);
> 
> Exit if we have just one of these? More on that later...
> 
>> +	}
>> +}
>> +
>>  # Now that all the defaults are set, process the rest of the command line
>>  # arguments and collect up the files that need to be processed.
>>  my @rev_list_opts;
>> @@ -669,10 +681,19 @@ sub is_format_patch_arg {
>>  		opendir my $dh, $f
>>  			or die sprintf(__("Failed to opendir %s: %s"), $f, $!);
>>
>> -		push @files, grep { -f $_ } map { catfile($f, $_) }
>> +		my @new_files = grep { -f $_ } map { catfile($f, $_) }
>>  				sort readdir $dh;
>> +		foreach my $nfile (@new_files) {
>> +			if ($nfile ~~ @files) {
>> +				send_file_twice($nfile);
>> +			}
> 
> One non-smartmatch idiom for this is:
> 
>     my %seen;
>     for my $file (@files) {
>         if ($seen{$file}++) { ...}
>     }
> 
> Or:
> 
>     my %seen;
>     my @dupes = grep { $seen{$_}++ } @files;
> 
>> +		}
>> +		push @files, @new_files;
>>  		closedir $dh;
>>  	} elsif ((-f $f or -p $f) and !is_format_patch_arg($f)) {
>> +		if ($f ~~ @files) {
>> +			send_file_twice($f);
>> +		}
>>  		push @files, $f;
> 
> ...but picking up the comment above, I'd expect this to be in the "if
> ($validate)" block below or something similar, seems like this fits
> right in with --validate.

By default it's on - sounds good to me.

> Then you can also ask "do you want to send this set of patches twice
> <full list>?".
> 
> Now the user is asked a file-at-a-time.

Ok, thanks for the suggestions.

-- 
          Dmitry

      reply	other threads:[~2019-07-30 12:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-30  0:13 [PATCH] send-email: Ask if a patch should be sent twice Dmitry Safonov
2019-07-30 11:54 ` Ævar Arnfjörð Bjarmason
2019-07-30 12:50   ` Dmitry Safonov [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=59e47154-5b07-4ef0-9883-dc3f53b31fc2@arista.com \
    --to=dima@arista.com \
    --cc=0x7f454c46@gmail.com \
    --cc=avagin@openvz.org \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).