On Fri, Mar 18, 2016 at 12:40 PM, Junio C Hamano <gits...@pobox.com> wrote:
> send-email: detect and offer to skip backup files
>
> Diligent people save output from format-patch to files, proofread
> and edit them and then finally send the result out. If the
> resulting files are sent out with "git send-email 0*", this ends up
> sending backup files (e.g. 0001-X.patch.backup or 0001-X.patch~)
> left by their editors next to the final version. Sending them with
> "git send-email 0*.patch" (if format-patch was run with the standard
> suffix) would avoid such an embarrassment, but not everybody is
> careful.
>
> After collecting files to be sent (and sorting them if read from a
> directory), notice when the file being sent out has the same name as
> the previous file, plus some suffix (e.g. 0001-X.patch was sent, and
> we are looking at 0001-X.patch.backup or 0001-X.patch~), and the
> suffix begins with a non-alnum (e.g. ".backup" or "~") and ask if
> the user really wants to send it out. Once the user skips sending
> such a "backup" file, remember the suffix and stop asking the same
> question (e.g. after skipping 0001-X.patch~, skip 0002-Y.patch~
> without asking).
The problem I see is it's hard to review the to-send list.
git-send-email does list it, but the the dashes in file names make
them really hard to split out words. Maybe highlighting can help, or
maybe we can show subject lines instead of file names.
Back to the patch, another case you can catch is when people have some
leftover patches in current dir, then 0*.patch may include unrelated
patches too. A check on patch numbering (contiguous and no duplicates)
might help.
> git-send-email.perl | 40 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index d356901..74ed01a 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -621,6 +621,8 @@ sub is_format_patch_arg {
> push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP =>
> 1), @rev_list_opts);
> }
>
> +@files = handle_backup_files(@files);
> +
> if ($validate) {
> foreach my $f (@files) {
> unless (-p $f) {
> @@ -1726,6 +1728,44 @@ sub validate_patch {
> return;
> }
>
> +sub handle_backup {
> + my ($last, $lastlen, $file, $known_suffix) = @_;
> + my ($suffix, $skip);
> +
> + $skip = 0;
> + if (defined $last &&
> + ($lastlen < length($file)) &&
> + (substr($file, 0, $lastlen) eq $last) &&
> + ($suffix = substr($file, $lastlen)) !~ /^[a-z0-9]/i) {
> + if (defined $known_suffix && $suffix eq $known_suffix) {
> + print "Skipping $file with backup suffix
> '$known_suffix'.\n";
> + $skip = 1;
> + } else {
> + my $answer = ask("Do you really want to send $file?
> (y|N): ",
> + valid_re => qr/^(?:y|n)/i,
> + default => 'y');
> + $skip = ($answer ne 'y');
> + if ($skip) {
> + $known_suffix = $suffix;
> + }
> + }
> + }
> + return ($skip, $known_suffix);
> +}
> +
> +sub handle_backup_files {
> + my @file = @_;
> + my ($last, $lastlen, $known_suffix, $skip, @result);
> + for my $file (@file) {
> + ($skip, $known_suffix) = handle_backup($last, $lastlen,
> + $file, $known_suffix);
> + push @result, $file unless $skip;
> + $last = $file;
> + $lastlen = length($file);
> + }
> + return @result;
> +}
> +
> sub file_has_nonascii {
> my $fn = shift;
> open(my $fh, '<', $fn)
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
