maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r885160 - in /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/tag/ test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Date Sat, 28 Nov 2009 22:49:45 GMT
Author: olamy
Date: Sat Nov 28 22:49:45 2009
New Revision: 885160

URL: http://svn.apache.org/viewvc?rev=885160&view=rev
Log:
[SCM-487] support --parents option for svn copy (tag commands)

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/tag/SvnTagCommand.java
  (contents, props changed)
    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/tag/SvnExeTagCommandTckTest.java

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/tag/SvnTagCommand.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/tag/SvnTagCommand.java?rev=885160&r1=885159&r2=885160&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/tag/SvnTagCommand.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/tag/SvnTagCommand.java
Sat Nov 28 22:49:45 2009
@@ -230,6 +230,8 @@
 
         cl.createArg().setValue( messageFile.getAbsolutePath() );
 
+        cl.createArg().setValue( "--parents" );
+        
         if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null
)
         {
             cl.createArg().setValue( "--revision" );

Propchange: 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/tag/SvnTagCommand.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Nov 28 22:49:45 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

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/tag/SvnExeTagCommandTckTest.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/tag/SvnExeTagCommandTckTest.java?rev=885160&r1=885159&r2=885160&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/tag/SvnExeTagCommandTckTest.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/tag/SvnExeTagCommandTckTest.java
Sat Nov 28 22:49:45 2009
@@ -44,7 +44,7 @@
 
         testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
                          "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
+
-                             " . svn+ssh://user@foo.com/svn/tags/svntag", null );
+                             " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null
);
     }
     
     public void testTagRemoteTagHttps()
@@ -57,7 +57,7 @@
         scmTagParameters.setRemoteTagging( true );
         testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
                          "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
-                             + " https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
scmTagParameters );
+                             + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
scmTagParameters );
     }    
     
     public void testTagRemoteTagHttpsWithRevision()
@@ -71,7 +71,7 @@
         scmTagParameters.setScmRevision( "12" );
         testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
                          "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
-                             + " --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
+                             + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
                          scmTagParameters );
     }    
 
@@ -89,14 +89,8 @@
 
         Commandline cl = null;
 
-        if ( scmTagParameters == null )
-        {
-            cl = SvnTagCommand.createCommandLine( svnRepository, workingDirectory, tag, messageFile
);
-        }
-        else
-        {
-            cl = SvnTagCommand.createCommandLine( svnRepository, workingDirectory, tag, messageFile,
scmTagParameters );
-        }
+        cl = SvnTagCommand.createCommandLine( svnRepository, workingDirectory, tag, messageFile,
scmTagParameters );
+            
         assertCommandLine( commandLine, workingDirectory, cl );
     }
 }



Mime
View raw message