maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r688200 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn: maven-scm-provider-svn-commons/src/main/mdo/ maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/ maven-scm-provider-svnexe/src/...
Date Fri, 22 Aug 2008 21:39:44 GMT
Author: olamy
Date: Fri Aug 22 14:39:44 2008
New Revision: 688200

URL: http://svn.apache.org/viewvc?rev=688200&view=rev
Log:
[SCM-402] scm:checkin doesn't work on OS X 10.5 Leopard
Submitted by Mark Struberg


Added:
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
  (with props)
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/SvnCommandLineUtils.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/checkin/SvnCheckInCommandTest.java

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=688200&r1=688199&r2=688200&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 Aug 22 14:39:44 2008
@@ -40,6 +40,15 @@
              The cygwin mount path. The default value is '/cygwin'.
           ]]></description>
         </field>
+        <field>
+          <name>useNonInteractive</name>
+          <version>1.1.0+</version>
+          <type>boolean</type>
+          <defaultValue>true</defaultValue>
+          <description><![CDATA[
+             Switch off if you do not like to use --non-interactive e.g. on Leopard (see
SCM-402).
+          ]]></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/SvnCommandLineUtils.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/SvnCommandLineUtils.java?rev=688200&r1=688199&r2=688200&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/SvnCommandLineUtils.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/SvnCommandLineUtils.java
Fri Aug 22 14:39:44 2008
@@ -115,7 +115,9 @@
             cl.createArgument().setValue( repository.getPassword() );
         }
 
-        cl.createArgument().setValue( "--non-interactive" );
+        if ( SvnUtil.getSettings().isUseNonInteractive() ) {
+            cl.createArgument().setValue( "--non-interactive" );
+        }
 
         return cl;
     }

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/checkin/SvnCheckInCommandTest.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/checkin/SvnCheckInCommandTest.java?rev=688200&r1=688199&r2=688200&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/checkin/SvnCheckInCommandTest.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/checkin/SvnCheckInCommandTest.java
Fri Aug 22 14:39:44 2008
@@ -22,6 +22,7 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.provider.svn.util.SvnUtil;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -78,6 +79,22 @@
         testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk",
                          "svn --username anonymous --non-interactive commit " + messageFileString
);
     }
+    
+    public void testCommandLineWithUsernameWithoutNonInteractive()
+        throws Exception
+    {
+        try
+        {
+            SvnUtil.setSettingsDirectory( getTestFile( "src/test/resources/svn/checkin/macos"
) );
+            testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk", "svn --username
anonymous commit "
+                + messageFileString );
+        }
+        finally
+        {
+
+            SvnUtil.setSettingsDirectory( SvnUtil.DEFAULT_SETTINGS_DIRECTORY );
+        }
+    }
 
     // ----------------------------------------------------------------------
     //

Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/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/checkin/macos/svn-settings.xml?rev=688200&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
(added)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
Fri Aug 22 14:39:44 2008
@@ -0,0 +1,3 @@
+<svn-settings>
+  <useNonInteractive>false</useNonInteractive>
+</svn-settings>

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message