Author: evenisse
Date: Fri May 23 13:49:28 2008
New Revision: 659653
URL: http://svn.apache.org/viewvc?rev=659653&view=rev
Log:
[SCM-368] Fix Windows path length limitations
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/update/cygwin/svn-settings.xml
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo?rev=659653&r1=659652&r2=659653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
Fri May 23 13:49:28 2008
@@ -31,6 +31,15 @@
Must be true if svn is a cygwin svn command.
]]></description>
</field>
+ <field>
+ <name>cygwinMountPath</name>
+ <version>1.1.0+</version>
+ <type>String</type>
+ <defaultValue>/cygwin</defaultValue>
+ <description><![CDATA[
+ The cygwin mount path. The default value is '/cygwin'.
+ ]]></description>
+ </field>
</fields>
</class>
</classes>
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=659653&r1=659652&r2=659653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
Fri May 23 13:49:28 2008
@@ -96,7 +96,7 @@
if ( settings.isUseCygwinPath() )
{
- workingDir = "/cygdrive/" + workingDir;
+ workingDir = settings.getCygwinMountPath() + "/" + workingDir;
workingDir = StringUtils.replace( workingDir, ":", "" );
workingDir = StringUtils.replace( workingDir, "\\", "/" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java?rev=659653&r1=659652&r2=659653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
Fri May 23 13:49:28 2008
@@ -112,7 +112,7 @@
SvnUtil.setSettingsDirectory( getTestFile(
"src/test/resources/svn/update/cygwin" ) );
assertTrue( SvnUtil.getSettings().isUseCygwinPath() );
testCommandLine( "scm:svn:http://foo.com/svn/trunk";, null,
- "svn --non-interactive update
/cygdrive/c/my_working_directory",
+ "svn --non-interactive update
/mnt/c/my_working_directory",
new File( "C:\\my_working_directory" ) );
SvnUtil.setSettingsDirectory( SvnUtil.DEFAULT_SETTINGS_DIRECTORY );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/update/cygwin/svn-settings.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/update/cygwin/svn-settings.xml?rev=659653&r1=659652&r2=659653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/update/cygwin/svn-settings.xml
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/update/cygwin/svn-settings.xml
Fri May 23 13:49:28 2008
@@ -1,3 +1,4 @@
<svn-settings>
<useCygwinPath>true</useCygwinPath>
+ <cygwinMountPath>/mnt</cygwinMountPath>
</svn-settings>
