svn commit: r518698 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command: ./ checkin/ tag/ update/

[evenisse]

Author: evenisse
Date: Thu Mar 15 10:17:40 2007
New Revision: 518698

URL: http://svn.apache.org/viewvc?view=rev&rev=518698
Log:
Remove cvsroot from the command when it isn't needed. It fix some pb with 
update when files are updated only on the root directory and not detected.

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java?view=diff&rev=518698&r1=518697&r2=518698
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
 Thu Mar 15 10:17:40 2007
@@ -69,12 +69,24 @@
 
     public static Commandline getBaseCommand( String commandName, 
CvsScmProviderRepository repo, ScmFileSet fileSet )
     {
-        return getBaseCommand( commandName, repo, fileSet, null );
+        return getBaseCommand( commandName, repo, fileSet, null, true );
+    }
+
+    public static Commandline getBaseCommand( String commandName, 
CvsScmProviderRepository repo, ScmFileSet fileSet,
+                                              boolean addCvsRoot )
+    {
+        return getBaseCommand( commandName, repo, fileSet, null, addCvsRoot );
     }
 
     public static Commandline getBaseCommand( String commandName, 
CvsScmProviderRepository repo, ScmFileSet fileSet,
                                               String options )
     {
+        return getBaseCommand( commandName, repo, fileSet, options, true );
+    }
+
+    public static Commandline getBaseCommand( String commandName, 
CvsScmProviderRepository repo, ScmFileSet fileSet,
+                                              String options, boolean 
addCvsRoot )
+    {
         Settings settings = CvsUtil.getSettings();
 
         Commandline cl = new Commandline();
@@ -127,9 +139,12 @@
             }
         }
 
-        cl.createArgument().setValue( "-d" );
+        if ( addCvsRoot )
+        {
+            cl.createArgument().setValue( "-d" );
 
-        cl.createArgument().setValue( repo.getCvsRoot() );
+            cl.createArgument().setValue( repo.getCvsRoot() );
+        }
 
         cl.createArgument().setLine( options );
 

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java?view=diff&rev=518698&r1=518697&r2=518698
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
 Thu Mar 15 10:17:40 2007
@@ -49,7 +49,7 @@
     {
         CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
 
-        Commandline cl = CvsCommandUtils.getBaseCommand( "commit", repository, 
fileSet );
+        Commandline cl = CvsCommandUtils.getBaseCommand( "commit", repository, 
fileSet, false );
 
         if ( !StringUtils.isEmpty( tag ) )
         {

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java?view=diff&rev=518698&r1=518697&r2=518698
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
 Thu Mar 15 10:17:40 2007
@@ -44,7 +44,7 @@
     {
         CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
 
-        Commandline cl = CvsCommandUtils.getBaseCommand( "tag", repository, 
fileSet );
+        Commandline cl = CvsCommandUtils.getBaseCommand( "tag", repository, 
fileSet, false );
 
         cl.createArgument().setValue( "-F" );
 

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java?view=diff&rev=518698&r1=518697&r2=518698
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
 Thu Mar 15 10:17:40 2007
@@ -43,7 +43,7 @@
     {
         CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
 
-        Commandline cl = CvsCommandUtils.getBaseCommand( "update", repository, 
fileSet );
+        Commandline cl = CvsCommandUtils.getBaseCommand( "update", repository, 
fileSet, false );
 
         cl.createArgument().setValue( "-d" );