send-email: programmatically generate bash completions

"git send-email --git-completion-helper" only prints "format-patch"
flags. Make it print "send-email" flags as well, extracting them
programmatically from its three existing "GetOptions".

Introduce a "uniq" subroutine, otherwise --cc-cover, --to-cover and
other flags would show up twice. In addition, deduplicate flags common
to both "send-email" and "format-patch", like --from.

Remove extraneous flags: --h and --git-completion-helper.

Add trailing "=" to options that expect an argument, inline with
the format-patch implementation.

Add a completion test for "send-email --validate", a send-email flag.

Signed-off-by: Thiago Perrotta <tbperrotta@gmail.com>
Based-on-patch-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8108eda1e8614728063c67f5658bccdc0e1d8ec0..183b42325c8e02b1b29b724f02ff04f22dff8ab2 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2359,16 +2359,7 @@ _git_send_email ()
                return
                ;;
        --*)
-               __gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
-                       --compose --confirm= --dry-run --envelope-sender
-                       --from --identity
-                       --in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-                       --no-suppress-from --no-thread --quiet --reply-to
-                       --signed-off-by-cc --smtp-pass --smtp-server
-                       --smtp-server-port --smtp-encryption= --smtp-user
-                       --subject --suppress-cc= --suppress-from --thread --to
-                       --validate --no-validate
-                       $__git_format_patch_extra_options"
+               __gitcomp_builtin send-email "$__git_format_patch_extra_options"
                return
                ;;
        esac

diff --git a/git-send-email.perl b/git-send-email.perl
index 5262d88ee32073f83bbb0c18c3386b6a3db12cd8..d34c1afd4fcc327d4e38703ae0471988a02da505 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -113,9 +113,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...
@@ -425,10 +454,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 +474,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 +541,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 +550,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();
 }

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 5decc3b269e53a75c5e431fc5fe41333c7425470..518203fbe07399f794651d2bb81878ed0321d922 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2148,6 +2148,9 @@ test_expect_success PERL 'send-email' '
        --cover-from-description=Z
        --cover-letter Z
        EOF
+       test_completion "git send-email --val" <<-\EOF &&
+       --validate Z
+       EOF
        test_completion "git send-email ma" "main "
 '