summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Hartvigsen <brian.andrew@brianandjenny.com>2012-11-08 13:48:43 -0700
committerBrian Hartvigsen <brian.andrew@brianandjenny.com>2012-11-08 13:48:43 -0700
commit1b768a3b407103cd77d21d856051183960e0349e (patch)
treeb15cda303892b0f788db169809457214ea7e6b78
parentc2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9 (diff)
downloadzsh-1b768a3b407103cd77d21d856051183960e0349e.tar.gz
zsh-1b768a3b407103cd77d21d856051183960e0349e.tar.bz2
zsh-1b768a3b407103cd77d21d856051183960e0349e.zip
Update plugins/svn/svn.plugin.zsh
Behave more like lib/git.zsh. Set `SVN_SHOW_BRANCH="true"` to display branch/tag or trunk instead of just repo name. Falls back to repo name if branch information is not available. Idea and awk call from revans/bash-it/themes/base.theme.bash
-rw-r--r--plugins/svn/svn.plugin.zsh19
1 files changed, 18 insertions, 1 deletions
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 4d5bfb8dd..bb46a7d0d 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,7 +1,14 @@
function svn_prompt_info {
if [ $(in_svn) ]; then
+ if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+ unset SVN_SHOW_BRANCH
+ _DISPLAY=$(svn_get_branch_name)
+ else
+ _DISPLAY=$(svn_get_repo_name)
+ fi
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$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+ unset _DISPLAY
fi
}
@@ -20,6 +27,16 @@ function svn_get_repo_name {
fi
}
+function svn_get_branch_name {
+ _DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
+ if [ "x$_DISPLAY" = "x" ]; then
+ svn_get_repo_name
+ else
+ echo $_DISPLAY
+ fi
+ unset _DISPLAY
+}
+
function svn_get_rev_nr {
if [ $(in_svn) ]; then
svn info 2> /dev/null | sed -n s/Revision:\ //p