]> git.madduck.net Git - etc/zsh.git/blobdiff - .zsh/zshrc/60_vcsprompt

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

limit fonts
[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt
index 4cc18a3fd6feb72d174044579ad73d6999c7ccf7..d8fdaeacdd05c4c2a3178e66d614244a77941c47 100644 (file)
@@ -32,6 +32,21 @@ __git_get_branch()
   echo "${ref#refs/heads/}"
 }
 
   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
 __hg_get_reporoot()
 {
   hg root
@@ -144,9 +159,8 @@ __vcs_set_prompt_variables()
       if [ -d "$GIT_DIR" ]; then
         # poor man's replace until I find out how to do named dirs properly
         # here:
       if [ -d "$GIT_DIR" ]; then
         # poor man's replace until I find out how to do named dirs properly
         # here:
-        _D="${GIT_DIR/$HOME/~}"
+        local _D="${GIT_DIR/$HOME/~}"
         set -- "$_D" "$2" "${${1#$_D}%/}"
         set -- "$_D" "$2" "${${1#$_D}%/}"
-        unset _D
       fi
       ;;
     hg)
       fi
       ;;
     hg)
@@ -179,6 +193,18 @@ __vcs_set_prompt_variables()
   psvar[1,3]=($1 $2 $3)
 }
 
   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
 
 if ! is_root; then
   # too dangerous to be run as root
 
@@ -196,6 +222,11 @@ if ! is_root; then
   }
   chpwd_functions+=_update_vcs_prompt_vars
 
   }
   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
   # call it once
   _update_vcs_prompt_vars
 fi