nojhan/lp-jolly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[dotmatrix] more on vcs

Browse source
This commit is contained in:
Johann Dreo 2021-08-30 15:34:56 +02:00
commit 3e6a09c777
1 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
themes/dotmatrix/dotmatrix.theme
View file

@ -599,15 +599,7 @@ __dotmatrix_prompt_vcs() {
_lp_smart_mark _lp_smart_mark
# Mark & commits off remote local diffs=
local has_commit=
if _lp_vcs_commits_off_remote; then
__dotmatrix_make_field "${DOTMATRIX_VCS}${lp_smart_mark}" "${DOTMATRIX_COLOR_NOTE[@]}"
_DOTMATRIX_VCS="${dotmatrix_field}"
__dotmatrix_make_sep_link "${DOTMATRIX_COLOR_NOTE[@]}"
_DOTMATRIX_VCS+="${dotmatrix_sep}"
if (( LP_ENABLE_VCS_DIFFSTATS )) ; then if (( LP_ENABLE_VCS_DIFFSTATS )) ; then
if [[ "$lp_vcs_commit_ahead" -ne "0" && "$lp_vcs_commit_behind" -ne "0" ]]; then if [[ "$lp_vcs_commit_ahead" -ne "0" && "$lp_vcs_commit_behind" -ne "0" ]]; then
__dotmatrix_make_field "+$lp_vcs_commit_ahead" "${DOTMATRIX_COLOR_NOTE[@]}" __dotmatrix_make_field "+$lp_vcs_commit_ahead" "${DOTMATRIX_COLOR_NOTE[@]}"
@ -625,14 +617,30 @@ __dotmatrix_prompt_vcs() {
__dotmatrix_make_field "-$lp_vcs_commit_behind" "${DOTMATRIX_COLOR_NOTE[@]}" __dotmatrix_make_field "-$lp_vcs_commit_behind" "${DOTMATRIX_COLOR_NOTE[@]}"
has_commit+="${dotmatrix_field}" has_commit+="${dotmatrix_field}"
fi fi
_DOTMATRIX_VCS+="${has_commit}" diffs+="${has_commit}"
else else
__dotmatrix_make_field "${DOTMATRIX_DIFF}" "${DOTMATRIX_COLOR_NOTE[@]}" __dotmatrix_make_field "${DOTMATRIX_DIFF}" "${DOTMATRIX_COLOR_LITE[@]}"
_DOTMATRIX_VCS+="${dotmatrix_field}" diffs+="${dotmatrix_field}"
fi # LP_ENABLE_VCS_DIFFSTATS fi # LP_ENABLE_VCS_DIFFSTATS
# Mark & commits off remote
local has_commit=
if _lp_vcs_commits_off_remote; then
__dotmatrix_make_field "${DOTMATRIX_VCS}${lp_smart_mark}" "${DOTMATRIX_COLOR_NOTE[@]}"
_DOTMATRIX_VCS="${dotmatrix_field}"
__dotmatrix_make_sep_link "${DOTMATRIX_COLOR_NOTE[@]}"
_DOTMATRIX_VCS+="${dotmatrix_sep}"
_DOTMATRIX_VCS+="${diffs}"
if [[ "$lp_vcs_commit_ahead" -ne "0" && "$lp_vcs_commit_behind" -ne "0" ]]; then
__dotmatrix_make_sep_plug "${DOTMATRIX_COLOR_NOTE[@]}"
_DOTMATRIX_VCS+="${dotmatrix_sep}"
else
__dotmatrix_make_sep_plug "${DOTMATRIX_COLOR_LITE[@]}" __dotmatrix_make_sep_plug "${DOTMATRIX_COLOR_LITE[@]}"
_DOTMATRIX_VCS+="${dotmatrix_sep}" _DOTMATRIX_VCS+="${dotmatrix_sep}"
fi
else # No commit off remote else # No commit off remote
__dotmatrix_make_field "${DOTMATRIX_VCS}${lp_smart_mark}" "${DOTMATRIX_COLOR_DARK[@]}" __dotmatrix_make_field "${DOTMATRIX_VCS}${lp_smart_mark}" "${DOTMATRIX_COLOR_DARK[@]}"