You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2008/08/16 23:52:47 UTC
svn commit: r686566 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src:
main/java/org/apache/maven/scm/provider/hg/
main/java/org/apache/maven/scm/provider/hg/command/
main/java/org/apache/maven/scm/provider/hg/command/add/ main/java/o...
Author: olamy
Date: Sat Aug 16 14:52:46 2008
New Revision: 686566
URL: http://svn.apache.org/viewvc?rev=686566&view=rev
Log:
fix checkstyle errors
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java (contents, props changed)
- copied, changed from r686558, maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
Removed:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java Sat Aug 16 14:52:46 2008
@@ -22,7 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.codehaus.plexus.util.cli.Commandline;
@@ -83,7 +83,7 @@
public static HgVersionConsumer getHgVersion( File workingDir )
throws ScmException
{
- String[] versionCmd = new String[]{HgCommand.VERSION};
+ String[] versionCmd = new String[]{HgCommandConstants.VERSION};
HgVersionConsumer consumer = new HgVersionConsumer( HG_VERSION_TAG );
Commandline cmd = HgUtils.buildCmd( workingDir, versionCmd );
@@ -105,7 +105,7 @@
*/
private static boolean compareVersion( String version1, String version2 )
{
- int l1, l2, i;
+ int l1, l2;
String v1, v2;
v1 = version1;
@@ -145,10 +145,10 @@
private String versionTag;
- HgVersionConsumer( String version_tag )
+ HgVersionConsumer( String versionTag )
{
super( new DefaultLog() );
- this.versionTag = version_tag;
+ this.versionTag = versionTag;
}
public void doConsume( ScmFileStatus status, String line )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java Sat Aug 16 14:52:46 2008
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -29,11 +33,10 @@
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.command.status.StatusScmResult;
-import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
+import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.provider.AbstractScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.hg.command.tag.HgTagCommand;
import org.apache.maven.scm.provider.hg.command.add.HgAddCommand;
import org.apache.maven.scm.provider.hg.command.changelog.HgChangeLogCommand;
import org.apache.maven.scm.provider.hg.command.checkin.HgCheckInCommand;
@@ -41,15 +44,12 @@
import org.apache.maven.scm.provider.hg.command.diff.HgDiffCommand;
import org.apache.maven.scm.provider.hg.command.remove.HgRemoveCommand;
import org.apache.maven.scm.provider.hg.command.status.HgStatusCommand;
+import org.apache.maven.scm.provider.hg.command.tag.HgTagCommand;
import org.apache.maven.scm.provider.hg.command.update.HgUpdateCommand;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.repository.UnknownRepositoryStructure;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Mercurial (HG) is a decentralized revision control system.
* <a href="http://www.selenic.com/mercurial">http://www.selenic.com/mercurial</a>
@@ -70,9 +70,9 @@
private static class HgUrlParserResult
{
- List messages = new ArrayList();
+ private List messages = new ArrayList();
- ScmProviderRepository repository;
+ private ScmProviderRepository repository;
}
/** {@inheritDoc} */
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java Sat Aug 16 14:52:46 2008
@@ -25,7 +25,7 @@
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.log.DefaultLog;
import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -66,7 +66,7 @@
diffExitCodes.add( new Integer( 0 ) ); //No difference
diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or changes in diff-like
diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
- EXIT_CODE_MAP.put( HgCommand.DIFF_CMD, diffExitCodes );
+ EXIT_CODE_MAP.put( HgCommandConstants.DIFF_CMD, diffExitCodes );
}
public static ScmResult execute( HgConsumer consumer, ScmLogger logger, File workingDir, String[] cmdAndArgs )
@@ -125,7 +125,7 @@
throws ScmException
{
Commandline cmd = new Commandline();
- cmd.setExecutable( HgCommand.EXEC );
+ cmd.setExecutable( HgCommandConstants.EXEC );
cmd.setWorkingDirectory( workingDir.getAbsolutePath() );
cmd.addArguments( cmdAndArgs );
@@ -188,7 +188,7 @@
throws ScmException
{
- String[] revCmd = new String[]{HgCommand.REVNO_CMD};
+ String[] revCmd = new String[]{HgCommandConstants.REVNO_CMD};
HgRevNoConsumer consumer = new HgRevNoConsumer( logger );
HgUtils.execute( consumer, logger, workingDir, revCmd );
Copied: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java (from r686558, maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java)
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java?p2=maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java&r1=686558&r2=686566&rev=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java Sat Aug 16 14:52:46 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.scm.command.Command;
/**
* Available/Used hg commands.
@@ -30,92 +29,92 @@
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
* @version $Id$
*/
-public interface HgCommand
- extends Command
+public class HgCommandConstants
{
/**
* Executable for Hg
*/
- String EXEC = "hg";
+ public static final String EXEC = "hg";
/**
* Use to create an empty branch or before importing an existing project
*/
- String INIT_CMD = "init";
+ public static final String INIT_CMD = "init";
/**
* Default recursive. Common option: --dry-run and --no-recursive
*/
- String ADD_CMD = "add";
+ public static final String ADD_CMD = "add";
/**
* Reports the following states: added, removed, modified, unchanged, unknown
*/
- String STATUS_CMD = "status";
+ public static final String STATUS_CMD = "status";
/**
* Make a file unversioned
*/
- String REMOVE_CMD = "remove";
+ public static final String REMOVE_CMD = "remove";
/**
* Create a new copy of a branch. Alias get or clone
*/
- String BRANCH_CMD = "clone";
+ public static final String BRANCH_CMD = "clone";
/**
* Commit changes into a new revision
*/
- String COMMIT_CMD = "commit";
+ public static final String COMMIT_CMD = "commit";
/**
* Pull any changes from another branch into the current one
*/
- String PULL_CMD = "pull";
+ public static final String PULL_CMD = "pull";
/**
* Show log of this branch Common option: --revision
*/
- String LOG_CMD = "log";
+ public static final String LOG_CMD = "log";
/**
* Show differences in workingtree. Common option: --revision
*/
- String DIFF_CMD = "diff";
+ public static final String DIFF_CMD = "diff";
/**
* Push this branch into another branch
*/
- String PUSH_CMD = "push";
+ public static final String PUSH_CMD = "push";
/**
* Show current revision number
*/
- String REVNO_CMD = "id";
+ public static final String REVNO_CMD = "id";
/**
* Tag this revision
*/
- String TAG_CMD = "tag";
+ public static final String TAG_CMD = "tag";
/**
* Show list of the current working copy or a revision
*/
- String INVENTORY_CMD = "locate";
+ public static final String INVENTORY_CMD = "locate";
/**
* no recurse option does not exist in mercurial
*/
- String NO_RECURSE_OPTION = "";
+ public static final String NO_RECURSE_OPTION = "";
- String MESSAGE_OPTION = "--message";
+ public static final String MESSAGE_OPTION = "--message";
- String REVISION_OPTION = "-r";
+ public static final String REVISION_OPTION = "-r";
- String VERBOSE_OPTION = "--verbose";
+ public static final String VERBOSE_OPTION = "--verbose";
- String VERSION = "version";
+ public static final String VERSION = "version";
- String CHECK = "check";
- String ALL_OPTION = "-A";
+ public static final String CHECK = "check";
+
+ public static final String ALL_OPTION = "-A";
}
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java Sat Aug 16 14:52:46 2008
@@ -19,17 +19,18 @@
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.add.AbstractAddCommand;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
-
-import java.io.File;
-import java.util.Iterator;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
/**
* Add no recursive.
@@ -39,7 +40,7 @@
*/
public class HgAddCommand
extends AbstractAddCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
@@ -47,7 +48,7 @@
throws ScmException
{
//String[] addCmd = new String[] { ADD_CMD, NO_RECURSE_OPTION };
- String[] addCmd = new String[]{ADD_CMD, VERBOSE_OPTION};
+ String[] addCmd = new String[] { HgCommandConstants.ADD_CMD, HgCommandConstants.VERBOSE_OPTION };
addCmd = HgUtils.expandCommandLine( addCmd, fileSet );
File workingDir = fileSet.getBasedir();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java Sat Aug 16 14:52:46 2008
@@ -24,12 +24,13 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import java.util.ArrayList;
import java.util.Date;
@@ -42,7 +43,7 @@
*/
public class HgChangeLogCommand
extends AbstractChangeLogCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository scmProviderRepository,
@@ -50,7 +51,7 @@
ScmBranch branch, String datePattern )
throws ScmException
{
- String[] cmd = new String[]{LOG_CMD, VERBOSE_OPTION};
+ String[] cmd = new String[] { HgCommandConstants.LOG_CMD, HgCommandConstants.VERBOSE_OPTION };
HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(), datePattern );
ScmResult result = HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java Sat Aug 16 14:52:46 2008
@@ -30,7 +30,7 @@
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.command.status.HgStatusCommand;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
@@ -87,7 +87,7 @@
}
// Commit to local branch
- String[] commitCmd = new String[]{HgCommand.COMMIT_CMD, HgCommand.MESSAGE_OPTION, message};
+ String[] commitCmd = new String[]{HgCommandConstants.COMMIT_CMD, HgCommandConstants.MESSAGE_OPTION, message};
commitCmd = HgUtils.expandCommandLine( commitCmd, fileSet );
ScmResult result =
HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), commitCmd );
@@ -96,7 +96,7 @@
HgScmProviderRepository repository = (HgScmProviderRepository) repo;
if ( !repository.getURI().equals( fileSet.getBasedir().getAbsolutePath() ) )
{
- String[] pushCmd = new String[]{HgCommand.PUSH_CMD, repository.getURI()};
+ String[] pushCmd = new String[]{HgCommandConstants.PUSH_CMD, repository.getURI()};
result = HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), pushCmd );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java Sat Aug 16 14:52:46 2008
@@ -23,11 +23,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
@@ -42,7 +43,7 @@
*/
public class HgCheckOutCommand
extends AbstractCheckOutCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet,
@@ -64,14 +65,17 @@
}
// Do the actual checkout
- String[] checkoutCmd = new String[]{BRANCH_CMD, REVISION_OPTION,
- scmVersion != null && !StringUtils.isEmpty( scmVersion.getName() ) ? scmVersion.getName() : "tip", url,
- checkoutDir.getAbsolutePath()};
+ String[] checkoutCmd = new String[] {
+ HgCommandConstants.BRANCH_CMD,
+ HgCommandConstants.REVISION_OPTION,
+ scmVersion != null && !StringUtils.isEmpty( scmVersion.getName() ) ? scmVersion.getName() : "tip",
+ url,
+ checkoutDir.getAbsolutePath() };
HgConsumer checkoutConsumer = new HgConsumer( getLogger() );
HgUtils.execute( checkoutConsumer, getLogger(), checkoutDir.getParentFile(), checkoutCmd );
// Do inventory to find list of checkedout files
- String[] inventoryCmd = new String[]{INVENTORY_CMD};
+ String[] inventoryCmd = new String[] { HgCommandConstants.INVENTORY_CMD };
HgCheckOutConsumer consumer = new HgCheckOutConsumer( getLogger(), checkoutDir );
ScmResult result = HgUtils.execute( consumer, getLogger(), checkoutDir, inventoryCmd );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java Sat Aug 16 14:52:46 2008
@@ -23,11 +23,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.diff.AbstractDiffCommand;
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -36,7 +37,7 @@
*/
public class HgDiffCommand
extends AbstractDiffCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet,
@@ -51,11 +52,11 @@
{
revArg += ".." + endRevision;
}
- diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, revArg};
+ diffCmd = new String[] { HgCommandConstants.DIFF_CMD, HgCommandConstants.REVISION_OPTION, revArg };
}
else
{
- diffCmd = new String[]{DIFF_CMD};
+ diffCmd = new String[] { HgCommandConstants.DIFF_CMD };
}
diffCmd = HgUtils.expandCommandLine( diffCmd, fileSet );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java Sat Aug 16 14:52:46 2008
@@ -25,11 +25,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.list.AbstractListCommand;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
/**
* Get a list of all files in the repository
@@ -39,7 +40,7 @@
*/
public class HgListCommand
extends AbstractListCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected ListScmResult executeListCommand( ScmProviderRepository repository, ScmFileSet fileSet,
@@ -47,7 +48,7 @@
throws ScmException
{
- if ( fileSet.getFiles().length != 0 )
+ if ( fileSet.getFileList().size() != 0 )
{
throw new ScmException( "This provider doesn't support listing subsets of a directory" );
}
@@ -55,7 +56,7 @@
File workingDir = fileSet.getBasedir();
// build the command
- String[] listCmd = new String[] { STATUS_CMD, ALL_OPTION };
+ String[] listCmd = new String[] { HgCommandConstants.STATUS_CMD, HgCommandConstants.ALL_OPTION };
// keep the command about in string form for reporting
StringBuffer cmd = new StringBuffer();
@@ -64,7 +65,9 @@
String s = listCmd[i];
cmd.append( s );
if ( i < listCmd.length - 1 )
+ {
cmd.append( " " );
+ }
}
HgListConsumer consumer = new HgListConsumer( getLogger() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveCommand.java Sat Aug 16 14:52:46 2008
@@ -22,11 +22,12 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.remove.AbstractRemoveCommand;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import java.io.File;
@@ -36,14 +37,14 @@
*/
public class HgRemoveCommand
extends AbstractRemoveCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected ScmResult executeRemoveCommand( ScmProviderRepository repository, ScmFileSet fileSet, String message )
throws ScmException
{
- String[] command = new String[]{REMOVE_CMD};
+ String[] command = new String[] { HgCommandConstants.REMOVE_CMD };
HgUtils.expandCommandLine( command, fileSet );
File workingDir = fileSet.getBasedir();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusCommand.java Sat Aug 16 14:52:46 2008
@@ -19,24 +19,26 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.status.AbstractStatusCommand;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
-
-import java.io.File;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
-/**
+/*
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ *
* @version $Id$
*/
public class HgStatusCommand
extends AbstractStatusCommand
- implements HgCommand
+ implements Command
{
public HgStatusCommand()
@@ -51,7 +53,7 @@
File workingDir = fileSet.getBasedir();
HgStatusConsumer consumer = new HgStatusConsumer( getLogger(), workingDir );
- String[] statusCmd = new String[]{STATUS_CMD};
+ String[] statusCmd = new String[] { HgCommandConstants.STATUS_CMD };
ScmResult result = HgUtils.execute( consumer, getLogger(), workingDir, statusCmd );
return new StatusScmResult( consumer.getStatus(), result );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java Sat Aug 16 14:52:46 2008
@@ -29,11 +29,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.command.inventory.HgListConsumer;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
@@ -47,11 +48,11 @@
*/
public class HgTagCommand
extends AbstractTagCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
- protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository, ScmFileSet fileSet,
- String tag, String message )
+ protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository, ScmFileSet fileSet, String tag,
+ String message )
throws ScmException
{
@@ -68,7 +69,7 @@
File workingDir = fileSet.getBasedir();
// build the command
- String[] tagCmd = new String[] { TAG_CMD, MESSAGE_OPTION, message, tag };
+ String[] tagCmd = new String[] { HgCommandConstants.TAG_CMD, HgCommandConstants.MESSAGE_OPTION, message, tag };
// keep the command about in string form for reporting
StringBuffer cmd = joinCmd( tagCmd );
@@ -82,9 +83,8 @@
// Push to parent branch if any
if ( !repository.getURI().equals( fileSet.getBasedir().getAbsolutePath() ) )
{
- String[] pushCmd = new String[] { HgCommand.PUSH_CMD, repository.getURI() };
- result =
- HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), pushCmd );
+ String[] pushCmd = new String[] { HgCommandConstants.PUSH_CMD, repository.getURI() };
+ result = HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), pushCmd );
}
}
else
@@ -93,7 +93,7 @@
}
// do an inventory to return the files tagged (all of them)
- String[] listCmd = new String[] { HgCommand.INVENTORY_CMD };
+ String[] listCmd = new String[] { HgCommandConstants.INVENTORY_CMD };
HgListConsumer listconsumer = new HgListConsumer( getLogger() );
result = HgUtils.execute( listconsumer, getLogger(), fileSet.getBasedir(), listCmd );
if ( result.isSuccess() )
@@ -105,7 +105,9 @@
ScmFile f = (ScmFile) i.next();
if ( !f.getPath().endsWith( ".hgtags" ) )
+ {
fileList.add( new ScmFile( f.getPath(), ScmFileStatus.TAGGED ) );
+ }
}
return new TagScmResult( fileList, result );
@@ -124,7 +126,9 @@
String s = cmd[i];
result.append( s );
if ( i < cmd.length - 1 )
+ {
result.append( " " );
+ }
}
return result;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java Sat Aug 16 14:52:46 2008
@@ -19,37 +19,38 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.changelog.ChangeLogCommand;
import org.apache.maven.scm.command.update.AbstractUpdateCommand;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.command.changelog.HgChangeLogCommand;
import org.apache.maven.scm.provider.hg.command.diff.HgDiffConsumer;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
* @version $Id$
*/
public class HgUpdateCommand
extends AbstractUpdateCommand
- implements HgCommand
+ implements Command
{
/** {@inheritDoc} */
protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet, ScmVersion tag )
@@ -58,8 +59,10 @@
File workingDir = fileSet.getBasedir();
// Update branch
- String[] updateCmd = new String[]{HgCommand.PULL_CMD, REVISION_OPTION,
- tag != null && !StringUtils.isEmpty( tag.getName() ) ? tag.getName() : "tip"};
+ String[] updateCmd = new String[] {
+ HgCommandConstants.PULL_CMD,
+ HgCommandConstants.REVISION_OPTION,
+ tag != null && !StringUtils.isEmpty( tag.getName() ) ? tag.getName() : "tip" };
ScmResult updateResult = HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), workingDir, updateCmd );
if ( !updateResult.isSuccess() )
@@ -70,7 +73,10 @@
// Find changes from last revision
int currentRevision = HgUtils.getCurrentRevisionNumber( getLogger(), workingDir );
int previousRevision = currentRevision - 1;
- String[] diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, "" + previousRevision};
+ String[] diffCmd = new String[] {
+ HgCommandConstants.DIFF_CMD,
+ HgCommandConstants.REVISION_OPTION,
+ "" + previousRevision };
HgDiffConsumer diffConsumer = new HgDiffConsumer( getLogger(), workingDir );
ScmResult diffResult = HgUtils.execute( diffConsumer, getLogger(), workingDir, diffCmd );
@@ -96,7 +102,6 @@
return new UpdateScmResultWithRevision( updatedFiles, changes, String.valueOf( currentRevision ), diffResult );
}
-
protected ChangeLogCommand getChangeLogCommand()
{
HgChangeLogCommand command = new HgChangeLogCommand();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java?rev=686566&r1=686565&r2=686566&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java Sat Aug 16 14:52:46 2008
@@ -21,7 +21,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
+import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -78,7 +78,7 @@
}
// Init repository
- String[] init_cmd = new String[]{HgCommand.INIT_CMD};
+ String[] init_cmd = new String[]{HgCommandConstants.INIT_CMD};
HgUtils.execute( WORKING_DIR, init_cmd );
// Create and add files to repository
@@ -102,7 +102,7 @@
}
//Add to repository
- String[] add_cmd = new String[]{HgCommand.ADD_CMD};
+ String[] add_cmd = new String[]{HgCommandConstants.ADD_CMD};
ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), files );
add_cmd = HgUtils.expandCommandLine( add_cmd, filesToAdd );
ScmResult result = HgUtils.execute( WORKING_DIR, add_cmd );
@@ -114,7 +114,7 @@
}
// Commit the initial repository
- String[] commit_cmd = new String[]{HgCommand.COMMIT_CMD, HgCommand.MESSAGE_OPTION, COMMIT_MESSAGE};
+ String[] commit_cmd = new String[]{HgCommandConstants.COMMIT_CMD, HgCommandConstants.MESSAGE_OPTION, COMMIT_MESSAGE};
result = HgUtils.execute( WORKING_DIR, commit_cmd );
if ( !result.isSuccess() )
{