Update svn plugin to offer more; much like git.

This commit is contained in:
Ali Karbassi 2011-12-09 02:25:29 -06:00
commit 99ce1572c7

View file

@ -1,7 +1,7 @@
function svn_prompt_info { function svn_prompt_info {
if [ $(in_svn) ]; then if [ $(in_svn) ]; then
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\ echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR" $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_REV_NR$(svn_get_rev_nr)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
fi fi
} }
@ -15,7 +15,7 @@ function in_svn() {
function svn_get_repo_name { function svn_get_repo_name {
if [ $(in_svn) ]; then if [ $(in_svn) ]; then
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//" svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
fi fi
} }
@ -29,9 +29,9 @@ function svn_get_rev_nr {
function svn_dirty_choose { function svn_dirty_choose {
if [ $(in_svn) ]; then if [ $(in_svn) ]; then
s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null) s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
if [ $s ]; then if [ $s ]; then
echo $1 echo $1
else else
echo $2 echo $2
fi fi
fi fi
@ -40,3 +40,32 @@ function svn_dirty_choose {
function svn_dirty { function svn_dirty {
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
} }
svn_prompt_status() {
INDEX=$(svn status 2> /dev/null)
STATUS=""
if $(echo "$INDEX" | grep '^? ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_UNTRACKED$STATUS"
fi
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_ADDED$STATUS"
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_ADDED$STATUS"
fi
if $(echo "$INDEX" | grep '^M ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_MODIFIED$STATUS"
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_MODIFIED$STATUS"
fi
if $(echo "$INDEX" | grep '^C ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_CONFLICTED$STATUS"
elif $(echo "$INDEX" | grep '^AC ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_CONFLICTED$STATUS"
fi
if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_DELETED$STATUS"
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
STATUS="$ZSH_THEME_SVN_PROMPT_DELETED$STATUS"
fi
echo $STATUS
}