Merge pull request #1400 from tresni/patch-2

Updated svn.plugin.zsh to behave more like lib/git.zsh

plugins/svn/svn.plugin.zsh

 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