|
|
@ -61,12 +61,12 @@
|
|
|
|
else
|
|
|
|
else
|
|
|
|
# Use VCS_STATUS_* parameters to assemble Git status. See reference:
|
|
|
|
# Use VCS_STATUS_* parameters to assemble Git status. See reference:
|
|
|
|
# https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh.
|
|
|
|
# https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh.
|
|
|
|
typeset -g my_git_format='%B%F{blue}git:(%F{red}'
|
|
|
|
typeset -g my_git_format="${1+%B%4F}git:(${1+%1F}"
|
|
|
|
my_git_format+=${${VCS_STATUS_LOCAL_BRANCH:-${VCS_STATUS_COMMIT[1,8]}}//\%/%%}
|
|
|
|
my_git_format+=${${VCS_STATUS_LOCAL_BRANCH:-${VCS_STATUS_COMMIT[1,8]}}//\%/%%}
|
|
|
|
my_git_format+='%F{blue})'
|
|
|
|
my_git_format+="${1+%4F})"
|
|
|
|
if (( VCS_STATUS_NUM_CONFLICTED || VCS_STATUS_NUM_STAGED ||
|
|
|
|
if (( VCS_STATUS_NUM_CONFLICTED || VCS_STATUS_NUM_STAGED ||
|
|
|
|
VCS_STATUS_NUM_UNSTAGED || VCS_STATUS_NUM_UNTRACKED )); then
|
|
|
|
VCS_STATUS_NUM_UNSTAGED || VCS_STATUS_NUM_UNTRACKED )); then
|
|
|
|
my_git_format+=' %F{yellow}✗'
|
|
|
|
my_git_format+=" ${1+%3F}✗"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -75,9 +75,10 @@
|
|
|
|
# Disable the default Git status formatting.
|
|
|
|
# Disable the default Git status formatting.
|
|
|
|
typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true
|
|
|
|
typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true
|
|
|
|
# Install our own Git status formatter.
|
|
|
|
# Install our own Git status formatter.
|
|
|
|
typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter()))+${my_git_format}}'
|
|
|
|
typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}'
|
|
|
|
# Disable loading indicator.
|
|
|
|
typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter()))+${my_git_format}}'
|
|
|
|
typeset -g POWERLEVEL9K_VCS_LOADING_TEXT='%{%}'
|
|
|
|
# Grey Git status when loading.
|
|
|
|
|
|
|
|
typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=246
|
|
|
|
|
|
|
|
|
|
|
|
# Instant prompt mode.
|
|
|
|
# Instant prompt mode.
|
|
|
|
#
|
|
|
|
#
|
|
|
|