From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-31136-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 188 invoked by alias); 10 Mar 2013 12:58:00 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 31136
Received: (qmail 1328 invoked from network); 10 Mar 2013 12:57:58 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED,
	DKIM_SIGNED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,
	T_DKIM_INVALID,T_TO_NO_BRKTS_FREEMAIL autolearn=no version=3.3.2
Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.178 as permitted sender)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=x-received:from:to:subject:date:message-id:x-mailer;
        bh=0JpG3RBZA4H2yt2Hid4bRwEq4lL8pEILoC36FFUuJX0=;
        b=I113ODbfj6y3ARaQjMELGHPtPffKS3cwBWNJJUzYqftTAwVp+i7OUTXr7dy38NBrpb
         R62a+VJPu8u5mcz4a+9GFvPxby+dqIoxj07yMeJWrOtywHDpUs/nOzjZ5CjQnsO9olVx
         yCRNty/j6y2+g0JBMkiB60sqhfsoXsfXoswnOBR+BG6odYpBNxoQ7V1m9pjimcKLOh/n
         CfoA4XeOdECPodppU4rP546YHVNmAVxxyt7YOXxYalGG7DqsMcOWaznLfzGKKBkmc/Hv
         JvOtOgYyc+4wz95kzgyJ2kq6ZNwqEVCBrMLEG4jtKt5uxlu66dAXnLdvIoyQb7x9SqeP
         FktA==
X-Received: by 10.112.101.168 with SMTP id fh8mr3297659lbb.59.1362920272624;
        Sun, 10 Mar 2013 05:57:52 -0700 (PDT)
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: vcs_info: just set the parameters instead of passing over a pipe
Date: Sun, 10 Mar 2013 13:57:45 +0100
Message-Id: <1362920265-6420-1-git-send-email-mikachu@gmail.com>
X-Mailer: git-send-email 1.7.10.GIT

All VCS_INFO_* functions are for internal use only, so nobody should be affected by this.

---
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 787e763..3f643a2 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -5,10 +5,10 @@
 setopt localoptions extendedglob NO_shwordsplit
 local gitdir gitbase gitbranch gitaction gitunstaged gitstaged gitsha1
 local stgitpatch stgitunapplied
-local -xA hook_com
+local -A hook_com
 
 VCS_INFO_git_getaction () {
-    local gitaction='' gitdir=$1
+    local gitdir=$1
     local tmp
 
     for tmp in "${gitdir}/rebase-apply" \
@@ -22,7 +22,6 @@ VCS_INFO_git_getaction () {
             else
                 gitaction="am/rebase"
             fi
-            printf '%s' ${gitaction}
             return 0
         fi
     done
@@ -30,7 +29,7 @@ VCS_INFO_git_getaction () {
     for tmp in "${gitdir}/rebase-merge/interactive" \
                "${gitdir}/.dotest-merge/interactive" ; do
         if [[ -f "${tmp}" ]] ; then
-            printf '%s' "rebase-i"
+            gitaction="rebase-i"
             return 0
         fi
     done
@@ -38,18 +37,18 @@ VCS_INFO_git_getaction () {
     for tmp in "${gitdir}/rebase-merge" \
                "${gitdir}/.dotest-merge" ; do
         if [[ -d "${tmp}" ]] ; then
-            printf '%s' "rebase-m"
+            gitaction="rebase-m"
             return 0
         fi
     done
 
     if [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
-        printf '%s' "merge"
+        gitaction="merge"
         return 0
     fi
 
     if [[ -f "${gitdir}/BISECT_LOG" ]] ; then
-        printf '%s' "bisect"
+        gitaction="bisect"
         return 0
     fi
 
@@ -59,7 +58,6 @@ VCS_INFO_git_getaction () {
         else
             gitaction=cherry
         fi
-        printf '%s' ${gitaction}
         return 0
     fi
 
@@ -67,7 +65,7 @@ VCS_INFO_git_getaction () {
 }
 
 VCS_INFO_git_getbranch () {
-    local gitbranch gitdir=$1 tmp actiondir
+    local gitdir=$1 tmp actiondir
     local gitsymref="${vcs_comm[cmd]} symbolic-ref HEAD"
 
     actiondir=''
@@ -106,12 +104,11 @@ VCS_INFO_git_getbranch () {
         fi
     fi
 
-    printf '%s' "${gitbranch}"
     return 0
 }
 
 gitdir=${vcs_comm[gitdir]}
-gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
+VCS_INFO_git_getbranch ${gitdir}
 if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
     gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD)
 else
@@ -134,7 +131,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" && \
 fi
 
 VCS_INFO_adjust
-gitaction="$(VCS_INFO_git_getaction ${gitdir})"
+VCS_INFO_git_getaction ${gitdir}
 gitbase=${PWD%/${$( ${vcs_comm[cmd]} rev-parse --show-prefix )%/##}}
 rrn=${gitbase:t}
 
-- 
1.7.10.GIT