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 ev...@apache.org on 2006/02/07 12:31:02 UTC
svn commit: r375579 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
Author: evenisse
Date: Tue Feb 7 03:30:24 2006
New Revision: 375579
URL: http://svn.apache.org/viewcvs?rev=375579&view=rev
Log:
Use CvsCommandUtil
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java?rev=375579&r1=375578&r2=375579&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java Tue Feb 7 03:30:24 2006
@@ -22,6 +22,7 @@
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.cvslib.command.CvsCommand;
+import org.apache.maven.scm.provider.cvslib.command.CvsCommandUtils;
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -56,25 +57,14 @@
CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
- Commandline cl = new Commandline();
-
- cl.setExecutable( "cvs" );
+ Commandline cl = CvsCommandUtils.getBaseCommand( "checkout", repository, fileSet );
cl.setWorkingDirectory( fileSet.getBasedir().getParentFile().getAbsolutePath() );
- cl.createArgument().setValue( "-f" ); // don't use ~/.cvsrc
-
- cl.createArgument().setValue( "-d" );
-
- cl.createArgument().setValue( repository.getCvsRoot() );
-
- cl.createArgument().setValue( "-q" );
-
- cl.createArgument().setValue( "checkout" );
-
if ( tag != null )
{
- cl.createArgument().setValue( "-r" + tag );
+ cl.createArgument().setValue( "-r" );
+ cl.createArgument().setValue( tag );
}
cl.createArgument().setValue( "-d" );
@@ -91,7 +81,7 @@
getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
getLogger().debug( "Command line: " + cl );
-
+System.out.println("Command line: " + cl );
try
{
exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );