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/13 20:10:02 UTC
[maven-scm] branch path-fiddle updated (aab5861 -> 557babd)
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 aab5861 [SCM-791] GitExe Provider does not work properly in Cygwin
discard 7040c88 [SCM-892] URLs aren't set where URLs are expected
new 92feda5 [SCM-892] URLs aren't set where URLs are expected
new 557babd [SCM-791] GitExe Provider does not work properly in Cygwin
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 (aab5861)
\
N -- N -- N refs/heads/path-fiddle (557babd)
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 2 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:
.../src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java | 1 -
1 file changed, 1 deletion(-)
[maven-scm] 01/02: [SCM-892] URLs aren't set where URLs are expected
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 92feda5e1f5ce20d397ecdb17ffaca60032220d7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 12 22:01:57 2018 +0200
[SCM-892] URLs aren't set where URLs are expected
---
.../repository/GitScmProviderRepositoryTest.java | 1 +
.../scm/provider/git/gitexe/GitExeScmProvider.java | 3 +-
.../git/gitexe/command/info/GitInfoConsumer.java | 6 +--
.../checkin/GitCheckInCommandNoBranchTest.java | 3 +-
.../command/checkin/GitCheckInCommandTest.java | 15 ++++----
.../GitExeCheckOutCommandNoBranchTest.java | 3 +-
.../gitexe/command/info/GitInfoCommandTckTest.java | 2 +-
.../maven/scm/provider/git/GitScmTestUtils.java | 45 +++-------------------
.../git/jgit/command/info/JGitInfoCommand.java | 2 +-
.../maven/scm/provider/svn/SvnScmTestUtils.java | 36 +----------------
10 files changed, 28 insertions(+), 88 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/checkin/GitCheckInCommandNoBranchTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
index e73e163..65ce12a 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
@@ -61,7 +61,8 @@ public class GitCheckInCommandNoBranchTest
FileUtils.deleteDirectory( repo );
FileUtils.copyDirectoryStructure( repo_orig, repo );
- ScmRepository scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() );
+ ScmRepository scmRepository = getScmManager().makeScmRepository(
+ "scm:git:" + repo.toPath().toAbsolutePath().toUri().toASCIIString() );
CheckOutScmResult checkOutScmResult = checkoutRepo( scmRepository );
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/checkin/GitCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
index 3221fc6..d30e4b1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
@@ -65,7 +65,7 @@ public class GitCheckInCommandTest
{
if ( GitUtil.getSettings().isCommitNoVerify() )
{
- testCommandLine( "scm:git:http://foo.com/git/trunk", "git commit --verbose " + messageFileString + " -a" + " --no-verify" );
+ testCommandLine( "scm:git:http://foo.com/git/trunk", "git commit --verbose " + messageFileString + " -a" + " --no-verify" );
}
else
{
@@ -95,18 +95,19 @@ public class GitCheckInCommandTest
GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
- ScmRepository scmRepository = getScmManager().makeScmRepository( "scm:git:file://" + repo.getAbsolutePath() );
+ ScmRepository scmRepository = getScmManager().makeScmRepository(
+ "scm:git:" + repo.toPath().toAbsolutePath().toUri().toASCIIString() );
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
GitScmTestUtils.setDefaultUser( checkedOutRepo );
// Creating foo/bar/wine.xml
- File fooDir = new File( checkedOutRepo.getAbsolutePath() + File.separator + "foo" );
+ File fooDir = new File( checkedOutRepo.getAbsolutePath(), "foo" );
fooDir.mkdir();
- File barDir = new File(fooDir.getAbsolutePath() + File.separator + "bar");
+ File barDir = new File(fooDir.getAbsolutePath(), "bar");
barDir.mkdir();
- File wineFile = new File(barDir.getAbsolutePath() + File.separator + "wine.xml");
+ File wineFile = new File(barDir.getAbsolutePath(), "wine.xml");
FileUtils.fileWrite( wineFile.getAbsolutePath(), "Lacoste castle" );
// Adding and commiting file
@@ -116,9 +117,9 @@ public class GitCheckInCommandTest
assertResultIsSuccess( checkInScmResult );
// Cloning foo/bar/wine.xml to foo/newbar/wine.xml
- File newBarDir = new File(fooDir.getAbsolutePath() + File.separator + "newbar");
+ File newBarDir = new File(fooDir.getAbsolutePath(), "newbar");
newBarDir.mkdir();
- File movedWineFile = new File(newBarDir.getAbsolutePath() + File.separator + "wine.xml");
+ File movedWineFile = new File(newBarDir.getAbsolutePath(), "wine.xml");
FileUtils.copyFile(wineFile, movedWineFile);
// Removing old file, adding new file and commiting...
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/checkout/GitExeCheckOutCommandNoBranchTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
index 0d1c959..b0ae87a 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
@@ -50,7 +50,8 @@ public class GitExeCheckOutCommandNoBranchTest
FileUtils.deleteDirectory( workingDirectory );
repo = new File( "src/test/resources/repository_no_branch" );
- scmRepository = getScmManager().makeScmRepository( "scm:git:file:///" + repo.getAbsolutePath() );
+ scmRepository = getScmManager().makeScmRepository( "scm:git:" +
+ repo.toPath().toAbsolutePath().toUri().toASCIIString() );
}
public void testCheckoutNoBranch()
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 c62458f..9aac135 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
@@ -19,18 +19,15 @@ package org.apache.maven.scm.provider.git;
* 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.Os;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -79,37 +76,7 @@ public final class GitScmTestUtils
public static String getScmUrl( File repositoryRootFile, String provider )
throws CommandLineException
{
- String repositoryRoot = repositoryRootFile.getAbsolutePath();
-
- // TODO: it'd be great to build this into CommandLineUtils somehow
- // TODO: some way without a custom cygwin sys property?
- if ( "true".equals( System.getProperty( "cygwin" ) ) )
- {
- Commandline cl = new Commandline();
-
- cl.setExecutable( "cygpath" );
-
- cl.createArg().setValue( "--unix" );
-
- cl.createArg().setValue( repositoryRoot );
-
- CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
-
- int exitValue = CommandLineUtils.executeCommandLine( cl, stdout, null );
-
- if ( exitValue != 0 )
- {
- throw new CommandLineException( "Unable to convert cygwin path, exit code = " + exitValue );
- }
-
- repositoryRoot = stdout.getOutput().trim();
- }
- else if ( Os.isFamily( "windows" ) )
- {
- repositoryRoot = "/" + StringUtils.replace( repositoryRoot, "\\", "/" );
- }
-
- return "scm:" + provider + ":file://" + repositoryRoot;
+ return "scm:" + provider + ":" + repositoryRootFile.toPath().toAbsolutePath().toUri().toASCIIString();
}
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 ) );
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
index d52d61f..098c66a 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
@@ -22,8 +22,6 @@ package org.apache.maven.scm.provider.svn;
import junit.framework.Assert;
import org.apache.maven.scm.ScmTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.Os;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -55,7 +53,7 @@ public final class SvnScmTestUtils
{
FileUtils.deleteDirectory( repositoryRoot );
}
-
+
Assert.assertFalse( "repositoryRoot still exists", repositoryRoot.exists() );
Assert.assertTrue( "Could not make repository root directory: " + repositoryRoot.getAbsolutePath(),
@@ -132,36 +130,6 @@ public final class SvnScmTestUtils
public static String getScmUrl( File repositoryRootFile )
throws CommandLineException
{
- String repositoryRoot = repositoryRootFile.getAbsolutePath();
-
- // TODO: it'd be great to build this into CommandLineUtils somehow
- // TODO: some way without a custom cygwin sys property?
- if ( "true".equals( System.getProperty( "cygwin" ) ) )
- {
- Commandline cl = new Commandline();
-
- cl.setExecutable( "cygpath" );
-
- cl.createArg().setValue( "--unix" );
-
- cl.createArg().setValue( repositoryRoot );
-
- CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
-
- int exitValue = CommandLineUtils.executeCommandLine( cl, stdout, null );
-
- if ( exitValue != 0 )
- {
- throw new CommandLineException( "Unable to convert cygwin path, exit code = " + exitValue );
- }
-
- repositoryRoot = stdout.getOutput().trim();
- }
- else if ( Os.isFamily( "windows" ) )
- {
- repositoryRoot = "/" + StringUtils.replace( repositoryRoot, "\\", "/" );
- }
-
- return "scm:svn:file://" + repositoryRoot;
+ return "scm:svn:" + repositoryRootFile.toPath().toAbsolutePath().toUri().toASCIIString();
}
}
[maven-scm] 02/02: [SCM-791] GitExe Provider does not work properly
in Cygwin
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 557babd83703eb4a0e7969d2ebb1669306deb4d2
Author: Ilya Basin <ba...@gmail.com>
AuthorDate: Mon Aug 13 00:25:16 2018 +0200
[SCM-791] GitExe Provider does not work properly in Cygwin
This closes #77
---
.../git/gitexe/command/GitCommandLineUtils.java | 12 +++++---
.../command/changelog/GitChangeLogCommand.java | 2 +-
.../command/checkout/GitCheckOutCommand.java | 6 ++--
.../command/GitCommandLineUtilsAddTargetTest.java | 4 +--
.../command/changelog/GitChangeLogCommandTest.java | 36 ++++++++--------------
.../changelog/GitChangeLogCommandTckTest.java | 2 +-
.../command/update/GitUpdateCommandTckTest.java | 2 +-
7 files changed, 27 insertions(+), 37 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/GitCommandLineUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
index 4f23195..bb1dad1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
@@ -19,6 +19,8 @@ package org.apache.maven.scm.provider.git.gitexe.command;
* under the License.
*/
+import org.apache.commons.io.FilenameUtils;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.git.util.GitUtil;
@@ -34,7 +36,7 @@ import java.util.List;
/**
* Command line construction utility.
- *
+ *
* @author Brett Porter
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*
@@ -73,7 +75,7 @@ public final class GitCommandLineUtils
}
// no setFile() since this screws up the working directory!
- cl.createArg().setValue( relativeFile );
+ cl.createArg().setValue( FilenameUtils.separatorsToUnix( relativeFile ) );
}
}
catch ( IOException ex )
@@ -84,7 +86,7 @@ public final class GitCommandLineUtils
}
/**
- *
+ *
* @param workingDirectory
* @param command
* @return
@@ -97,7 +99,7 @@ public final class GitCommandLineUtils
/**
* Creates a {@link Commandline} for which the toString() do not display
* password.
- *
+ *
* @param workingDirectory
* @param command
* @return CommandLine with anonymous output.
@@ -176,4 +178,4 @@ public final class GitCommandLineUtils
return exitCode;
}
-}
\ No newline at end of file
+}
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/changelog/GitChangeLogCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
index fe62ef6..e4879ba 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
@@ -236,7 +236,7 @@ public class GitChangeLogCommand
// We have to report only the changes of the current project.
// This is needed for child projects, otherwise we would get the changelog of the
// whole parent-project including all childs.
- cl.createArg().setFile( workingDirectory );
+ cl.createArg().setValue( "." );
return cl;
}
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/checkout/GitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
index d2e8613..7fcda9c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
@@ -194,7 +194,7 @@ public class GitCheckOutCommand
cl.createArg().setValue( repository.getFetchUrl() );
- cl.createArg().setFile( workingDirectory );
+ cl.createArg().setValue( workingDirectory.getName() );
return cl;
}
@@ -223,8 +223,8 @@ public class GitCheckOutCommand
// A tag will not be pulled but we only fetch all the commits from the upstream repo
// This is done because checking out a tag might not happen on the current branch
// but create a 'detached HEAD'.
- // In fact, a tag in git may be in multiple branches. This occurs if
- // you create a branch after the tag has been created
+ // In fact, a tag in git may be in multiple branches. This occurs if
+ // you create a branch after the tag has been created
cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "fetch" );
cl.createArg().setValue( repository.getFetchUrl() );
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/GitCommandLineUtilsAddTargetTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
index 6574922..5005cee 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
@@ -65,7 +65,7 @@ public class GitCommandLineUtilsAddTargetTest
// https://jira.codehaus.org/browse/SCM-667
final List<File> filesToAdd = Arrays.asList( new File( "C:\\prj\\pom.xml" ),
new File( "c:\\prj\\mod1\\pom.xml" ) );
- final String expectedArguments = "[add, pom.xml, mod1\\pom.xml]";
+ final String expectedArguments = "[add, pom.xml, mod1/pom.xml]";
check( workingDir, filesToAdd, expectedArguments );
}
@@ -108,4 +108,4 @@ public class GitCommandLineUtilsAddTargetTest
{
return Os.isFamily( Os.FAMILY_WINDOWS );
}
-}
\ No newline at end of file
+}
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/changelog/GitChangeLogCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java
index ecc6086..48a8d88 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java
@@ -52,16 +52,14 @@ public class GitChangeLogCommandTest
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", null, (Date) null, (Date) null, 40,
- "git whatchanged --date=iso --max-count=40"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso --max-count=40 -- ." );
}
public void testCommandLineNoDatesLimitedCount()
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", null, (Date) null, (Date) null,
- "git whatchanged --date=iso"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso -- ." );
}
public void testCommandLineWithDates()
@@ -71,8 +69,7 @@ public class GitChangeLogCommandTest
Date endDate = getDate( 2007, Calendar.OCTOBER, 10, GMT_TIME_ZONE );
testCommandLine( "scm:git:http://foo.com/git", null, startDate, endDate,
- "git whatchanged \"--since=2003-09-10 00:00:00 +0000\" \"--until=2007-10-10 00:00:00 +0000\" --date=iso"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged \"--since=2003-09-10 00:00:00 +0000\" \"--until=2007-10-10 00:00:00 +0000\" --date=iso -- ." );
}
public void testCommandLineStartDateOnly()
@@ -81,8 +78,7 @@ public class GitChangeLogCommandTest
Date startDate = getDate( 2003, Calendar.SEPTEMBER, 10, 1, 1, 1, GMT_TIME_ZONE );
testCommandLine( "scm:git:http://foo.com/git", null, startDate, null,
- "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" --date=iso"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" --date=iso -- ." );
}
public void testCommandLineDateFormat()
@@ -92,8 +88,7 @@ public class GitChangeLogCommandTest
Date endDate = getDate( 2005, Calendar.NOVEMBER, 13, 23, 23, 23, GMT_TIME_ZONE );
testCommandLine( "scm:git:http://foo.com/git", null, startDate, endDate,
- "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" \"--until=2005-11-13 23:23:23 +0000\" --date=iso"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" \"--until=2005-11-13 23:23:23 +0000\" --date=iso -- ." );
}
public void testCommandLineDateVersionRanges()
@@ -103,8 +98,7 @@ public class GitChangeLogCommandTest
Date endDate = getDate( 2005, Calendar.NOVEMBER, 13, 23, 23, 23, GMT_TIME_ZONE );
testCommandLine( "scm:git:http://foo.com/git", null, startDate, endDate, new ScmRevision( "1" ), new ScmRevision( "10" ),
- "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" \"--until=2005-11-13 23:23:23 +0000\" --date=iso 1..10"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged \"--since=2003-09-10 01:01:01 +0000\" \"--until=2005-11-13 23:23:23 +0000\" --date=iso 1..10 -- ." );
}
public void testCommandLineEndDateOnly()
@@ -114,16 +108,14 @@ public class GitChangeLogCommandTest
// Only specifying end date should print no dates at all
testCommandLine( "scm:git:http://foo.com/git", null, null, endDate,
- "git whatchanged \"--until=2003-11-10 00:00:00 +0000\" --date=iso"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged \"--until=2003-11-10 00:00:00 +0000\" --date=iso -- ." );
}
public void testCommandLineWithBranchNoDates()
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", new ScmBranch( "my-test-branch" ), (Date) null, (Date) null,
- "git whatchanged --date=iso my-test-branch"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso my-test-branch -- ." );
}
@@ -131,32 +123,28 @@ public class GitChangeLogCommandTest
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", null, new ScmRevision( "1" ), null,
- "git whatchanged --date=iso 1.."
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso 1.. -- ." );
}
public void testCommandLineWithStartVersionAndEndVersion()
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", null, new ScmRevision( "1" ), new ScmRevision( "10" ),
- "git whatchanged --date=iso 1..10"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso 1..10 -- ." );
}
public void testCommandLineWithStartVersionAndEndVersionEquals()
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", null, new ScmRevision( "1" ), new ScmRevision( "1" ),
- "git whatchanged --date=iso 1..1"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso 1..1 -- ." );
}
public void testCommandLineWithStartVersionAndEndVersionAndBranch()
throws Exception
{
testCommandLine( "scm:git:http://foo.com/git", new ScmBranch( "my-test-branch" ), new ScmRevision( "1" ), new ScmRevision( "10" ),
- "git whatchanged --date=iso 1..10 my-test-branch"
- + " -- " + StringUtils.quoteAndEscape( workingDirectory.getPath(), '"' ) );
+ "git whatchanged --date=iso 1..10 my-test-branch -- ." );
}
// ----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
index 1b42d94..3302557 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
@@ -48,7 +48,7 @@ public abstract class GitChangeLogCommandTckTest
public void initRepo()
throws Exception
{
- GitScmTestUtils.initRepo( "src/test/resources/linear-changelog/", getRepositoryRoot(), getWorkingDirectory() );
+ GitScmTestUtils.initRepo( "src/test/resources/linear-changelog/", getRepositoryRoot(), getWorkingCopy() );
}
@Override
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
index ff277b5..12583f6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
@@ -37,7 +37,7 @@ public abstract class GitUpdateCommandTckTest
public void initRepo()
throws Exception
{
- GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory() );
+ GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getWorkingCopy() );
}
@Override