[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [PATCH] Factorise 'svn lock' validation code

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-06-14 20:07:06 CEST

Madan,

I tried your patch but it doesn't work.

The actual problem is cause by these two lines of code:

  comment = "Locking path:%s." % path
[..]
  comment_re = re.compile (".*?%s\n.*?" % re.escape(comment), re.DOTALL)

The code does a regex match on the text(expanded): '.*Locking Path:
/path/to/file.*'. Problem is that on Windows, the path separator is a
backslash, which should be escaped in regular expressions.

Attached patch will do just that, so unless you see any new problems I'll
commit it.

Lieven.

> -----Original Message-----
> From: Madan U Sreenivasan [mailto:madan@collab.net]
> Sent: woensdag 14 juni 2006 17:58
> To: Lieven Govaerts; Garrett Rooney
> Cc: Peter N. Lundblad; dev@subversion.tigris.org
> Subject: Re: [PATCH] Factorise 'svn lock' validation code
>
> On Wed, 14 Jun 2006 14:53:39 +0530, Lieven Govaerts
> <lgo@mobsol.be> wrote:
>
> > Quoting Garrett Rooney <rooneg@electricjellyfish.net>:
> [snip]
> >> Committed in r20086. Thanks,
> >>
> >> -garrett
> >
> > Garrett,
> >
> >
> > this commit seems to make the test fail on the Win32/XP/VS2005
> > buildslave. On Mac & Linux buildslaves it looks ok.
>
> Could this be because the regex for comparing output includes
> \n and in windows a newline is effectively \r\n?
>
> I reviewed the code, and this is the only thing I could
> suspect. Sorry, I dont have a windows box to test it right now...
>
> Could somebody with a windows box, apply the attached patch,
> test and see?
>
> Regards,
> Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Wed Jun 14 20:12:18 2006

This is an archived mail posted to the Subversion Dev mailing list.