linux/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2025-12-25 22:22:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

My changes on icons.zsh file and small fix on "vcs" to fix some unaspected behaviour

Browse source
This commit is contained in:
jD4rk 2020-01-29 01:02:13 +01:00
commit 6996f22570
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/p10k.zsh
View file

@ -3126,6 +3126,7 @@ typeset -gA __p9k_vcs_states=(
'UNTRACKED' '2'
'LOADING' '8'
'CONFLICTED' '3'
'STASHED' '208' # add
)
function +vi-git-untracked() {
@ -3418,16 +3419,21 @@ function _p9k_vcs_render() {
if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then
if [[ -z $state ]]; then
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then
#echo "myMOD"
#if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; # old
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 ]]; then # new
state=CONFLICTED
elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
state=MODIFIED
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
state=UNTRACKED
elif [[ $VCS_STATUS_STASHES != 0 ]]; then # add
state=STASHED # add
else
state=CLEAN
fi
fi
_p9k_vcs_icon
_p9k_prompt_segment prompt_vcs_$state "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' ""
return 0