mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-13 08:30:08 +00:00
Clean up states in VCS segment
This commit is contained in:
parent
a1ef6548d5
commit
e9953710f7
1 changed files with 13 additions and 5 deletions
|
@ -92,11 +92,9 @@ source $script_location/functions/vcs.zsh
|
||||||
if [[ "$POWERLEVEL9K_COLOR_SCHEME" == "light" ]]; then
|
if [[ "$POWERLEVEL9K_COLOR_SCHEME" == "light" ]]; then
|
||||||
DEFAULT_COLOR=white
|
DEFAULT_COLOR=white
|
||||||
DEFAULT_COLOR_INVERTED=black
|
DEFAULT_COLOR_INVERTED=black
|
||||||
DEFAULT_COLOR_DARK="252"
|
|
||||||
else
|
else
|
||||||
DEFAULT_COLOR=black
|
DEFAULT_COLOR=black
|
||||||
DEFAULT_COLOR_INVERTED=white
|
DEFAULT_COLOR_INVERTED=white
|
||||||
DEFAULT_COLOR_DARK="236"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
|
@ -749,6 +747,15 @@ prompt_vcs() {
|
||||||
VCS_WORKDIR_DIRTY=false
|
VCS_WORKDIR_DIRTY=false
|
||||||
VCS_WORKDIR_HALF_DIRTY=false
|
VCS_WORKDIR_HALF_DIRTY=false
|
||||||
|
|
||||||
|
# The vcs segment can have three different states - defaults to ''.
|
||||||
|
local current_state=""
|
||||||
|
typeset -AH vcs_states
|
||||||
|
vcs_states=(
|
||||||
|
'' 'green'
|
||||||
|
'modified' 'red'
|
||||||
|
'untracked' 'yellow'
|
||||||
|
)
|
||||||
|
|
||||||
VCS_CHANGESET_PREFIX=''
|
VCS_CHANGESET_PREFIX=''
|
||||||
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
|
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
|
||||||
# Default: Just display the first 12 characters of our changeset-ID.
|
# Default: Just display the first 12 characters of our changeset-ID.
|
||||||
|
@ -795,14 +802,15 @@ prompt_vcs() {
|
||||||
if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
|
if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
|
||||||
# $vcs_visual_identifier gets set in +vi-vcs-detect-changes in functions/vcs.zsh,
|
# $vcs_visual_identifier gets set in +vi-vcs-detect-changes in functions/vcs.zsh,
|
||||||
# as we have there access to vcs_info internal hooks.
|
# as we have there access to vcs_info internal hooks.
|
||||||
"$1_prompt_segment" "$0_MODIFIED" "$2" "red" "$DEFAULT_COLOR" "$vcs_prompt" "$vcs_visual_identifier"
|
current_state='modified'
|
||||||
else
|
else
|
||||||
if [[ "$VCS_WORKDIR_HALF_DIRTY" == true ]]; then
|
if [[ "$VCS_WORKDIR_HALF_DIRTY" == true ]]; then
|
||||||
"$1_prompt_segment" "$0_UNTRACKED" "$2" "yellow" "$DEFAULT_COLOR" "$vcs_prompt" "$vcs_visual_identifier"
|
current_state='untracked'
|
||||||
else
|
else
|
||||||
"$1_prompt_segment" "$0" "$2" "green" "$DEFAULT_COLOR" "$vcs_prompt" "$vcs_visual_identifier"
|
current_state=''
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
"$1_prompt_segment" "${0}_${(U)current_state}" "$2" "${vcs_states[$current_state]}" "$DEFAULT_COLOR" "$vcs_prompt" "$vcs_visual_identifier"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue