undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/complete-show-all-commands'

Browse Source 
The command line completion script (in contrib/) learned to
complete all Git subcommands, including the ones that are normally
hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.

* ab/complete-show-all-commands:
  completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
  completion tests: re-source git-completion.bash in a subshell
This commit is contained in:
Junio C Hamano 2022-02-17 16:25:05 -08:00
commit 037dbe8ed7
2 changed files with 72 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/completion/git-completion.bash
View File

@ -49,6 +49,11 @@
# and git-switch completion (e.g., completing "foo" when "origin/foo" # and git-switch completion (e.g., completing "foo" when "origin/foo"
# exists). # exists).
# #
# GIT_COMPLETION_SHOW_ALL_COMMANDS
#
# When set to "1" suggest all commands, including plumbing commands
# which are hidden by default (e.g. "cat-file" on "git ca<TAB>").
#
# GIT_COMPLETION_SHOW_ALL # GIT_COMPLETION_SHOW_ALL
# #
# When set to "1" suggest all options, including options which are # When set to "1" suggest all options, including options which are
@ -3483,7 +3488,13 @@ __git_main ()
then then
__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST" __gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
else else
__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)" local list_cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config
if test "${GIT_COMPLETION_SHOW_ALL_COMMANDS-}" = "1"
then
list_cmds=builtins,$list_cmds
fi
__gitcomp "$(__git --list-cmds=$list_cmds)"
fi fi
;; ;;
esac esac

81
t/t9902-completion.sh
View File

@ -2534,27 +2534,33 @@ test_expect_success 'options with value' '
' '
test_expect_success 'sourcing the completion script clears cached commands' ' test_expect_success 'sourcing the completion script clears cached commands' '
__git_compute_all_commands && (
verbose test -n "$__git_all_commands" && __git_compute_all_commands &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && verbose test -n "$__git_all_commands" &&
verbose test -z "$__git_all_commands" . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
verbose test -z "$__git_all_commands"
)
' '
test_expect_success 'sourcing the completion script clears cached merge strategies' ' test_expect_success 'sourcing the completion script clears cached merge strategies' '
__git_compute_merge_strategies && (
verbose test -n "$__git_merge_strategies" && __git_compute_merge_strategies &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && verbose test -n "$__git_merge_strategies" &&
verbose test -z "$__git_merge_strategies" . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
verbose test -z "$__git_merge_strategies"
)
' '
test_expect_success 'sourcing the completion script clears cached --options' ' test_expect_success 'sourcing the completion script clears cached --options' '
__gitcomp_builtin checkout && (
verbose test -n "$__gitcomp_builtin_checkout" && __gitcomp_builtin checkout &&
__gitcomp_builtin notes_edit && verbose test -n "$__gitcomp_builtin_checkout" &&
verbose test -n "$__gitcomp_builtin_notes_edit" && __gitcomp_builtin notes_edit &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && verbose test -n "$__gitcomp_builtin_notes_edit" &&
verbose test -z "$__gitcomp_builtin_checkout" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
verbose test -z "$__gitcomp_builtin_notes_edit" verbose test -z "$__gitcomp_builtin_checkout" &&
verbose test -z "$__gitcomp_builtin_notes_edit"
)
' '
test_expect_success 'option aliases are not shown by default' ' test_expect_success 'option aliases are not shown by default' '
@ -2562,12 +2568,45 @@ test_expect_success 'option aliases are not shown by default' '
' '
test_expect_success 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' ' test_expect_success 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' '
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && (
GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
test_completion "git clone --recurs" <<-\EOF GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
--recurse-submodules Z test_completion "git clone --recurs" <<-\EOF
--recursive Z --recurse-submodules Z
EOF --recursive Z
EOF
)
'
test_expect_success 'plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS' '
(
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
# Just mainporcelain, not plumbing commands
run_completion "git c" &&
grep checkout out &&
! grep cat-file out
)
'
test_expect_success 'all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)' '
(
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
GIT_COMPLETION_SHOW_ALL_COMMANDS=1 &&
export GIT_COMPLETION_SHOW_ALL_COMMANDS &&
sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
# Both mainporcelain and plumbing commands
run_completion "git c" &&
grep checkout out &&
grep cat-file out &&
# Check "gitk", a "main" command, but not a built-in + more plumbing
run_completion "git g" &&
grep gitk out &&
grep get-tar-commit-id out
)
' '
test_expect_success '__git_complete' ' test_expect_success '__git_complete' '