Bash and fish completion for stg email --git-opts

Author: jpgrayson

src/cmd/completion/bash.rs

@@ -219,6 +219,10 @@ fn insert_compreply(script: &mut ShStream, arg: &clap::Arg) {
             "diff-opts" => {
                 script.line("mapfile -t COMPREPLY < <(compgen -W \"$(_diff_opts)\" -- \"$cur\")")
             }
+            "git-format-patch-opts" => script
+                .line("mapfile -t COMPREPLY < <(compgen -W \"$(_format_patch_opts)\" -- \"$cur\")"),
+            "git-send-email-opts" => script
+                .line("mapfile -t COMPREPLY < <(compgen -W \"$(_send_email_opts)\" -- \"$cur\")"),
             "patch" => script
                 .line("mapfile -t COMPREPLY < <(compgen -W \"$(_visible_patches)\" -- \"$cur\")"),
             "patchranges" => script.line("_patch_range \"$(_visible_patches)\""),
@@ -565,6 +569,16 @@ _diff_opts ()
     __git diff-tree --git-completion-helper
 }
 
+_format_patch_opts ()
+{
+    __git format-patch --git-completion-helper
+}
+
+_send_email_opts()
+{
+    __git send-email --git-completion-helper
+}
+
 "#;
 
 const MAIN: &str = r#"

src/cmd/completion/fish.rs

@@ -174,12 +174,24 @@ function __fish_stg_mail_aliases
     | cut -d. -f 3
 end
 
-function __fish_stg_diff_opts
+function __fish_stg_git_diff_opts
     __fish_stg_git diff-tree --git-completion-helper \
     | string split ' ' \
     | string match --regex '\--.+'
 end
 
+function __fish_stg_git_format_patch_opts
+    __fish_stg_git format-patch --git-completion-helper \
+    | string split ' ' \
+    | string match --regex '\--.+'
+end
+
+function __fish_stg_git_send_email_opts
+    __fish_stg_git send-email --git-completion-helper \
+    | string split ' ' \
+    | string match --regex '\--.+'
+end
+
 complete -c stg -n __fish_stg_needs_command -xa '(stg completion list commands-and-aliases --style=fish)'
 complete -c stg -n __fish_stg_needs_command -s C -xa '(__fish_complete_directories)' -d 'Run as if started in this directory'
 complete -c stg -n __fish_stg_needs_command -l color -a 'auto always ansi never' -d 'When to colorize output'
@@ -346,7 +358,9 @@ fn get_arg_completion_params(arg: &clap::Arg) -> ShStream {
             "branch" | "ref-branch" => params.word("-xa '(__fish_stg_stg_branches)'"),
             "branch-any" => params.word("-xa '(__fish_stg_all_branches)'"),
             "committish" => params.word("-xa '(__fish_stg_commit)'"),
-            "diff-opts" => params.word("-xa '(__fish_stg_diff_opts)'"),
+            "diff-opts" => params.word("-xa '(__fish_stg_git_diff_opts)'"),
+            "git-format-patch-opts" => params.word("-xa '(__fish_stg_git_format_patch_opts)'"),
+            "git-send-email-opts" => params.word("-xa '(__fish_stg_git_send_email_opts)'"),
             "patch" | "patchranges" => params.word("-kxa '(__fish_stg_patches -A -U)'"),
             "patchranges-all" | "set-tree" | "stgit-revision" => {
                 params.word("-kxa '(__fish_stg_patches --all)'")