Re: [vincent@vinc17.org: Bug#278368: zsh-beta: svn completions no longer work]

[Peter Stephenson <pws@csr.com>]

Clint Adams wrote:
> When I do a completion like "svn st [TAB]" in a working copy, I get
> the following error message:
> 
> _arguments:comparguments:208: invalid argument: display

This is another collision between the glob code and the pattern match
code as amended.  I think this fixes it.  That file in glob.c really
needs the unmetafy treatment, too.

Index: Src/glob.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/glob.c,v
retrieving revision 1.36
diff -u -r1.36 glob.c
--- Src/glob.c	18 Oct 2004 11:56:17 -0000	1.36
+++ Src/glob.c	26 Oct 2004 17:02:55 -0000
@@ -2206,8 +2206,20 @@
     repllist = NULL;
 
     /* perform must-match test for complex closures */
-    if (p->mustoff && !strstr((char *)s, (char *)p + p->mustoff))
-	matched = 0;
+    if (p->mustoff)
+    {
+	/*
+	 * Yuk.  Probably we should rewrite this whole function to
+	 * use an unmetafied test string.
+	 *
+	 * Use META_HEAPDUP because we need a terminating NULL.
+	 */
+	char *muststr = metafy((char *)p + p->mustoff,
+			       p->patmlen, META_HEAPDUP);
+
+	if (!strstr(s, muststr))
+	    matched = 0;
+    }
 
     /* in case we used the prog before... */
     p->flags &= ~(PAT_NOTSTART|PAT_NOTEND);
Index: Test/D02glob.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/D02glob.ztst,v
retrieving revision 1.7
diff -u -r1.7 D02glob.ztst
--- Test/D02glob.ztst	22 Oct 2004 15:36:40 -0000	1.7
+++ Test/D02glob.ztst	26 Oct 2004 17:02:56 -0000
@@ -312,3 +312,8 @@
  [[ "" = "" ]] && echo OK
 0:Empty strings
 >OK
+
+ foo="this string has a : colon in it"
+ print ${foo%% #:*}
+0:Must-match arguments in complex patterns
+>this string has a

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************