You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/03/29 18:24:06 UTC
[maven-scm] branch master updated: [SCM-748] Automatically create
parent dirs with 'svn --parents'
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new 566dd9a [SCM-748] Automatically create parent dirs with 'svn --parents'
566dd9a is described below
commit 566dd9ab61db4856891d4408241b155e9cecc236
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Mar 23 14:27:43 2018 +0100
[SCM-748] Automatically create parent dirs with 'svn --parents'
---
.../maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java | 2 ++
.../scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java | 4 ++--
.../scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java | 2 ++
.../maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java | 2 ++
.../scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java | 6 +++---
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
index c020a83..9d5f1d0 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
@@ -108,6 +108,8 @@ public class SvnAddCommand
cl.createArg().setValue( "add" );
+ cl.createArg().setValue( "--parents" );
+
cl.createArg().setValue( "--non-recursive" );
try
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
index 70ed92d..7bdaa80 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
@@ -181,12 +181,12 @@ public class SvnBranchCommand
cl.createArg().setValue( "copy" );
+ cl.createArg().setValue( "--parents" );
+
cl.createArg().setValue( "--file" );
cl.createArg().setValue( messageFile.getAbsolutePath() );
- cl.createArg().setValue( "--parents" );
-
if ( scmBranchParameters != null && scmBranchParameters.isRemoteBranching() )
{
if ( StringUtils.isNotBlank( scmBranchParameters.getScmRevision() ) )
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
index 9cd5a23..6e6e313 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
@@ -133,6 +133,8 @@ public class SvnMkdirCommand
cl.createArg().setValue( "mkdir" );
+ cl.createArg().setValue( "--parents" );
+
Iterator<File> it = fileSet.getFileList().iterator();
String dirPath = it.next().getPath();
// replacing \ with / for windauze
diff --git a/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 b/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
index 567df8c..cdcb44f 100644
--- a/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
+++ b/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
@@ -214,6 +214,8 @@ public class SvnTagCommand
cl.createArg().setValue( "copy" );
+ cl.createArg().setValue( "--parents" );
+
cl.createArg().setValue( "--file" );
cl.createArg().setValue( messageFile.getAbsolutePath() );
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
index 289b8e8..85828c8 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
@@ -68,21 +68,21 @@ public class SvnMkdirCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk",
- "svn --non-interactive mkdir http://foo.com/svn/trunk/missing " + messageFileString, false );
+ "svn --non-interactive mkdir --parents http://foo.com/svn/trunk/missing " + messageFileString, false );
}
public void testCommandLineMkdirUrlWithUsername()
throws Exception
{
testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk",
- "svn --username anonymous --no-auth-cache --non-interactive mkdir http://foo.com/svn/trunk/missing " +
+ "svn --username anonymous --no-auth-cache --non-interactive mkdir --parents http://foo.com/svn/trunk/missing " +
messageFileString, false );
}
public void testCommandLineMkdirLocalPath()
throws Exception
{
- testCommandLine( "scm:svn:http://foo.com/svn/trunk", "svn --non-interactive mkdir missing ", true );
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", "svn --non-interactive mkdir --parents missing ", true );
}
private void testCommandLine( String scmUrl, String commandLine, boolean createInLocal )
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.