flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added initial zsh completion support to git_index

Browse Source 
zsh now completes all arguments and all directories inside $GIT_REPO_DIR. This is till buggy because not all directories in $GIT_REPO_DIR are actual git projects. Next update will include completing the list in the .git_index file.
This commit is contained in:
Aljaž "g5pw" Srebrnič
2012-10-23 09:13:20 +02:00
parent c20b91442a
commit a9aa363fdb
2 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/git/aliases.sh
View File

@@ -146,5 +146,7 @@ if [ $shell = "bash" ]; then
# If you know how to rewrite _git_index_tab_completion() for zsh, please send me a pull request! # If you know how to rewrite _git_index_tab_completion() for zsh, please send me a pull request!
complete -o nospace -F _git_index_tab_completion git_index complete -o nospace -F _git_index_tab_completion git_index
complete -o nospace -F _git_index_tab_completion $git_index_alias complete -o nospace -F _git_index_tab_completion $git_index_alias
else
compdef _git_index_tab_completion git_index $git_index_alias
fi fi

88
lib/git/repo_index.sh
View File

@@ -281,40 +281,66 @@ function _git_index_batch_cmd() {
} }
# Bash tab completion function for git_index() if [ $shell = 'bash' ]; then
function _git_index_tab_completion() { # Bash tab completion function for git_index()
_check_git_index function _git_index_tab_completion() {
local curw _check_git_index
IFS=$'\n' local curw
COMPREPLY=() IFS=$'\n'
curw=${COMP_WORDS[COMP_CWORD]} COMPREPLY=()
curw=${COMP_WORDS[COMP_CWORD]}
# If the first part of $curw matches a high-level directory, # If the first part of $curw matches a high-level directory,
# then match on sub-directories for that project # then match on sub-directories for that project
local project=$(echo "$curw" | cut -d "/" -f1) local project=$(echo "$curw" | cut -d "/" -f1)
local base_path=$(\grep "/$project$" "$GIT_REPO_DIR/.git_index" | sed 's/ /\\ /g') local base_path=$(\grep "/$project$" "$GIT_REPO_DIR/.git_index" | sed 's/ /\\ /g')
# If matching project path was found and curr string contains a /, then complete project sub-directories # If matching project path was found and curr string contains a /, then complete project sub-directories
if [[ -n "$base_path" && $curw == */* ]]; then if [[ -n "$base_path" && $curw == */* ]]; then
local search_path=$(echo "$curw" | sed "s:^${project/\\/\\\\\\}::") local search_path=$(echo "$curw" | sed "s:^${project/\\/\\\\\\}::")
COMPREPLY=($(compgen -d "$base_path$search_path" | \grep -v "/.git" | sed -e "s:$base_path:$project:" -e "s:$:/:" )) COMPREPLY=($(compgen -d "$base_path$search_path" | \grep -v "/.git" | sed -e "s:$base_path:$project:" -e "s:$:/:" ))
# If curr string starts with /, tab complete top-level directories in root project dir # If curr string starts with /, tab complete top-level directories in root project dir
elif ([ $shell = "bash" ] && [ "${curw:0:1}" = "/" ]) || \ elif ([ $shell = "bash" ] && [ "${curw:0:1}" = "/" ]) || \
([ $shell = "zsh" ] && [ "${curw[1,1]}" = "/" ]); then ([ $shell = "zsh" ] && [ "${curw[1,1]}" = "/" ]); then
COMPREPLY=($(compgen -d "$GIT_REPO_DIR$curw" | sed -e "s:$GIT_REPO_DIR/::" -e "s:^:/:")) COMPREPLY=($(compgen -d "$GIT_REPO_DIR$curw" | sed -e "s:$GIT_REPO_DIR/::" -e "s:^:/:"))
# If curr string starts with --, tab complete commands # If curr string starts with --, tab complete commands
elif ([ $shell = "bash" ] && [ "${curw:0:2}" = "--" ]) || \ elif ([ $shell = "bash" ] && [ "${curw:0:2}" = "--" ]) || \
([ $shell = "zsh" ] && [ "${curw[1,2]}" = "--" ]); then ([ $shell = "zsh" ] && [ "${curw[1,2]}" = "--" ]); then
local commands="--list\n--rebuild\n--update-all\n--batch-cmd\n--count-by-host" local commands="--list\n--rebuild\n--update-all\n--batch-cmd\n--count-by-host"
COMPREPLY=($(compgen -W '$(echo -e "\n"$commands)' -- $curw)) COMPREPLY=($(compgen -W '$(echo -e "\n"$commands)' -- $curw))
# Else, tab complete the entries in .git_index # Else, tab complete the entries in .git_index
else else
COMPREPLY=($(compgen -W '$(sed -e "s:.*/::" -e "s:$:/:" "$GIT_REPO_DIR/.git_index" | sort)' -- $curw)) COMPREPLY=($(compgen -W '$(sed -e "s:.*/::" -e "s:$:/:" "$GIT_REPO_DIR/.git_index" | sort)' -- $curw))
fi fi
IFS=$' \t\n' IFS=$' \t\n'
return 0 return 0
} }
else
function _git_index_tab_completion() {
typeset -A opt_args
_arguments \
"--rebuild[Rebuild repository index]" \
"--update-all[Update all indexed repositories]" \
"--update-all-with-notifications[Update all indexed repositories with notifications]" \
"--list[List all repositories currently present in the index]" \
"--count-by-host[Count all repositories per host]" \
"--batch-cmd+[Run a git command on all repositories]:git command:->git_command" \
":Project name:->projects" \
&& return 0
case "$state" in
projects)
_files -/ -W $GIT_REPO_DIR
;;
git_command)
;;
esac
return 1;
}
fi