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/12 21:48:58 UTC
[maven-scm] branch path-fiddle updated (c48d8d1 -> f6dabaf)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch path-fiddle
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
discard c48d8d1 Use NIO2 Path for clean URIs (2)
new f6dabaf Use NIO2 Path for clean URIs (2)
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 (c48d8d1)
\
N -- N -- N refs/heads/path-fiddle (f6dabaf)
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:
.../maven/scm/provider/git/gitexe/GitExeScmProvider.java | 3 ++-
.../apache/maven/scm/provider/git/GitScmTestUtils.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
[maven-scm] 01/01: Use NIO2 Path for clean URIs (2)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch path-fiddle
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit f6dabafad8af1c941371bbdbdeabb64721fe91d0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 12 22:57:27 2018 +0200
Use NIO2 Path for clean URIs (2)
---
.../git/repository/GitScmProviderRepositoryTest.java | 1 +
.../maven/scm/provider/git/gitexe/GitExeScmProvider.java | 3 ++-
.../git/gitexe/command/info/GitInfoConsumer.java | 6 +++---
.../git/gitexe/command/info/GitInfoCommandTckTest.java | 2 +-
.../apache/maven/scm/provider/git/GitScmTestUtils.java | 16 ++++++++--------
.../provider/git/jgit/command/info/JGitInfoCommand.java | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
index a5400ab..2efe755 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
@@ -109,6 +109,7 @@ public class GitScmProviderRepositoryTest
public void testLegalFileWindowsURL()
throws Exception
{
+ // FIXME This URL is invalid, hell knows why Git accepts it. It should be by us right away
testUrl( "scm:git:file://c:\\tmp\\repo", null, "file://c:\\tmp\\repo", null, null, null, null, 0, null);
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
index 596177a..2096cad 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
@@ -141,7 +141,8 @@ public class GitExeScmProvider
// Note: I need to supply just 1 absolute path, but ScmFileSet won't let me without
// a basedir (which isn't used here anyway), so use a dummy file.
// and a dummy ScmProviderRepository
- InfoScmResult result = info( new GitScmProviderRepository( path.getPath() ), new ScmFileSet( path ), null );
+ InfoScmResult result = info( new GitScmProviderRepository( path.toPath().toUri().toASCIIString() ),
+ new ScmFileSet( path ), null );
if ( result.getInfoItems().size() != 1 )
{
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/info/GitInfoConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java
index 3ef1cc3..3b236eb 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java
@@ -47,7 +47,7 @@ public class GitInfoConsumer
super( logger );
this.scmFileSet = scmFileSet;
}
-
+
/**
* @see org.codehaus.plexus.util.cli.StreamConsumer#consumeLine(java.lang.String)
*/
@@ -57,14 +57,14 @@ public class GitInfoConsumer
{
getLogger().debug( "consume line " + line );
}
-
+
if ( infoItems.isEmpty() )
{
if ( !StringUtils.isEmpty( line ) )
{
InfoItem infoItem = new InfoItem();
infoItem.setRevision( StringUtils.trim( line ) );
- infoItem.setURL( scmFileSet.getBasedir().getPath() );
+ infoItem.setURL( scmFileSet.getBasedir().toPath().toUri().toASCIIString() );
infoItems.add( infoItem );
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
index c06f3d6..7d853eb 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
@@ -50,7 +50,7 @@ public class GitInfoCommandTckTest
provider.info( repository, new ScmFileSet( getRepositoryRoot() ), new CommandParameters() );
assertNotNull( result );
assertEquals( "cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767", result.getInfoItems().get( 0 ).getRevision() );
- //
+ //
}
public void testInfoCommandWithShortRevision()
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
index 0a05a63..284bff5 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
@@ -1,13 +1,5 @@
package org.apache.maven.scm.provider.git;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,8 +19,16 @@ import org.codehaus.plexus.util.cli.CommandLineException;
* under the License.
*/
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
import junit.framework.Assert;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/info/JGitInfoCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/info/JGitInfoCommand.java
index 488093e..b28b4f5 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/info/JGitInfoCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/info/JGitInfoCommand.java
@@ -60,7 +60,7 @@ public class JGitInfoCommand
InfoItem infoItem = new InfoItem();
infoItem.setRevision( StringUtils.trim( objectId.name() ) );
- infoItem.setURL( basedir.getPath() );
+ infoItem.setURL( basedir.toPath().toUri().toASCIIString() );
return new InfoScmResult( Collections.singletonList( infoItem ),
new ScmResult( "JGit.resolve(HEAD)", "", objectId.toString(), true ) );