zshrc: add more git stash aliases

[dotfiles.git] / 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 0e084133f227092f96a81988f7bad15eaf4f81ba..991332dd7df9138c3f036c725e7000fb18909727 100644 (file)
--- a/etc/zsh/functions/Prompts/prompt_arrows_setup
+++ b/etc/zsh/functions/Prompts/prompt_arrows_setup
@@ -68,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
@@ -98,15 +105,19 @@ function prompt_arrows_precmd {
 }
 
 function prompt_arrows_preview {
-  if (( ! $#* )); then
-    prompt_preview_theme arrows 2line
-    print '\n'
-    prompt_preview_theme arrows right
-    print
-  else
-    prompt_preview_theme arrows "$@"
-    print
-  fi
+    if (( ! $#* )) {
+        prompt_preview_theme arrows 2line
+        print '\n'
+        prompt_preview_theme arrows right
+        print
+    } else {
+        prompt_preview_theme arrows "$@"
+        print
+    }
+}
+
+function +vi-prompt_arrows_revertfix() {
+    [[ -f "$gitdir/REVERT_HEAD" ]] && hook_com[action]=revert
 }
 
 prompt_arrows_setup "$@"