X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/ad7c4bae9781483a15c2a11c9db247edf7c3c365..e1a6e3db0b8e15f9fd576341642acfebe0f13b68:/.zsh/zshrc/60_vcsprompt diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 9fa0f44..237f6c0 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 2>/dev/null)"}) + if [[ ${#output} -gt 1 ]]; then + echo changes on filesystem: + print "${(F)output[1,-2]}" + fi + output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"}) + if [[ ${#output} -gt 1 ]]; then + echo cached/staged changes: + print "${(F)output[1,-2]}" + fi +} + __hg_get_reporoot() { hg root @@ -178,7 +193,19 @@ __vcs_set_prompt_variables() psvar[1,3]=($1 $2 $3) } -if ! is_root; then +__vcs_print_preprompt() +{ + local reporoot + repotype="${1:-$(__vcs_get_repo_type)}" + + case "$repotype" in + git) + __git_print_preprompt + ;; + esac +} + +if false && ! is_root; then # too dangerous to be run as root _update_vcs_prompt_vars_if_vcs_ran() { @@ -195,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