From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9953 invoked by alias); 9 Nov 2011 16:48:47 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 29906 Received: (qmail 6182 invoked from network); 9 Nov 2011 16:48:45 -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.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at bewatermyfriend.org does not designate permitted sender hosts) From: Frank Terbeck To: "Akinori MUSHA" Cc: zsh-workers@zsh.org Subject: Re: PATCH: Update VCS_INFO_detect_svn for Subversion 1.7 In-Reply-To: <86sjlxoows.knu@iDaemons.org> (Akinori MUSHA's message of "Wed, 09 Nov 2011 14:17:23 +0900") References: <86sjlxoows.knu@iDaemons.org> User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.50 (gnu/linux) Date: Wed, 09 Nov 2011 17:30:54 +0100 Message-ID: <87zkg5xnpd.fsf@ft.bewatermyfriend.org> MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: NDMwNDQ0 It seems like I was missing something Phil put into the `_get_data_' function: It is able to handle nested working copies. As in: /foo/bar is the checkout of one repository and /foo/bar/baz/bob being the checkout of another. My glob idea doesn't catch that properly. The matter has been discussed on IRC for a while and I've come to the conclusion that applying Akinori's original patch is probably the best. It does double the work a little, but I think it should work in almost all cases. So, thanks for that. Regards, Frank Akinori MUSHA wrote: [...] > Index: Functions/VCS_Info/Backends/VCS_INFO_detect_svn > =================================================================== > RCS file: /cvsroot/zsh/zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_svn,v > retrieving revision 1.3 > diff -u -r1.3 VCS_INFO_detect_svn > --- Functions/VCS_Info/Backends/VCS_INFO_detect_svn 11 Feb 2011 07:05:09 -0000 1.3 > +++ Functions/VCS_Info/Backends/VCS_INFO_detect_svn 9 Nov 2011 05:14:03 -0000 > @@ -7,5 +7,5 @@ > [[ $1 == '--flavours' ]] && return 1 > > VCS_INFO_check_com ${vcs_comm[cmd]} || return 1 > -{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0 > -return 1 > +vcs_comm[detect_need_file]="entries format" > +VCS_INFO_bydir_detect '.svn' || return 1