X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/b3f79d5a2e1671358a5972d9529316be43c55281..3fd2b57032d16352728d2b87b59af568da40df9d:/.zsh/zshrc/60_vcsprompt diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 4cc18a3..b5c15f1 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -5,7 +5,7 @@ # Copyright © 1994–2008 martin f. krafft # 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)"}) + 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 @@ -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: - _D="${GIT_DIR/$HOME/~}" + local _D="${GIT_DIR/$HOME/~}" set -- "$_D" "$2" "${${1#$_D}%/}" - unset _D fi ;; hg) @@ -179,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 @@ -196,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