X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/8d4a98e19ec40334ed8e8f2ce4e5a9f094bdbcaf..HEAD:/etc/zsh/functions/Prompts/prompt_arrows_setup

diff --git a/etc/zsh/functions/Prompts/prompt_arrows_setup b/etc/zsh/functions/Prompts/prompt_arrows_setup
index 64590b2..9c59b8f 100644
--- a/etc/zsh/functions/Prompts/prompt_arrows_setup
+++ b/etc/zsh/functions/Prompts/prompt_arrows_setup
@@ -1,3 +1,5 @@
+#!/bin/zsh
+
 prompt_arrows_help() {
     cat << EOF
 prompt arrows <right|2line> <normal> <prompt> <ssh> <urgent> <comment> <dir> <unwritable>
@@ -66,17 +68,24 @@ function prompt_arrows_setup() {
             PROMPT="%F{$c}>>> $hist"
             ;;
         *)
-            echo "Unknown prompt mode $m"
+            echo -E "Unknown prompt mode $m"
             return
             ;;
     }
-    PROMPT="$PROMPT%(1j,%F{$c}%j,)$vicol%#%F{$p}%n%F{$n}@%F{$p}%2m%(?..%F{$n}/%F{$r}\$?)%F{$n}: "
+    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}*"
+    zstyle ':vcs_info:git*' unstagedstr "%F{$r}!"
 
     # add-zsh-hook should have already been autoloaded by promptinit
     add-zsh-hook precmd prompt_arrows_precmd
@@ -107,5 +116,8 @@ function prompt_arrows_preview {
   fi
 }
 
+function +vi-prompt_arrows_revertfix() {
+    [[ -f "$gitdir/REVERT_HEAD" ]] && hook_com[action]=revert
+}
+
 prompt_arrows_setup "$@"
-# vim: set et fenc=utf-8 ft=zsh sts=4 sw=4 ts=8 tw=0 :