X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/a3f38e1367c69471eae7cff2247821ee9945c814..04eacb4f6e103269d75c2908a5e754acbcc28834:/.zsh/zshrc/60_vcsprompt?ds=sidebyside diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 744f649..22b6e51 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -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 @@ -140,9 +141,24 @@ __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") - # poor man's replace until I find out how to do named dirs properly - # here: - [ -d "$GIT_DIR" ] && set -- "${GIT_DIR/$HOME/~}" "$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 + + 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)" ||