Re: Issue with vcs_info and zsh 4.3.14

[Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>]

Pierre Schmitz wrote:
[...]
> $ vcs_info
> svn: '.' is not a working copy

I think the patch below should fix this. Could you give it a test drive?

> I also noticed that when calling VCS_INFO_get_data_svn svn complains
> about the unknown option --non-interactive.

Daniel assures me in IRC, that at least since subversion 1.6, every
sub-command supports the `--non-interactive' option. Are you on a
particularly old version of subversion where the --non-interactive
errors are coming up?

I don't think I want to put too much effort into actively supporting
anything older than subversion 1.6.

Regards, Frank


diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
index b1cb730..2b51ea7 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
@@ -11,7 +11,20 @@ local -xA hook_com
 
 svnbase=".";
 svninfo=()
-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
+${vcs_comm[cmd]} info --non-interactive \
+|& while IFS=: read a b; do
+    # SVN 1.7+ prints out stable error numbers. The one below is the "not a
+    # working copy" error code. With prior versions we have to hope the error
+    # message fits. svn1.6 should spit out something that matches the 2nd
+    # pattern.
+    if [[ "$a $b" == *E155007* ]] \
+        || [[ "$a $b" == *'is not a working copy'* ]]
+    then
+        return 1
+    fi
+    svninfo[${a// /_}]="${b## #}"
+done
+
 while [[ -d "${svnbase}/../.svn" ]]; do
     parentinfo=()
     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done