zsh-workers
 help / color / mirror / code / Atom feed
* lhw@ring0.de, 611175@bugs.debian.org
@ 2011-02-11  6:34 Frank Terbeck
  2011-02-11  6:43 ` Phil Pennock
  0 siblings, 1 reply; 2+ messages in thread
From: Frank Terbeck @ 2011-02-11  6:34 UTC (permalink / raw)
  To: zsh-workers

...now that CVS is back...

Here's a fix for an issue with vcs_info's subversion detection, which
was reported in the debian BTS (issue #611175¹).

The fix was suggested by Lennart Weller.

¹ <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611175>

Regards, Frank


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.2
diff -u -r1.2 VCS_INFO_detect_svn
--- Functions/VCS_Info/Backends/VCS_INFO_detect_svn	11 Dec 2008 09:53:13 -0000	1.2
+++ Functions/VCS_Info/Backends/VCS_INFO_detect_svn	11 Feb 2011 06:27:36 -0000
@@ -8,4 +8,5 @@
 
 VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
 [[ -d ".svn" ]] && return 0
+{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0
 return 1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: lhw@ring0.de, 611175@bugs.debian.org
  2011-02-11  6:34 lhw@ring0.de, 611175@bugs.debian.org Frank Terbeck
@ 2011-02-11  6:43 ` Phil Pennock
  0 siblings, 0 replies; 2+ messages in thread
From: Phil Pennock @ 2011-02-11  6:43 UTC (permalink / raw)
  To: Frank Terbeck; +Cc: zsh-workers

On 2011-02-11 at 07:34 +0100, Frank Terbeck wrote:
> ...now that CVS is back...
> 
> Here's a fix for an issue with vcs_info's subversion detection, which
> was reported in the debian BTS (issue #611175¹).

That entry complains that .svn/ on its own is not sufficient and a more
thorough check is needed.

Your patch adds dead code, because if .svn already exists as a
directory, the function will have returned true already.

I suspect that you should be *replacing* the [[ -d ".svn" ]] check.

-Phil


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-02-11  6:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-11  6:34 lhw@ring0.de, 611175@bugs.debian.org Frank Terbeck
2011-02-11  6:43 ` Phil Pennock

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).