|
|
@ -71,7 +71,7 @@ zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f"
|
|
|
|
zstyle ':vcs_info:*' stagedstr " %F{$DEFAULT_COLOR}$VCS_STAGED_ICON%f"
|
|
|
|
zstyle ':vcs_info:*' stagedstr " %F{$DEFAULT_COLOR}$VCS_STAGED_ICON%f"
|
|
|
|
zstyle ':vcs_info:*' unstagedstr " %F{$DEFAULT_COLOR}$VCS_UNSTAGED_ICON%f"
|
|
|
|
zstyle ':vcs_info:*' unstagedstr " %F{$DEFAULT_COLOR}$VCS_UNSTAGED_ICON%f"
|
|
|
|
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-aheadbehind git-remotebranch git-tagname
|
|
|
|
zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
|
|
|
|
|
|
|
|
|
|
|
|
# For Hg, only show the branch name
|
|
|
|
# For Hg, only show the branch name
|
|
|
|
zstyle ':vcs_info:hg*:*' branchformat "%b"
|
|
|
|
zstyle ':vcs_info:hg*:*' branchformat "%b"
|
|
|
@ -208,6 +208,17 @@ function +vi-git-tagname() {
|
|
|
|
[[ -n ${tag} ]] && hook_com[branch]=" %F{$DEFAULT_COLOR}${tag}%f"
|
|
|
|
[[ -n ${tag} ]] && hook_com[branch]=" %F{$DEFAULT_COLOR}${tag}%f"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Show count of stashed changes
|
|
|
|
|
|
|
|
# Port from https://github.com/whiteinge/dotfiles/blob/5dfd08d30f7f2749cfc60bc55564c6ea239624d9/.zsh_shouse_prompt#L268
|
|
|
|
|
|
|
|
function +vi-git-stash() {
|
|
|
|
|
|
|
|
local -a stashes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [[ -s $(git rev-parse --git-dir)/refs/stash ]] ; then
|
|
|
|
|
|
|
|
stashes=$(git stash list 2>/dev/null | wc -l)
|
|
|
|
|
|
|
|
hook_com[misc]+=" %F{$DEFAULT_COLOR}⍟${stashes}%f"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function +vi-vcs-detect-changes() {
|
|
|
|
function +vi-vcs-detect-changes() {
|
|
|
|
if [[ -n ${hook_com[staged]} ]] || [[ -n ${hook_com[unstaged]} ]]; then
|
|
|
|
if [[ -n ${hook_com[staged]} ]] || [[ -n ${hook_com[unstaged]} ]]; then
|
|
|
|
VCS_WORKDIR_DIRTY=true
|
|
|
|
VCS_WORKDIR_DIRTY=true
|
|
|
|