From 0b0e95e88c1dbd6a9f16300ae03f725e37b6369b Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Jul 2011 00:25:27 +0200 Subject: Preparing placing home-directory in repo --- .zsh/functions/chpwd_show_todo | 7 +++++++ .zsh/functions/chpwd_update_git_vars | 2 ++ .zsh/functions/precmd_update_git_vars | 6 ++++++ .zsh/functions/preexec_update_git_vars | 6 ++++++ .zsh/functions/prompt_git_info | 23 +++++++++++++++++++++++ .zsh/functions/update_current_git_vars | 30 ++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+) create mode 100644 .zsh/functions/chpwd_show_todo create mode 100755 .zsh/functions/chpwd_update_git_vars create mode 100755 .zsh/functions/precmd_update_git_vars create mode 100755 .zsh/functions/preexec_update_git_vars create mode 100755 .zsh/functions/prompt_git_info create mode 100755 .zsh/functions/update_current_git_vars (limited to '.zsh/functions') diff --git a/.zsh/functions/chpwd_show_todo b/.zsh/functions/chpwd_show_todo new file mode 100644 index 0000000..88ee853 --- /dev/null +++ b/.zsh/functions/chpwd_show_todo @@ -0,0 +1,7 @@ +# -*- mode: Shell-script -*- + +if [ -e ".toudou" ]; then + toudou +elif [ "$PWD" = "$HOME" ]; then + toudou list -g +fi diff --git a/.zsh/functions/chpwd_update_git_vars b/.zsh/functions/chpwd_update_git_vars new file mode 100755 index 0000000..0ef846a --- /dev/null +++ b/.zsh/functions/chpwd_update_git_vars @@ -0,0 +1,2 @@ +# -*- mode: shell-script -*- +update_current_git_vars diff --git a/.zsh/functions/precmd_update_git_vars b/.zsh/functions/precmd_update_git_vars new file mode 100755 index 0000000..172456a --- /dev/null +++ b/.zsh/functions/precmd_update_git_vars @@ -0,0 +1,6 @@ +# -*- mode: shell-script -*- + +if [ -n "$__EXECUTED_GIT_COMMAND" ]; then + update_current_git_vars + unset __EXECUTED_GIT_COMMAND +fi diff --git a/.zsh/functions/preexec_update_git_vars b/.zsh/functions/preexec_update_git_vars new file mode 100755 index 0000000..9d229a9 --- /dev/null +++ b/.zsh/functions/preexec_update_git_vars @@ -0,0 +1,6 @@ +# -*- mode: shell-script -*- +case "$1" in + git*) + __EXECUTED_GIT_COMMAND=1 + ;; +esac diff --git a/.zsh/functions/prompt_git_info b/.zsh/functions/prompt_git_info new file mode 100755 index 0000000..76d889a --- /dev/null +++ b/.zsh/functions/prompt_git_info @@ -0,0 +1,23 @@ +# -*- mode: shell-script -*- + +if [ -n "$__CURRENT_GIT_BRANCH" ]; then + local s="(" + s+="$__CURRENT_GIT_BRANCH" + case "$__CURRENT_GIT_BRANCH_STATUS" in + ahead) + s+="↑" + ;; + diverged) + s+="↕" + ;; + behind) + s+="↓" + ;; + esac + if [ -n "$__CURRENT_GIT_BRANCH_IS_DIRTY" ]; then + s+="⚡" + fi + s+=")" + + printf " %s%s" "%{${fg[yellow]}%}" $s +fi diff --git a/.zsh/functions/update_current_git_vars b/.zsh/functions/update_current_git_vars new file mode 100755 index 0000000..71f37e7 --- /dev/null +++ b/.zsh/functions/update_current_git_vars @@ -0,0 +1,30 @@ +# -*- mode: Shell-script -*- +unset __CURRENT_GIT_BRANCH +unset __CURRENT_GIT_BRANCH_STATUS +unset __CURRENT_GIT_BRANCH_IS_DIRTY + +local st="$(git status 2>/dev/null)" +if [[ -n "$st" ]]; then + local -a arr + arr=(${(f)st}) + + if [[ $arr[1] =~ 'Not currently on any branch.' ]]; then + __CURRENT_GIT_BRANCH='no-branch' + else + __CURRENT_GIT_BRANCH="${arr[1][(w)4]}" + fi + + if [[ $arr[2] =~ 'Your branch is' ]]; then + if [[ $arr[2] =~ 'ahead' ]]; then + __CURRENT_GIT_BRANCH_STATUS='ahead' + elif [[ $arr[2] =~ 'devirged' ]]; then + __CURRENT_GIT_BRANCH_STATUS='diverged' + else + __CURRENT_GIT_BRANCH_STATUS='behind' + fi + fi + + if [[ ! $st =~ 'nothing to commit' ]]; then + __CURRENT_GIT_BRANCH_IS_DIRTY='1' + fi +fi -- cgit v1.2.3-54-g00ecf