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

Re: ISSUE+PATCH: svn_load_dirs.pl fails on filenames containing $-sign ( probably Cygwin specific )

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2005-09-05 12:00:44 CEST

Attaching the patch seems to be a problem, so here it is inline:

--------------------------------------
Index: contrib/client-side/svn_load_dirs.pl.in
===================================================================
--- contrib/client-side/svn_load_dirs.pl.in (revision 14782)
+++ contrib/client-side/svn_load_dirs.pl.in (working copy)
@@ -1462,7 +1462,7 @@
             {
               # Munge the command to protect it from the command line
               $command =~ s/\"/\\\"/g;
- if ($command =~ m"\s") { $command = "\"$command\""; }
+ if ($command =~ m"[\s\$]") { $command = "\'$command\'"; }
               if ($command eq "") { $command = "\"\""; }
               if ($command =~ m"\n")
                 {
--------------------------------------

Lieven.

Citeren Lieven <lgo@mobsol.be>:

> Hi,
>
> We're using the svn_load_dirs.pl script to import a dump of our previous SCM
> to
> Subversion. Platform is Cygwin on Windows 2000, Subversion version 1.2.0
> client
> & server, svn_load_dirs.pl rev. 10000.
>
> I encountered an issue in the script with files containing the $-sign:
>
> ( extract from console output ):
> -----------------------
> Running svn propget svn:eol-style
> oracle/packages/PCK$GEOROUTE_STREET_SEGMENTS.PKB
> svn: 'oracle/packages/PCK.PKB' is not under version control
> ./svn_load_dirs.pl: svn propget svn:eol-style
> oracle/packages/PCK$GEOROUTE_STREET_SEGMENTS.PKB failed with this output:
>
> Press return to quit and clean up svn working directory:
> -----------------------
>
> Cause of the error is that in the line:
>
> svn propget svn:eol-style oracle/packages/PCK$GEOROUTE_STREET_SEGMENTS.PKB
>
> the string $GEOROUTE_STREET_SEGMENTS is replaced with its value ( which is
> empty ).
>
> I see in the svn_load_dirs.pl script that filenames containing spaces are
> already wrapped with double-quotes. This cannot be extended to filenames
> with $-sign, as bash expand variables in double-quotes.
>
> So, my patch will wrap all files containing a space or a $-sign with a
> single quote instead. Which is a solution that definitely works in Cygwin,
> and I'm pretty sure it also works on Linux, but this may be double-checked
> by others.
>
> Lieven.
>
> Log:
> [[[
> * contrib/client-side/svn_load_dirs.pl.in: Wrap all filenames containing
> a space or $ with single quotes.
> ]]]

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 5 12:02:00 2005

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