X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/ad7c4bae9781483a15c2a11c9db247edf7c3c365..1c5183b398c7cd9b0456157f615553bb095385b4:/.zsh/zshrc/60_vcsprompt?ds=inline

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 9fa0f44..d12f686 100644
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -5,7 +5,7 @@
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-# Source repository: http://git.madduck.net/v/etc/zsh.git
+# Source repository: git://git.madduck.net/etc/zsh.git
 #
 # Shamelessly based on http://glandium.org/blog/?p=170
 #
@@ -32,6 +32,21 @@ __git_get_branch()
   echo "${ref#refs/heads/}"
 }
 
+__git_print_preprompt()
+{
+  local output
+  output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo changes on filesystem:
+    print "${${(F)output[1,-2]}//\.\.\./…}"
+  fi
+  output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo cached/staged changes:
+    print "${${(F)output[1,-2]}//\.\.\./…}"
+  fi
+}
+
 __hg_get_reporoot()
 {
   hg root
@@ -85,7 +100,7 @@ __vcs_get_prompt_path_components()
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then
-    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<..<%~%<<}"
+    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<…<%~%<<}"
     echo "$pwdnamed"
     return
   fi
@@ -123,7 +138,7 @@ __vcs_get_prompt_path_components()
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen
-  prefix="${(%):-%${prelen}<..<%-${precomps}~%<<}"
+  prefix="${(%):-%${prelen}<…<%-${precomps}~%<<}"
 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }
@@ -167,7 +182,7 @@ __vcs_set_prompt_variables()
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
-      local p="%${MAXLEN}<..<%~%<<"
+      local p="%${MAXLEN}<…<%~%<<"
       #TODO find a better way so we don't have to nuke $psvar, but since the
       #     %(nv.true.false) check for prompts checks element count, not
       #     content, that's all we get for now
@@ -178,6 +193,18 @@ __vcs_set_prompt_variables()
   psvar[1,3]=($1 $2 $3)
 }
 
+__vcs_print_preprompt()
+{
+  local reporoot
+  repotype="${1:-$(__vcs_get_repo_type)}"
+
+  case "$repotype" in
+    git)
+      __git_print_preprompt
+      ;;
+  esac
+}
+
 if ! is_root; then
   # too dangerous to be run as root
 
@@ -195,6 +222,11 @@ if ! is_root; then
   }
   chpwd_functions+=_update_vcs_prompt_vars
 
+  _print_preprompt() {
+    [[ $? -eq 0 ]] && __vcs_print_preprompt
+  }
+  precmd_functions+=_print_preprompt
+
   # call it once
   _update_vcs_prompt_vars
 fi