From: sev <git@sev.monster>
Date: Tue, 25 Jul 2023 07:43:09 +0000 (-0500)
Subject: zsh vcs: reformat; add hash, revert action, patch
X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/5326b23ac21b7aa874f2f2f264a935f88009ef6c

zsh vcs: reformat; add hash, revert action, patch
---

diff --git a/etc/zsh/functions/Prompts/prompt_arrows_setup b/etc/zsh/functions/Prompts/prompt_arrows_setup
index 7100420..f0bcfea 100644
--- a/etc/zsh/functions/Prompts/prompt_arrows_setup
+++ b/etc/zsh/functions/Prompts/prompt_arrows_setup
@@ -75,8 +75,15 @@ function prompt_arrows_setup() {
     PROMPT="$PROMPT%(1j,%F{$c}%j,)$vicol%#%F{$p}%n%F{$n}@%F{$p}%2m%(?..%F{$n}/%F{$r}\$?)%F{$n}: "
     POSTEDIT="$(print -P "%F{$n}%f")"
     autoload -Uz vcs_info
-    zstyle ':vcs_info:git*' formats "%c%u%%F{$p}%r/%b%%F{$n}/%%F{$d}%S%%f"
-    zstyle ':vcs_info:git*' actionformats "%%F{$r}(%a)%f %c%u%%F{$p}%r/%b%f/%%F{$d}%S%f"
+    zstyle ':vcs_info:git*' get-revision true
+    local gitformat="%c%u%F{$p}%r%F{$n} %F{$c}%7.7i%F{$n}:%F{$p}%b%F{$n} %F{$d}%S%f"
+    zstyle ':vcs_info:git*' formats $gitformat
+    zstyle ':vcs_info:git*' get-unapplied true
+    local patchformat=' %n/%a'
+    zstyle ':vcs_info:git*' patch-format $patchformat
+    zstyle ':vcs_info:git*' nopatch-format $patchformat
+    zstyle ':vcs_info:git*+post-backend:*' hooks prompt_arrows_revertfix
+    zstyle ':vcs_info:git*' actionformats "%F{$r}(%a%m)%f $gitformat"
     zstyle ':vcs_info:git*' stagedstr   "%F{$c}+"
     zstyle ':vcs_info:git*' unstagedstr "%F{$r}!"
 
@@ -109,4 +116,8 @@ function prompt_arrows_preview {
   fi
 }
 
+function +vi-prompt_arrows_revertfix() {
+    [[ -f "$gitdir/REVERT_HEAD" ]] && hook_com[action]=revert
+}
+
 prompt_arrows_setup "$@"