From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 4/4] _git-config: Complete option names present in the config file.
Date: Fri, 29 Jul 2016 17:00:08 +0000 [thread overview]
Message-ID: <1469811608-3870-4-git-send-email-danielsh@tarsus.local2> (raw)
In-Reply-To: <1469811608-3870-1-git-send-email-danielsh@tarsus.local2>
This patch lets
.
git config x.y.z value
git config <TAB>
.
complete 'x.y.z', even if x.y.z isn't hardcoded into _git-config.
---
Completion/Unix/Command/_git | 46 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 184d164..f9918f1 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2459,6 +2459,39 @@ _git-config () {
${${${(0)"$(_call_program gettable-options git config -z --list)"}%%$'\n'*}//:/\\:}
)
+ # Add to $git_options options from the config file that aren't already in $git_options.
+ () {
+ local -a -U sections_that_permit_arbitrary_subsection_names=(
+ alias
+ pager
+ pretty
+ remotes
+ ${(u)${(M)${git_options%%:*}:#*[.][*][.]*}%%.*}
+ )
+ local key
+ for key in $git_present_options ; do
+ if (( ${+git_options[(r)(#i)${(b)key}:*]} )); then
+ # $key is already in git_options
+ continue
+ elif (( ${+sections_that_permit_arbitrary_subsection_names[(r)${(b)key%%.*}]} )); then
+ if [[ $key == *.*.* ]]; then
+ # If $key isn't an instance of a known foo.*.bar:baz $git_options entry...
+ if ! (( ${+git_options[(r)(#i)${(b)key%%.*}.[*].${(b)key##*.}:*]} )); then
+ # ... then add it.
+ git_options+="${key}:unknown option name"
+ fi
+ else
+ # $key is of the form "foo.bar" where 'foo' is known
+ # No need to add it; "foo.<TAB>' will find 'bar' via another codepath later
+ # ### TODO: that "other codepath" will probably run git config -z again, redundantly.
+ continue
+ fi
+ else
+ git_options+="${key}:unknown option name"
+ fi
+ done
+ }
+
case $state in
(section)
__git_config_sections -b '(|)' '^' section-names 'section name' $* && ret=0
@@ -2539,6 +2572,8 @@ _git-config () {
# following functions don't generate any output in the case of
# multi-level options.
case $IPREFIX in
+ # Note: If you add a branch to this 'case' statement,
+ # update $sections_that_permit_arbitrary_subsection_names.
(alias.)
__git_aliases && ret=0
;;
@@ -2596,6 +2631,10 @@ _git-config () {
(svn-remote.)
__git_svn-remotes -S . && ret=0
;;
+ (*.)
+ local -a existing_subsections=( ${${${(M)git_present_options:#${IPREFIX}*.*}#${IPREFIX}}%.*} )
+ _describe -t existing-subsections "existing subsections" existing_subsections -S . && ret=0
+ ;;
esac
else
sections=(
@@ -2658,6 +2697,13 @@ _git-config () {
web:'web options'
svn:'git svn options'
svn-remote:'git svn remotes')
+ () {
+ local i
+ for i in ${(u)git_present_options%%.*}; do
+ (( ${+sections[(r)(#i)${(b)i}:*]} )) ||
+ sections+="${i}:unknown section name"
+ done
+ }
fi
# TODO: Add equivalent of -M 'r:|.=* r:|=*' here so that we can complete
prev parent reply other threads:[~2016-07-29 17:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 17:00 [PATCH 1/4] _git-config: Document more line noise Daniel Shahaf
2016-07-29 17:00 ` [PATCH 2/4] _git-config: No functional change: rename $git_options_static to $git_options in preparation for the after-next commit Daniel Shahaf
2016-07-29 17:00 ` [PATCH 3/4] _git-config: Run gettable-options earlier and in all codepaths Daniel Shahaf
2016-07-29 17:00 ` Daniel Shahaf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469811608-3870-4-git-send-email-danielsh@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).