From 9b63a03bcfb7a6c34281d7d905575c5647e9c8d2 Mon Sep 17 00:00:00 2001
From: Matt Doran <matt.doran@papercut.com>
Date: Sat, 4 Jun 2011 00:32:05 +1000
Subject: Fix typos in the svn plugin that would cause calls to 'svn' when not
 in an svn working copy.

---
 plugins/svn/svn.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/svn/svn.plugin.zsh')

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 45d461306..86050227d 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -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,13 +21,13 @@ 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
+    if [ in_svn ]; then
         s=$(svn status 2>/dev/null)
         if [ $s ]; then 
             echo $1
@@ -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
+}
-- 
cgit v1.2.3-70-g09d2


From 3cb33fc254290a848a602af634cfa26179d630e5 Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 25 Jul 2011 09:46:17 +1000
Subject: Replace a duplicated test to see if we're in an SVN folder with a
 call to the 'in_svn' function.

---
 plugins/svn/svn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/svn/svn.plugin.zsh')

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 86050227d..77de27481 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
-- 
cgit v1.2.3-70-g09d2


From 7b25a3fca90e31f2c272fd8d2ef1dfa3e61dc9e4 Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 25 Jul 2011 09:50:54 +1000
Subject: The original SVN pluging would mark a folder as dirty if there was an
 svn:external set and the output of 'svn status' returned the check for the
 external. E.g.

$ svn st
X       Application

Performing status on external item at 'Application'

Shouldn't be marked as being dirty. By grepping for only the valid
output for what should be class as dirty, it won't return false
positives.
---
 plugins/svn/svn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/svn/svn.plugin.zsh')

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 77de27481..53a8a513a 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -28,7 +28,7 @@ function svn_get_rev_nr {
 
 function svn_dirty_choose {
     if [ in_svn ]; then
-        s=$(svn status 2>/dev/null)
+        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
         if [ $s ]; then 
             echo $1
         else 
-- 
cgit v1.2.3-70-g09d2