krd/dotfiles
1
0
Fork 0
Code

zsh: git prompt

Browse Source
This commit is contained in:
Konstantin Demin 2024-01-20 13:53:58 +03:00
parent ad4acd935a
commit d5209414e9
Signed by: krd
GPG Key ID: 1F33CB0BA4731BC6
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.config/zsh/lib/git.zsh
View File

@ -4,6 +4,8 @@
typeset -gA ZSHU_GIT ZSHU_PM ZSHU_PS typeset -gA ZSHU_GIT ZSHU_PM ZSHU_PS
ZSHU_PS[git]=0 ZSHU_PS[git]=0
ZSHU_PM[git_branch]='🞷' ZSHU_PM[git_branch]='🞷'
ZSHU_PM[git_ahead]='↱'
ZSHU_PM[git_behind]='↴'
ZSHU_PM[git_detach]='☈' ZSHU_PM[git_detach]='☈'
ZSHU_PM[git_tag]='🗹' ZSHU_PM[git_tag]='🗹'
ZSHU_PM[git_commit]='⌽' ZSHU_PM[git_commit]='⌽'
@ -29,9 +31,10 @@ z-git-test() {
__z_git_pwd() { __z_git_pwd() {
local x local x
unset 'ZSHU_PS[git_ref]' 'ZSHU_PS[git_tag]' unset 'ZSHU_PS[git_ref]' 'ZSHU_PS[git_changes]' 'ZSHU_PS[git_tag]'
unset 'ZSHU_GIT[path_root]' 'ZSHU_GIT[path_mid]' 'ZSHU_GIT[path_last]' unset 'ZSHU_GIT[path_root]' 'ZSHU_GIT[path_mid]' 'ZSHU_GIT[path_last]'
unset 'ZSHU_GIT[commit]' 'ZSHU_GIT[detached]' 'ZSHU_GIT[ref]' 'ZSHU_GIT[tag]' unset 'ZSHU_GIT[commit]' 'ZSHU_GIT[detached]' 'ZSHU_GIT[ref]' 'ZSHU_GIT[remote]' 'ZSHU_GIT[tag]'
unset 'ZSHU_GIT[ref_behind]' 'ZSHU_GIT[ref_ahead]' 'ZSHU_GIT[ref_changes]'
z-git-test || return z-git-test || return
@ -50,10 +53,10 @@ __z_git_pwd() {
break break
fi fi
x=$(__z_git for-each-ref --format='%(refname)' --count=1 --points-at=${ZSHU_GIT[commit]} refs/heads/ refs/remotes/) x=$(__z_git for-each-ref --format='%(refname:short)' --count=1 --points-at=${ZSHU_GIT[commit]} refs/heads/ refs/remotes/)
if [ -n "$x" ] ; then if [ -n "$x" ] ; then
ZSHU_GIT[detached]=0 ZSHU_GIT[detached]=0
ZSHU_GIT[ref]=${x#refs/*/} ZSHU_GIT[ref]=$x
ZSHU_PS[git_ref]="%F{yellow}%B${ZSHU_PM[git_branch]}%b ${ZSHU_GIT[ref]}%f" ZSHU_PS[git_ref]="%F{yellow}%B${ZSHU_PM[git_branch]}%b ${ZSHU_GIT[ref]}%f"
break break
fi fi
@ -64,6 +67,26 @@ __z_git_pwd() {
break break
done done
## local<->remote changes
while [ ${ZSHU_GIT[detached]} = 0 ] ; do
x=$(__z_git for-each-ref --format='%(upstream:short)' --count=1 --points-at=${ZSHU_GIT[commit]} refs/heads/ refs/remotes/)
[ -n "$x" ] || break
ZSHU_GIT[remote]=$x
x=$(__z_git rev-list --left-right "${ZSHU_GIT[ref]}...${ZSHU_GIT[remote]}" 2>/dev/null) || break
ZSHU_GIT[ref_ahead]=$(echo "$x" | grep -Ec '^<')
ZSHU_GIT[ref_behind]=$(echo "$x" | grep -Ec '^>')
ZSHU_GIT[ref_changes]=$[ ZSHU_GIT[ref_ahead] + ZSHU_GIT[ref_behind] ]
[ ${ZSHU_GIT[ref_changes]} -eq 0 ] && break
x=''
[ ${ZSHU_GIT[ref_ahead]} -eq 0 ] || x="$x${x:+ }%B%F{green}${ZSHU_PM[git_ahead]} ${ZSHU_GIT[ref_ahead]}%b"
[ ${ZSHU_GIT[ref_behind]} -eq 0 ] || x="$x${x:+ }%B%F{red}${ZSHU_PM[git_behind]} ${ZSHU_GIT[ref_behind]}%b"
ZSHU_PS[git_changes]=$x
break
done
## git tag ## git tag
while [ ${ZSHU_GIT[detached]} = 1 ] ; do while [ ${ZSHU_GIT[detached]} = 1 ] ; do
x=$(__z_git_desc_tag --exact-match HEAD 2>/dev/null) x=$(__z_git_desc_tag --exact-match HEAD 2>/dev/null)
@ -112,8 +135,12 @@ __z_git_pwd() {
x="$x%B${ZSHU_GIT[path_last]:gs/%/%%}%f%b" x="$x%B${ZSHU_GIT[path_last]:gs/%/%%}%f%b"
ZSHU_PS[pwd]=$x ZSHU_PS[pwd]=$x
x="${ZSHU_PS[git_tag]}" local -a ary
ZSHU_PS[pwd_extra]=" ${ZSHU_PS[git_ref]}${x:+ }$x" ary+="${ZSHU_PS[git_ref]}"
ary+="${ZSHU_PS[git_changes]}"
ary+="${ZSHU_PS[git_tag]}"
x="${(j: :)ary}"
[ -z "$x" ] || ZSHU_PS[pwd_extra]=" $x"
} }
z-git-enable() { ZSHU_PS[git]=1 ; } z-git-enable() { ZSHU_PS[git]=1 ; }