Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Issue with vcs_info and zsh 4.3.14

Frank Terbeck wrote:
> +    if [[ "$a $b" == *E155007* ]] \
> +        || [[ "$a $b" == *'is not a working copy'* ]]

So... long time, no mail about this.

I've discussed this a little more with Daniel on IRC. And it turns out,
there would be more than one error to check for here.

And I'm not going to do that. Instead, I want to check for the return
code of calling "svn info" and bail out if that's non-zero.

I wanted to do that with `$pipestatus[]', but I've stumbled across a
rather severe issue with that (see workers-29973 for details). So, in
the meantime, I'll commit patch included below. It contains the code I
really want to use (commented out) and a clumsier approach using a
temporary array `$dat[]'. As soon as the `pipestatus' issue is resolved,
I'll be removing the workaround. But I'd like to get an svn-1.7 enabled
vcs_info going.

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..41cc3e7 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
@@ -6,12 +6,28 @@
 setopt localoptions noksharrays extendedglob NO_shwordsplit
 local svnbase svnbranch a b rrn
+local -i rc
 local -A svninfo parentinfo
 local -xA hook_com
-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
+# Unfortunately, `$pipestatus' is broken currently. Until that problem is
+# resolved, here is a workaround that will get things done, without using it.
+# Clumsily, but that's life.
+local -a dat
+dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
+(( rc != 0 )) && return 1
+# The following line is the real code, the following is the workaround.
+#${vcs_comm[cmd]} info --non-interactive \
+print -l "${dat[@]}" \
+|& while IFS=: read a b; do
+    svninfo[${a// /_}]="${b## #}"
+#(( rc != 0 )) && return 1
 while [[ -d "${svnbase}/../.svn" ]]; do
     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done

Messages sorted by: Reverse Date, Date, Thread, Author