adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup of git-prompt plugin file

Browse Source
This commit is contained in:
Marc Cornellà 2015-08-01 18:09:20 +02:00
parent 1d133ff11f
commit 6ff53d173b
1 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/git-prompt/git-prompt.plugin.zsh
View File

@ -1,24 +1,13 @@
# ZSH Git Prompt Plugin from: # ZSH Git Prompt Plugin from:
# http://github.com/olivierverdier/zsh-git-prompt # http://github.com/olivierverdier/zsh-git-prompt
export __GIT_PROMPT_DIR=${0:A:h} __GIT_PROMPT_DIR="${0:A:h}"
export GIT_PROMPT_EXECUTABLE=${GIT_PROMPT_USE_PYTHON:-"python"} ## Hook function definitions
function chpwd_update_git_vars() {
update_current_git_vars
}
# Initialize colors.
autoload -U colors
colors
# Allow for functions in the prompt.
setopt PROMPT_SUBST
autoload -U add-zsh-hook
add-zsh-hook chpwd chpwd_update_git_vars
add-zsh-hook preexec preexec_update_git_vars
add-zsh-hook precmd precmd_update_git_vars
## Function definitions
function preexec_update_git_vars() { function preexec_update_git_vars() {
case "$2" in case "$2" in
git*|hub*|gh*|stg*) git*|hub*|gh*|stg*)
@ -34,21 +23,17 @@ function precmd_update_git_vars() {
fi fi
} }
function chpwd_update_git_vars() { chpwd_functions+=(chpwd_update_git_vars)
update_current_git_vars precmd_functions+=(precmd_update_git_vars)
} preexec_functions+=(preexec_update_git_vars)
## Function definitions
function update_current_git_vars() { function update_current_git_vars() {
unset __CURRENT_GIT_STATUS unset __CURRENT_GIT_STATUS
if [[ "$GIT_PROMPT_EXECUTABLE" == "python" ]]; then
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py" local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
_GIT_STATUS=`python ${gitstatus} 2>/dev/null` _GIT_STATUS=$(python ${gitstatus} 2>/dev/null)
fi
if [[ "$GIT_PROMPT_EXECUTABLE" == "haskell" ]]; then
local gitstatus="$__GIT_PROMPT_DIR/dist/build/gitstatus/gitstatus"
_GIT_STATUS=`${gitstatus}`
fi
__CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}") __CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
GIT_BRANCH=$__CURRENT_GIT_STATUS[1] GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
GIT_AHEAD=$__CURRENT_GIT_STATUS[2] GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
@ -59,7 +44,6 @@ function update_current_git_vars() {
GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7] GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
} }
git_super_status() { git_super_status() {
precmd_update_git_vars precmd_update_git_vars
if [ -n "$__CURRENT_GIT_STATUS" ]; then if [ -n "$__CURRENT_GIT_STATUS" ]; then
@ -91,7 +75,7 @@ git_super_status() {
fi fi
} }
# Default values for the appearance of the prompt. Configure at will. # Default values for the appearance of the prompt.
ZSH_THEME_GIT_PROMPT_PREFIX="(" ZSH_THEME_GIT_PROMPT_PREFIX="("
ZSH_THEME_GIT_PROMPT_SUFFIX=")" ZSH_THEME_GIT_PROMPT_SUFFIX=")"
ZSH_THEME_GIT_PROMPT_SEPARATOR="|" ZSH_THEME_GIT_PROMPT_SEPARATOR="|"