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/09/09 00:23:34 UTC
[maven-scm] branch SCM-859 updated: ..
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-859
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/SCM-859 by this push:
new f75790d ..
f75790d is described below
commit f75790d5d89b27d1a9b409cf8bb9423b09b1202a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Sep 9 02:17:32 2018 +0200
..
---
.../svnexe/command/update/SvnUpdateCommand.java | 4 +--
.../command/update/SvnUpdateCommandTest.java | 30 +++++++++++-----------
2 files changed, 17 insertions(+), 17 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/update/SvnUpdateCommand.java b/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
index b4c1ac3..b1b7fde 100644
--- a/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
+++ b/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
@@ -136,7 +136,7 @@ public class SvnUpdateCommand
cl.createArg().setValue( version.getName() );
}
- cl.createArg().setValue( workingDir );
+ cl.createArg().setValue( workingDir + "@" );
}
else
{
@@ -155,7 +155,7 @@ public class SvnUpdateCommand
String branchUrl = SvnTagBranchUtils.resolveBranchUrl( repository, (ScmBranch) version );
cl.createArg().setValue( branchUrl + "@" );
}
- cl.createArg().setValue( workingDir );
+ cl.createArg().setValue( workingDir + "@" );
}
}
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/update/SvnUpdateCommandTest.java b/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
index 38127f6..5e852c1 100644
--- a/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
+++ b/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
@@ -43,49 +43,49 @@ public class SvnUpdateCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmTag( "" ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithEmptyBranch()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmBranch( "" ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithEmptyVersion()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( "" ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceTag()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmTag( " " ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceBranch()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmBranch( " " ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithWhitespaceRevision()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( " " ),
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithoutTag()
throws Exception
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", null,
- "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() );
+ "svn --non-interactive update " + getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineTag()
@@ -93,7 +93,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk", new ScmRevision( "10" ),
"svn --username anonymous --no-auth-cache --non-interactive update -r 10 " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithUsernameAndTag()
@@ -101,7 +101,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk", new ScmRevision( "10" ),
"svn --username anonymous --no-auth-cache --non-interactive update -r 10 " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithCygwinProperty()
@@ -114,7 +114,7 @@ public class SvnUpdateCommandTest
{
assertTrue( SvnUtil.getSettings().isUseCygwinPath() );
testCommandLine( "scm:svn:http://foo.com/svn/trunk", null,
- "svn --non-interactive update /mnt/c/my_working_directory",
+ "svn --non-interactive update /mnt/c/my_working_directory@",
new File( "c:\\my_working_directory" ) );
}
finally
@@ -129,7 +129,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmBranch( "branches/my-test-branch" ),
"svn --non-interactive switch http://foo.com/svn/branches/my-test-branch@ " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithAbsoluteURLTag()
@@ -138,7 +138,7 @@ public class SvnUpdateCommandTest
testCommandLine( "scm:svn:http://foo.com/svn/trunk",
new ScmBranch( "http://foo.com/svn/branches/my-test-branch" ),
"svn --non-interactive switch http://foo.com/svn/branches/my-test-branch@ " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithNonDeterminantBase()
@@ -146,7 +146,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://foo.com/svn/some-project", new ScmBranch( "branches/my-test-branch" ),
"svn --non-interactive switch http://foo.com/svn/some-project/branches/my-test-branch@ " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithNonDeterminantBaseTrailingSlash()
@@ -154,7 +154,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://foo.com/svn/some-project/", new ScmBranch( "branches/my-test-branch" ),
"svn --non-interactive switch http://foo.com/svn/some-project/branches/my-test-branch@ " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
public void testCommandLineWithBranchSameAsBase()
@@ -162,7 +162,7 @@ public class SvnUpdateCommandTest
{
testCommandLine( "scm:svn:http://foo.com/svn/tags/my-tag", new ScmTag( "tags/my-tag" ),
"svn --non-interactive switch http://foo.com/svn/tags/my-tag@ " +
- getUpdateTestFile().getAbsolutePath() );
+ getUpdateTestFile().getAbsolutePath() + "@" );
}
// ----------------------------------------------------------------------