adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update plugins/svn/svn.plugin.zsh

Browse Source 
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
This commit is contained in:
Brian Hartvigsen 2012-11-08 13:48:43 -07:00
parent c2ae9e09ca
commit 1b768a3b40
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/svn/svn.plugin.zsh
View File

@ -1,7 +1,14 @@
function svn_prompt_info { function svn_prompt_info {
if [ $(in_svn) ]; then 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\ 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 fi
} }
@ -20,6 +27,16 @@ function svn_get_repo_name {
fi 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 { function svn_get_rev_nr {
if [ $(in_svn) ]; then if [ $(in_svn) ]; then
svn info 2> /dev/null | sed -n s/Revision:\ //p svn info 2> /dev/null | sed -n s/Revision:\ //p