ls-tree: fold "show_tree_data" into "cb" struct

[thirdparty/git.git] / git-send-email.perl

diff --git a/git-send-email.perl b/git-send-email.perl
index 5262d88ee32073f83bbb0c18c3386b6a3db12cd8..5861e99a6eb2a16bb45e759645e124a66a50e107 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -40,7 +40,8 @@ package main;
 
 sub usage {
        print <<EOT;
-git send-email [options] <file | directory | rev-list options >
+git send-email' [<options>] <file|directory>
+git send-email' [<options>] <format-patch options>
 git send-email --dump-aliases
 
   Composing:
@@ -113,9 +114,38 @@ EOT
        exit(1);
 }
 
+sub uniq {
+       my %seen;
+       grep !$seen{$_}++, @_;
+}
+
 sub completion_helper {
-    print Git::command('format-patch', '--git-completion-helper');
-    exit(0);
+       my ($original_opts) = @_;
+       my %not_for_completion = (
+               "git-completion-helper" => undef,
+               "h" => undef,
+       );
+       my @send_email_opts = ();
+
+       foreach my $key (keys %$original_opts) {
+               unless (exists $not_for_completion{$key}) {
+                       $key =~ s/!$//;
+
+                       if ($key =~ /[:=][si]$/) {
+                               $key =~ s/[:=][si]$//;
+                               push (@send_email_opts, "--$_=") foreach (split (/\|/, $key));
+                       } else {
+                               push (@send_email_opts, "--$_") foreach (split (/\|/, $key));
+                       }
+               }
+       }
+
+       my @format_patch_opts = split(/ /, Git::command('format-patch', '--git-completion-helper'));
+       my @opts = (@send_email_opts, @format_patch_opts);
+       @opts = uniq (grep !/^$/, @opts);
+       # There's an implicit '\n' here already, no need to add an explicit one.
+       print "@opts";
+       exit(0);
 }
 
 # most mail servers generate the Date: header, but not all...
@@ -195,13 +225,13 @@ my $multiedit;
 my $editor;
 
 sub system_or_msg {
-       my ($args, $msg) = @_;
+       my ($args, $msg, $cmd_name) = @_;
        system(@$args);
        my $signalled = $? & 127;
        my $exit_code = $? >> 8;
        return unless $signalled or $exit_code;
 
-       my @sprintf_args = ($args->[0], $exit_code);
+       my @sprintf_args = ($cmd_name ? $cmd_name : $args->[0], $exit_code);
        if (defined $msg) {
                # Quiet the 'redundant' warning category, except we
                # need to support down to Perl 5.8, so we can't do a
@@ -425,10 +455,11 @@ my %known_config_keys;
        my $key = "sendemail.identity";
        $identity = Git::config(@repo, $key) if exists $known_config_keys{$key};
 }
-my $rc = GetOptions(
+my %identity_options = (
        "identity=s" => \$identity,
        "no-identity" => \$no_identity,
 );
+my $rc = GetOptions(%identity_options);
 usage() unless $rc;
 undef $identity if $no_identity;
 
@@ -444,14 +475,17 @@ undef $identity if $no_identity;
 
 my $help;
 my $git_completion_helper;
-$rc = GetOptions("h" => \$help,
-                 "dump-aliases" => \$dump_aliases);
+my %dump_aliases_options = (
+       "h" => \$help,
+       "dump-aliases" => \$dump_aliases,
+);
+$rc = GetOptions(%dump_aliases_options);
 usage() unless $rc;
 die __("--dump-aliases incompatible with other options\n")
     if !$help and $dump_aliases and @ARGV;
-$rc = GetOptions(
+my %options = (
                    "sender|from=s" => \$sender,
-                    "in-reply-to=s" => \$initial_in_reply_to,
+                   "in-reply-to=s" => \$initial_in_reply_to,
                    "reply-to=s" => \$reply_to,
                    "subject=s" => \$initial_subject,
                    "to=s" => \@getopt_to,
@@ -508,7 +542,8 @@ $rc = GetOptions(
                    "batch-size=i" => \$batch_size,
                    "relogin-delay=i" => \$relogin_delay,
                    "git-completion-helper" => \$git_completion_helper,
-        );
+);
+$rc = GetOptions(%options);
 
 # Munge any "either config or getopt, not both" variables
 my @initial_to = @getopt_to ? @getopt_to : ($no_to ? () : @config_to);
@@ -516,7 +551,8 @@ my @initial_cc = @getopt_cc ? @getopt_cc : ($no_cc ? () : @config_cc);
 my @initial_bcc = @getopt_bcc ? @getopt_bcc : ($no_bcc ? () : @config_bcc);
 
 usage() if $help;
-completion_helper() if $git_completion_helper;
+my %all_options = (%options, %dump_aliases_options, %identity_options);
+completion_helper(\%all_options) if $git_completion_helper;
 unless ($rc) {
     usage();
 }
@@ -2039,10 +2075,10 @@ sub validate_patch {
        my ($fn, $xfer_encoding) = @_;
 
        if ($repo) {
+               my $hook_name = 'sendemail-validate';
                my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks');
                require File::Spec;
-               my $validate_hook = File::Spec->catfile($hooks_path,
-                                           'sendemail-validate');
+               my $validate_hook = File::Spec->catfile($hooks_path, $hook_name);
                my $hook_error;
                if (-x $validate_hook) {
                        require Cwd;
@@ -2052,13 +2088,18 @@ sub validate_patch {
                        chdir($repo->wc_path() or $repo->repo_path())
                                or die("chdir: $!");
                        local $ENV{"GIT_DIR"} = $repo->repo_path();
-                       $hook_error = system_or_msg([$validate_hook, $target]);
+                       my @cmd = ("git", "hook", "run", "--ignore-missing",
+                                   $hook_name, "--");
+                       my @cmd_msg = (@cmd, "<patch>");
+                       my @cmd_run = (@cmd, $target);
+                       $hook_error = system_or_msg(\@cmd_run, undef, "@cmd_msg");
                        chdir($cwd_save) or die("chdir: $!");
                }
                if ($hook_error) {
-                       die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
-                                      "%s\n" .
-                                      "warning: no patches were sent\n"), $fn, $hook_error);
+                       $hook_error = sprintf(
+                           __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
+                           $fn, $hook_name, $hook_error);
+                       die $hook_error;
                }
        }