mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'jk/send-email-complete-aliases'
Teach send-email to dump mail aliases, so that we can do tab completion on the command line. * jk/send-email-complete-aliases: completion: add support for completing email aliases sendemail: teach git-send-email to dump alias names
This commit is contained in:
commit
c69d08df96
|
@ -10,6 +10,7 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git send-email' [options] <file|directory|rev-list options>...
|
||||
'git send-email' --dump-aliases
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
@ -387,6 +388,16 @@ default to '--validate'.
|
|||
Send emails even if safety checks would prevent it.
|
||||
|
||||
|
||||
Information
|
||||
~~~~~~~~~~~
|
||||
|
||||
--dump-aliases::
|
||||
Instead of the normal operation, dump the shorthand alias names from
|
||||
the configured alias file(s), one per line in alphabetical order. Note,
|
||||
this only includes the alias name and not its expanded email addresses.
|
||||
See 'sendemail.aliasesfile' for more information about aliases.
|
||||
|
||||
|
||||
CONFIGURATION
|
||||
-------------
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
# *) local and remote tag names
|
||||
# *) .git/remotes file names
|
||||
# *) git 'subcommands'
|
||||
# *) git email aliases for git-send-email
|
||||
# *) tree paths within 'ref:path/to/file' expressions
|
||||
# *) file paths within current working directory and index
|
||||
# *) common --long-options
|
||||
|
@ -1711,6 +1712,15 @@ __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
|
|||
|
||||
_git_send_email ()
|
||||
{
|
||||
case "$prev" in
|
||||
--to|--cc|--bcc|--from)
|
||||
__gitcomp "
|
||||
$(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
|
||||
" "" ""
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$cur" in
|
||||
--confirm=*)
|
||||
__gitcomp "
|
||||
|
@ -1735,6 +1745,12 @@ _git_send_email ()
|
|||
" "" "${cur##--thread=}"
|
||||
return
|
||||
;;
|
||||
--to=*|--cc=*|--bcc=*|--from=*)
|
||||
__gitcomp "
|
||||
$(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
|
||||
" "" "${cur#--*=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
|
||||
--compose --confirm= --dry-run --envelope-sender
|
||||
|
|
|
@ -46,6 +46,7 @@ package main;
|
|||
sub usage {
|
||||
print <<EOT;
|
||||
git send-email [options] <file | directory | rev-list options >
|
||||
git send-email --dump-aliases
|
||||
|
||||
Composing:
|
||||
--from <str> * Email From:
|
||||
|
@ -101,6 +102,9 @@ sub usage {
|
|||
`git format-patch` ones.
|
||||
--force * Send even if safety checks would prevent it.
|
||||
|
||||
Information:
|
||||
--dump-aliases * Dump configured aliases and exit.
|
||||
|
||||
EOT
|
||||
exit(1);
|
||||
}
|
||||
|
@ -180,6 +184,7 @@ sub format_2822_time {
|
|||
my $format_patch;
|
||||
my $compose_filename;
|
||||
my $force = 0;
|
||||
my $dump_aliases = 0;
|
||||
|
||||
# Handle interactive edition of files.
|
||||
my $multiedit;
|
||||
|
@ -291,6 +296,11 @@ sub signal_handler {
|
|||
|
||||
my $help;
|
||||
my $rc = GetOptions("h" => \$help,
|
||||
"dump-aliases" => \$dump_aliases);
|
||||
usage() unless $rc;
|
||||
die "--dump-aliases incompatible with other options\n"
|
||||
if !$help and $dump_aliases and @ARGV;
|
||||
$rc = GetOptions(
|
||||
"sender|from=s" => \$sender,
|
||||
"in-reply-to=s" => \$initial_reply_to,
|
||||
"subject=s" => \$initial_subject,
|
||||
|
@ -551,6 +561,11 @@ sub parse_sendmail_aliases {
|
|||
}
|
||||
}
|
||||
|
||||
if ($dump_aliases) {
|
||||
print "$_\n" for (sort keys %aliases);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
# is_format_patch_arg($f) returns 0 if $f names a patch, or 1 if
|
||||
# $f is a revision list specification to be passed to format-patch.
|
||||
sub is_format_patch_arg {
|
||||
|
|
|
@ -1555,6 +1555,88 @@ test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
|
|||
grep "^!someone@example\.org!$" commandline1
|
||||
'
|
||||
|
||||
test_dump_aliases () {
|
||||
msg="$1" && shift &&
|
||||
filetype="$1" && shift &&
|
||||
printf '%s\n' "$@" >expect &&
|
||||
cat >.tmp-email-aliases &&
|
||||
|
||||
test_expect_success $PREREQ "$msg" '
|
||||
clean_fake_sendmail && rm -fr outdir &&
|
||||
git config --replace-all sendemail.aliasesfile \
|
||||
"$(pwd)/.tmp-email-aliases" &&
|
||||
git config sendemail.aliasfiletype "$filetype" &&
|
||||
git send-email --dump-aliases 2>errors >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
}
|
||||
|
||||
test_dump_aliases '--dump-aliases sendmail format' \
|
||||
'sendmail' \
|
||||
'abgroup' \
|
||||
'alice' \
|
||||
'bcgrp' \
|
||||
'bob' \
|
||||
'chloe' <<-\EOF
|
||||
alice: Alice W Land <awol@example.com>
|
||||
bob: Robert Bobbyton <bob@example.com>
|
||||
chloe: chloe@example.com
|
||||
abgroup: alice, bob
|
||||
bcgrp: bob, chloe, Other <o@example.com>
|
||||
EOF
|
||||
|
||||
test_dump_aliases '--dump-aliases mutt format' \
|
||||
'mutt' \
|
||||
'alice' \
|
||||
'bob' \
|
||||
'chloe' \
|
||||
'donald' <<-\EOF
|
||||
alias alice Alice W Land <awol@example.com>
|
||||
alias donald Donald C Carlton <donc@example.com>
|
||||
alias bob Robert Bobbyton <bob@example.com>
|
||||
alias chloe chloe@example.com
|
||||
EOF
|
||||
|
||||
test_dump_aliases '--dump-aliases mailrc format' \
|
||||
'mailrc' \
|
||||
'alice' \
|
||||
'bob' \
|
||||
'chloe' \
|
||||
'eve' <<-\EOF
|
||||
alias alice Alice W Land <awol@example.com>
|
||||
alias eve Eve <eve@example.com>
|
||||
alias bob Robert Bobbyton <bob@example.com>
|
||||
alias chloe chloe@example.com
|
||||
EOF
|
||||
|
||||
test_dump_aliases '--dump-aliases pine format' \
|
||||
'pine' \
|
||||
'alice' \
|
||||
'bob' \
|
||||
'chloe' \
|
||||
'eve' <<-\EOF
|
||||
alice Alice W Land <awol@example.com>
|
||||
eve Eve <eve@example.com>
|
||||
bob Robert Bobbyton <bob@example.com>
|
||||
chloe chloe@example.com
|
||||
EOF
|
||||
|
||||
test_dump_aliases '--dump-aliases gnus format' \
|
||||
'gnus' \
|
||||
'alice' \
|
||||
'bob' \
|
||||
'chloe' \
|
||||
'eve' <<-\EOF
|
||||
(define-mail-alias "alice" "awol@example.com")
|
||||
(define-mail-alias "eve" "eve@example.com")
|
||||
(define-mail-alias "bob" "bob@example.com")
|
||||
(define-mail-alias "chloe" "chloe@example.com")
|
||||
EOF
|
||||
|
||||
test_expect_success '--dump-aliases must be used alone' '
|
||||
test_must_fail git send-email --dump-aliases --to=janice@example.com -1 refs/heads/accounting
|
||||
'
|
||||
|
||||
test_sendmail_aliases () {
|
||||
msg="$1" && shift &&
|
||||
expect="$@" &&
|
||||
|
|
Loading…
Reference in a new issue