X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/61f315793f3fcd7d22456d2a0057efbf88191fda..ef537759f34970b745d9a36fa30d4cec8ade2482:/.zsh/zshrc/60_vcsprompt

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index f9c440b..a23aab5 100644
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -32,6 +32,21 @@ __git_get_branch()
   echo "${ref#refs/heads/}"
 }
 
+__git_print_preprompt()
+{
+  local output
+  output=(${(f):-"$(git diff --stat --relative)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo changes on filesystem:
+    print "${(F)output[1,-2]}"
+  fi
+  output=(${(f):-"$(git diff --cached --stat --relative)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo cached/staged changes:
+    print "${(F)output[1,-2]}"
+  fi
+}
+
 __hg_get_reporoot()
 {
   hg root
@@ -70,6 +85,7 @@ __vcs_get_repo_type()
   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break
+    [ -d "$GIT_DIR" ] && echo git && break
     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break
     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break
@@ -140,7 +156,12 @@ __vcs_set_prompt_variables()
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }
       eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
-      [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1"
+      if [ -d "$GIT_DIR" ]; then
+        # poor man's replace until I find out how to do named dirs properly
+        # here:
+        local _D="${GIT_DIR/$HOME/~}"
+        set -- "$_D" "$2" "${${1#$_D}%/}"
+      fi
       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||
@@ -172,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
 
@@ -189,6 +222,12 @@ if ! is_root; then
   }
   chpwd_functions+=_update_vcs_prompt_vars
 
+  _print_preprompt() {
+    [[ $? -eq 0 ]] && __vcs_print_preprompt
+  }
+  chpwd_functions+=_print_preprompt
+  precmd_functions+=_print_preprompt
+
   # call it once
   _update_vcs_prompt_vars
 fi