zsh/rc: Also display staged/unstaged changes in actionformats.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 3db835308e47d919cdbacc722de3f8f1504086cf..caa9c5f2f28e78f42ed2690467264ca1695aff94 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -138,7 +138,7 @@ local default="%{${fg[default]}%}"
 # The prompt is in green and blue to make easily detectable, the error exit
 # code in red and bold and the job count in yellow.
 PROMPT="$green%B%m%b$default:$blue%B%~%b$default \
-%(1j.$yellow%j$default.)%(2L.+.)%# \
+%(1j.$yellow%j$default.)%# \
 %(?..($red%B%?%b$default%) )"
 
 # VCS_Info was added in 4.3.9 but it works in earlier versions too. So load it
@@ -154,20 +154,33 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     fi
 
     # Allow substitutions and expansions in the prompt, necessary for
-    # VCS_info.
+    # VCS_Info.
     setopt promptsubst
-    # Load VCS_info to display information about version control repositories.
+    # Load VCS_Info to display information about version control repositories.
     autoload -Uz vcs_info
     # Only look for git and mercurial repositories; the only I use.
     zstyle ':vcs_info:*' enable git hg
-    # Set style of VCS_info display. The current branch (green) and VCS (blue)
+    # Check the repository for changes so they can be used in %u/%c (see
+    # below). This comes with a speed penalty for bigger repositories.
+    zstyle ':vcs_info:*' check-for-changes true
+
+    # Set style of VCS_Info display. The current branch (green) and VCS (blue)
     # is displayed. If there is an special action going on (merge, rebase)
-    # it's also displayed (red).
+    # it's also displayed (red). Also display if there are unstaged or staged
+    # (%u/%c) changes.
     zstyle ':vcs_info:*' formats \
-        "($green%b$default:$blue%s$default)"
+        "($green%b%u%c$default:$blue%s$default)"
     zstyle ':vcs_info:*' actionformats \
-        "($green%b$default/$red%a$default:$blue%s$default)"
-    # Call VCS_info as precmd before every prompt.
+        "($green%b%u%c$default/$red%a$default:$blue%s$default)"
+    # Set style for formats/actionformats when unstaged (%u) and staged (%c)
+    # changes are detected in the repository; check-for-changes must be set to
+    # true for this to work. Thanks to Bart Trojanowski
+    # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt) for the idea
+    # (2010-03-11 00:20).
+    zstyle ':vcs_info:*' unstagedstr '¹'
+    zstyle ':vcs_info:*' stagedstr   '²'
+
+    # Call VCS_Info as precmd before every prompt.
     prompt_precmd() {
         vcs_info
     }