dee8171fa9494d1aa6c01cb86de1b70b480ee5c4

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #494 from EspadaV8/master

Fixed an issue where the SVN plugin would mark a folder as being dirty when there was an svn:external set.

Diff

 1diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
 2index 86050227d8054cf3e11a1aecc3d925dcb38a3d2d..53a8a513adcc8adfd9b46889501057977dc31458 100644
 3--- a/plugins/svn/svn.plugin.zsh
 4+++ b/plugins/svn/svn.plugin.zsh
 5@@ -1,5 +1,5 @@
 6 function svn_prompt_info {
 7-    if [[ -d .svn ]]; then
 8+    if [ in_svn ]; then
 9         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
10 $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"
11     fi
12@@ -28,7 +28,7 @@ function svn_get_rev_nr {
13 
14 function svn_dirty_choose {
15     if [ in_svn ]; then
16-        s=$(svn status 2>/dev/null)
17+        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
18         if [ $s ]; then 
19             echo $1
20         else