]> 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:

print diffstat to console when there are changes
[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt
index d72e205eb3589e12cf84b95fae03715afdc32353..22b6e5154cd4918205b37470c319cfed9ecf9577 100644 (file)
@@ -70,6 +70,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
@@ -143,10 +144,21 @@ __vcs_set_prompt_variables()
       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}%/}"
-        unset _D
       fi
+
+      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
+      unset output
       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||