diff options
| author | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
|---|---|---|
| committer | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
| commit | 2b55ee07534ec34a699805dc35ca83ad8e22fc7a (patch) | |
| tree | 97f464ca865626aea1aa135e7eb9f629f4017171 /plugins/svn | |
| parent | f71647fa85267d558d0d69034902f53aeeed67ad (diff) | |
| parent | 762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff) | |
| download | zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.gz zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.bz2 zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.zip | |
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/svn')
| -rw-r--r-- | plugins/svn/svn.plugin.zsh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index 45d461306..53a8a513a 100644 --- a/plugins/svn/svn.plugin.zsh +++ b/plugins/svn/svn.plugin.zsh @@ -1,5 +1,5 @@ function svn_prompt_info { - if [[ -d .svn ]]; then + if [ in_svn ]; then 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" fi @@ -13,7 +13,7 @@ function in_svn() { } function svn_get_repo_name { - if [ is_svn ]; then + if [ in_svn ]; then svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//" @@ -21,14 +21,14 @@ function svn_get_repo_name { } function svn_get_rev_nr { - if [ is_svn ]; then + if [ in_svn ]; then svn info 2> /dev/null | sed -n s/Revision:\ //p fi } function svn_dirty_choose { - if [ is_svn ]; then - s=$(svn status 2>/dev/null) + if [ in_svn ]; then + s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null) if [ $s ]; then echo $1 else @@ -39,4 +39,4 @@ function svn_dirty_choose { function svn_dirty { svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN -}
\ No newline at end of file +} |