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/08/18 22:21:18 UTC
[maven-scm] branch SCM-834 updated (3ba078e -> ea724d7)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-834
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
discard 3ba078e [SCM-834] Commit encoding is platform-dependent instead of UTF-8
new ea724d7 [SCM-834] Commit encoding is platform-dependent instead of UTF-8
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3ba078e)
\
N -- N -- N refs/heads/SCM-834 (ea724d7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../svnexe/command/branch/SvnExeBranchCommandTckTest.java | 12 ++++++------
.../svn/svnexe/command/checkin/SvnCheckInCommandTest.java | 2 +-
.../svn/svnexe/command/tag/SvnExeTagCommandTckTest.java | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
[maven-scm] 01/01: [SCM-834] Commit encoding is platform-dependent
instead of UTF-8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-834
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit ea724d785adc65f2ba1ee81b10b017c75c6f822f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 19 00:06:36 2018 +0200
[SCM-834] Commit encoding is platform-dependent instead of UTF-8
---
.../git/gitexe/command/checkin/GitCheckInCommand.java | 2 +-
.../scm/provider/git/gitexe/command/tag/GitTagCommand.java | 2 +-
.../provider/svn/svnexe/command/branch/SvnBranchCommand.java | 8 ++++++--
.../svn/svnexe/command/checkin/SvnCheckInCommand.java | 6 +++++-
.../provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java | 7 +++++--
.../scm/provider/svn/svnexe/command/tag/SvnTagCommand.java | 6 +++++-
.../svnexe/command/branch/SvnExeBranchCommandTckTest.java | 12 ++++++------
.../svn/svnexe/command/checkin/SvnCheckInCommandTest.java | 2 +-
.../svn/svnexe/command/mkdir/SvnMkdirCommandTest.java | 10 +++++-----
.../svn/svnexe/command/tag/SvnExeTagCommandTckTest.java | 10 +++++-----
10 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
index 30d6c70..26cdb66 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
@@ -73,7 +73,7 @@ public class GitCheckInCommand
File messageFile = FileUtils.createTempFile( "maven-scm-", ".commit", null );
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
index 068ec3e..9609124 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
@@ -77,7 +77,7 @@ public class GitTagCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
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 59f52d3..b5c78a4 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
@@ -77,7 +77,7 @@ public class SvnBranchCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmBranchParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmBranchParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -187,6 +187,10 @@ public class SvnBranchCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
if ( scmBranchParameters != null && scmBranchParameters.isPinExternals() )
{
cl.createArg().setValue( "--pin-externals" );
@@ -210,5 +214,5 @@ public class SvnBranchCommand
cl.createArg().setValue( SvnCommandUtils.fixUrl( branchUrl, repository.getUser() ) );
return cl;
- }
+ }
}
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/checkin/SvnCheckInCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
index 38ff8c2..3a0adce 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
@@ -61,7 +61,7 @@ public class SvnCheckInCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
@@ -132,6 +132,10 @@ public class SvnCheckInCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
try
{
SvnCommandLineUtils.addTarget( cl, fileSet.getFileList() );
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 6e6e313..0f10d26 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
@@ -57,7 +57,7 @@ public class SvnMkdirCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
@@ -138,7 +138,7 @@ public class SvnMkdirCommand
Iterator<File> it = fileSet.getFileList().iterator();
String dirPath = it.next().getPath();
// replacing \ with / for windauze
- if ( dirPath != null && Os.isFamily( Os.FAMILY_DOS ) )
+ if ( dirPath != null && Os.isFamily( Os.FAMILY_WINDOWS ) )
{
dirPath = StringUtils.replace( dirPath, "\\", "/" );
}
@@ -151,6 +151,9 @@ public class SvnMkdirCommand
{
cl.createArg().setValue( "--file" );
cl.createArg().setValue( messageFile.getAbsolutePath() );
+
+ cl.createArg().setValue( "--encoding" );
+ cl.createArg().setValue( "UTF-8" );
}
}
else
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 b3f6005..0e96e97 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
@@ -103,7 +103,7 @@ public class SvnTagCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -240,6 +240,10 @@ public class SvnTagCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
cl.createArg().setValue( "--parents" );
if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
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/branch/SvnExeBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
index 0cc7dd4..5b73ef3 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnExeBranchCommandTckTest.java
@@ -50,7 +50,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch",
+ + " --encoding UTF-8 --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch",
scmBranchParameters );
}
@@ -67,7 +67,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " --pin-externals --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch",
+ + " --encoding UTF-8 --pin-externals --revision 2 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch",
scmBranchParameters );
}
@@ -83,7 +83,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch", scmBranchParameters );
+ + " --encoding UTF-8 https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch", scmBranchParameters );
}
public void testBranchUserNameSvnHttpsRemoteBranchingNoRevWithPinExternals()
@@ -98,7 +98,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " --pin-externals https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch", scmBranchParameters );
+ + " --encoding UTF-8 --pin-externals https://foo.com/svn/trunk https://foo.com/svn/branches/svnbranch", scmBranchParameters );
}
public void testBranchUserNameSvnHttps()
@@ -109,7 +109,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " . https://foo.com/svn/branches/svnbranch", null );
+ + " --encoding UTF-8 . https://foo.com/svn/branches/svnbranch", null );
}
public void testBranchUserNameSvnSsh()
@@ -120,7 +120,7 @@ public class SvnExeBranchCommandTckTest
testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svnbranch", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --parents --file " + messageFile.getAbsolutePath()
- + " . svn+ssh://user@foo.com/svn/branches/svnbranch" );
+ + " --encoding UTF-8 . svn+ssh://user@foo.com/svn/branches/svnbranch" );
}
private void testCommandLine( String scmUrl, String branch, File messageFile, String user, String commandLine,
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/checkin/SvnCheckInCommandTest.java b/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
index bae43fa..30d1107 100644
--- a/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
+++ b/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
@@ -51,7 +51,7 @@ public class SvnCheckInCommandTest
{
path = "\"" + path + "\"";
}
- messageFileString = "--file " + path;
+ messageFileString = "--file " + path + " --encoding UTF-8";
}
public void testCommandLineWithEmptyTag()
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 85828c8..dd124ec 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
@@ -46,21 +46,21 @@ public class SvnMkdirCommandTest
messageFile = new File( "mkdir-message" );
- String path = messageFile.getAbsolutePath();
+ String path = messageFile.getAbsolutePath();
FileUtils.fileWrite( path, "create missing directory" );
-
+
if ( path.indexOf( ' ' ) >= 0 )
{
path = "\"" + path + "\"";
}
- messageFileString = "--file " + path;
+ messageFileString = "--file " + path + " --encoding UTF-8";
}
-
+
protected void tearDown()
throws Exception
{
assertTrue( messageFile.delete() );
-
+
super.tearDown();
}
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/tag/SvnExeTagCommandTckTest.java b/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
index a05aea0..154e7de 100644
--- a/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
+++ b/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
@@ -44,7 +44,7 @@ public class SvnExeTagCommandTckTest
testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath() +
- " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
+ " --encoding UTF-8 --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
}
public void testTagRemoteTagHttps()
@@ -58,7 +58,7 @@ public class SvnExeTagCommandTckTest
scmTagParameters.setPinExternals( false );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
+ + " --encoding UTF-8 --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
}
public void testTagRemoteTagHttpsWithPinExternals()
@@ -72,7 +72,7 @@ public class SvnExeTagCommandTckTest
scmTagParameters.setPinExternals( true );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents --pin-externals https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
+ + " --encoding UTF-8 --parents --pin-externals https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
}
public void testTagRemoteTagHttpsWithRevision()
@@ -87,7 +87,7 @@ public class SvnExeTagCommandTckTest
scmTagParameters.setScmRevision( "12" );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
+ + " --encoding UTF-8 --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
scmTagParameters );
}
@@ -103,7 +103,7 @@ public class SvnExeTagCommandTckTest
scmTagParameters.setScmRevision( "12" );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --no-auth-cache --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents --revision 12 --pin-externals https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
+ + " --encoding UTF-8 --parents --revision 12 --pin-externals https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
scmTagParameters );
}