diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-01 11:39:21 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-01 11:39:21 -0800 |
| commit | 08efdcdd16bc825357dbc5a50b8d3ee762cc3508 (patch) | |
| tree | f7882ed31bb66110011ae2f4ba01133eef25a4fe /plugins/svn | |
| parent | 66e784c8c1ae66192c11780b047c7be66194032a (diff) | |
| parent | 1b768a3b407103cd77d21d856051183960e0349e (diff) | |
| download | zsh-08efdcdd16bc825357dbc5a50b8d3ee762cc3508.tar.gz zsh-08efdcdd16bc825357dbc5a50b8d3ee762cc3508.tar.bz2 zsh-08efdcdd16bc825357dbc5a50b8d3ee762cc3508.zip | |
Merge pull request #1400 from tresni/patch-2
Updated svn.plugin.zsh to behave more like lib/git.zsh
Diffstat (limited to 'plugins/svn')
| -rw-r--r-- | plugins/svn/svn.plugin.zsh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index bd2767e3e..7ae3897af 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 |