You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by im...@apache.org on 2014/07/20 13:57:09 UTC
[4/7] git commit: implement new method from interface on all
GitCommands
implement new method from interface on all GitCommands
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/0128678e
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/0128678e
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/0128678e
Branch: refs/heads/MRELEASE-875
Commit: 0128678ec0fce56b353f7fbe1e24beda0c183693
Parents: 2e7cf44
Author: imod <do...@fortysix.ch>
Authored: Sun Jul 20 13:00:15 2014 +0200
Committer: imod <do...@fortysix.ch>
Committed: Sun Jul 20 13:07:47 2014 +0200
----------------------------------------------------------------------
.../git/gitexe/command/add/GitAddCommand.java | 7 +++++++
.../git/gitexe/command/blame/GitBlameCommand.java | 11 +++++++++--
.../git/gitexe/command/branch/GitBranchCommand.java | 8 +++++++-
.../command/changelog/GitChangeLogCommand.java | 8 +++++++-
.../gitexe/command/checkin/GitCheckInCommand.java | 8 +++++++-
.../gitexe/command/checkout/GitCheckOutCommand.java | 16 ++++++++++------
.../git/gitexe/command/diff/GitDiffCommand.java | 8 +++++++-
.../git/gitexe/command/info/GitInfoCommand.java | 6 ++++++
.../git/gitexe/command/list/GitListCommand.java | 8 +++++++-
.../command/remoteinfo/GitRemoteInfoCommand.java | 6 ++++++
.../git/gitexe/command/remove/GitRemoveCommand.java | 8 +++++++-
.../git/gitexe/command/status/GitStatusCommand.java | 16 +++++++++++-----
.../git/gitexe/command/tag/GitTagCommand.java | 14 ++++++++++----
.../git/gitexe/command/update/GitUpdateCommand.java | 8 +++++++-
.../git/jgit/command/add/JGitAddCommand.java | 7 +++++++
.../git/jgit/command/blame/JGitBlameCommand.java | 6 ++++++
.../git/jgit/command/branch/JGitBranchCommand.java | 6 ++++++
.../command/changelog/JGitChangeLogCommand.java | 6 ++++++
.../jgit/command/checkin/JGitCheckInCommand.java | 6 ++++++
.../jgit/command/checkout/JGitCheckOutCommand.java | 7 +++++++
.../git/jgit/command/diff/JGitDiffCommand.java | 6 ++++++
.../git/jgit/command/list/JGitListCommand.java | 6 ++++++
.../command/remoteinfo/JGitRemoteInfoCommand.java | 6 ++++++
.../git/jgit/command/status/JGitStatusCommand.java | 7 +++++++
.../git/jgit/command/tag/JGitTagCommand.java | 6 ++++++
25 files changed, 177 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
----------------------------------------------------------------------
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/add/GitAddCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
index c920dc5..2f77ac8 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
@@ -49,6 +49,13 @@ public class GitAddCommand
extends AbstractAddCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
----------------------------------------------------------------------
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/blame/GitBlameCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
index 0256ece..d2acb69 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
@@ -45,13 +45,20 @@ public class GitBlameCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet workingDirectory,
CommandParameters parameters )
throws ScmException
{
String filename = parameters.getString( CommandParameter.FILE );
- Commandline cl = createCommandLine( workingDirectory.getBasedir(), filename,
- parameters.getBoolean( CommandParameter.IGNORE_WHITESPACE, false ) );
+ Commandline cl =
+ createCommandLine( workingDirectory.getBasedir(), filename,
+ parameters.getBoolean( CommandParameter.IGNORE_WHITESPACE, false ) );
GitBlameConsumer consumer = new GitBlameConsumer( getLogger() );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
----------------------------------------------------------------------
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/branch/GitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
index 13b4751..bb01f4b 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
@@ -40,12 +40,18 @@ import java.io.File;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitBranchCommand
extends AbstractBranchCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch, String message )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/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
----------------------------------------------------------------------
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 3149faa..80af02e 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
@@ -43,12 +43,18 @@ import java.util.TimeZone;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author Olivier Lamy
- *
*/
public class GitChangeLogCommand
extends AbstractChangeLogCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/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
----------------------------------------------------------------------
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 8af561f..de3be28 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
@@ -50,12 +50,18 @@ import java.util.List;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
* @author Olivier Lamy
- *
*/
public class GitCheckInCommand
extends AbstractCheckInCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
ScmVersion version )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/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
----------------------------------------------------------------------
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 33431e5..5c8cba1 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
@@ -43,19 +43,23 @@ import java.io.File;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitCheckOutCommand
extends AbstractCheckOutCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return false;
+ }
+
/**
- * For git, the given repository is a remote one.
- * We have to clone it first if the working directory does not contain a git repo yet,
- * otherwise we have to git-pull it.
+ * For git, the given repository is a remote one. We have to clone it first if the working directory does not
+ * contain a git repo yet, otherwise we have to git-pull it.
* <p/>
- * TODO We currently assume a '.git' directory, so this does not work for --bare repos
- * {@inheritDoc}
+ * TODO We currently assume a '.git' directory, so this does not work for --bare repos {@inheritDoc}
*/
protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet,
ScmVersion version, boolean recursive )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
----------------------------------------------------------------------
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/diff/GitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
index 7547e63..51a7812 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
@@ -36,12 +36,18 @@ import java.io.File;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitDiffCommand
extends AbstractDiffCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet,
ScmVersion startVersion, ScmVersion endVersion )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java
----------------------------------------------------------------------
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/GitInfoCommand.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/GitInfoCommand.java
index 7aac9b7..2848944 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/GitInfoCommand.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/GitInfoCommand.java
@@ -44,6 +44,12 @@ public class GitInfoCommand
public static final int NO_REVISION_LENGTH = -1;
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
----------------------------------------------------------------------
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/list/GitListCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
index 27a90f8..b36dfcd 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
@@ -36,12 +36,18 @@ import java.io.File;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitListCommand
extends AbstractListCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
protected ListScmResult executeListCommand( ScmProviderRepository repo, ScmFileSet fileSet, boolean recursive,
ScmVersion scmVersion )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoCommand.java
----------------------------------------------------------------------
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/remoteinfo/GitRemoteInfoCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoCommand.java
index 2c8264a..dc323c6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoCommand.java
@@ -40,6 +40,12 @@ public class GitRemoteInfoCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
public RemoteInfoScmResult executeRemoteInfoCommand( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
----------------------------------------------------------------------
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/remove/GitRemoveCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
index 604cfe4..a2beb48 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
@@ -36,12 +36,18 @@ import java.util.List;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
* @author Olivier Lamy
- *
*/
public class GitRemoveCommand
extends AbstractRemoveCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java
----------------------------------------------------------------------
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/status/GitStatusCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java
index d1be13b..dfbedb2 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java
@@ -35,23 +35,29 @@ import org.codehaus.plexus.util.cli.Commandline;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- *
*/
public class GitStatusCommand
extends AbstractStatusCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
protected StatusScmResult executeStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
throws ScmException
{
- Commandline clRevparse = createRevparseShowToplevelCommand(fileSet);
-
- CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
+ Commandline clRevparse = createRevparseShowToplevelCommand( fileSet );
+
+ CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
URI relativeRepositoryPath = null;
-
+
int exitCode;
exitCode = GitCommandLineUtils.execute( clRevparse, stdout, stderr, getLogger() );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/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
----------------------------------------------------------------------
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 daf9576..b713dc0 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
@@ -43,21 +43,27 @@ import org.codehaus.plexus.util.cli.Commandline;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitTagCommand
extends AbstractTagCommand
implements GitCommand
{
-
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message )
throws ScmException
{
return executeTagCommand( repo, fileSet, tag, new ScmTagParameters( message ) );
}
-
+
/** {@inheritDoc} */
- public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, ScmTagParameters scmTagParameters )
+ public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag,
+ ScmTagParameters scmTagParameters )
throws ScmException
{
if ( tag == null || StringUtils.isEmpty( tag.trim() ) )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
----------------------------------------------------------------------
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/update/GitUpdateCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
index cc8c2fa..08d628f 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
@@ -43,12 +43,18 @@ import org.codehaus.plexus.util.cli.Commandline;
* @author Olivier Lamy
* @author <a href="mailto:struberg@yahoo.de">struberg</a>
* @since 10 august 2008
- *
*/
public class GitUpdateCommand
extends AbstractUpdateCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/** {@inheritDoc} */
protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet,
ScmVersion scmVersion )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/add/JGitAddCommand.java
----------------------------------------------------------------------
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/add/JGitAddCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/add/JGitAddCommand.java
index b448b62..85d0212 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/add/JGitAddCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/add/JGitAddCommand.java
@@ -41,6 +41,13 @@ public class JGitAddCommand
extends AbstractAddCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
----------------------------------------------------------------------
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/blame/JGitBlameCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
index 043af04..dd965ba 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
@@ -44,6 +44,12 @@ public class JGitBlameCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
public BlameScmResult executeBlameCommand( ScmProviderRepository repo, ScmFileSet workingDirectory, String filename )
throws ScmException
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
----------------------------------------------------------------------
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/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
index b42afe6..1938609 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
@@ -56,6 +56,12 @@ public class JGitBranchCommand
implements GitCommand
{
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java
----------------------------------------------------------------------
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/changelog/JGitChangeLogCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java
index 933255f..028edf6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java
@@ -53,6 +53,12 @@ public class JGitChangeLogCommand
implements GitCommand
{
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
----------------------------------------------------------------------
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/checkin/JGitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
index b998638..3d279f1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
@@ -72,6 +72,12 @@ public class JGitCheckInCommand
protected static final String GIT_FORCE = "forceUsername";
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
----------------------------------------------------------------------
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/checkout/JGitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
index 43b39f9..cdb95aa 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
@@ -58,6 +58,13 @@ public class JGitCheckOutCommand
extends AbstractCheckOutCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return false;
+ }
+
/**
* For git, the given repository is a remote one. We have to clone it first if the working directory does not
* contain a git repo yet, otherwise we have to git-pull it.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java
----------------------------------------------------------------------
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/diff/JGitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java
index a543ef8..0d9f945 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java
@@ -52,6 +52,12 @@ public class JGitDiffCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
protected DiffScmResult executeDiffCommand( ScmProviderRepository repository, ScmFileSet fileSet,
ScmVersion startRevision, ScmVersion endRevision )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java
----------------------------------------------------------------------
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/list/JGitListCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java
index 054f9bc..d5d9276 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java
@@ -48,6 +48,12 @@ public class JGitListCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
protected ListScmResult executeListCommand( ScmProviderRepository repo, ScmFileSet fileSet, boolean recursive,
ScmVersion scmVersion )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java
----------------------------------------------------------------------
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/remoteinfo/JGitRemoteInfoCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java
index 36c90a5..2571b3b 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java
@@ -48,6 +48,12 @@ public class JGitRemoteInfoCommand
{
@Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
+ @Override
public RemoteInfoScmResult executeRemoteInfoCommand( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java
----------------------------------------------------------------------
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/status/JGitStatusCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java
index 056843e..0834fe0 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java
@@ -44,6 +44,13 @@ public class JGitStatusCommand
extends AbstractStatusCommand
implements GitCommand
{
+
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0128678e/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
----------------------------------------------------------------------
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/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
index a66992a..3b04701 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
@@ -53,6 +53,12 @@ public class JGitTagCommand
implements GitCommand
{
+ @Override
+ public boolean requiresToWorkInRepoRootDir()
+ {
+ return true;
+ }
+
public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message )
throws ScmException
{