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 2009/05/15 22:56:03 UTC
svn commit: r775331 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command:
AbstractFileCheckingConsumer.java checkout/SvnCheckOutConsumer.java
Author: olamy
Date: Fri May 15 20:56:02 2009
New Revision: 775331
URL: http://svn.apache.org/viewvc?rev=775331&view=rev
Log:
[SCM-472] svn tck broken
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=775331&r1=775330&r2=775331&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java Fri May 15 20:56:02 2009
@@ -72,6 +72,7 @@
protected List getFiles()
{
+
if ( !filtered )
{
for ( Iterator it = files.iterator(); it.hasNext(); )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java?rev=775331&r1=775330&r2=775331&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java Fri May 15 20:56:02 2009
@@ -25,6 +25,8 @@
import org.apache.maven.scm.provider.svn.svnexe.command.AbstractFileCheckingConsumer;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
/**
@@ -36,11 +38,13 @@
{
private static final String CHECKED_OUT_REVISION_TOKEN = "Checked out revision";
+ private List files = new ArrayList();
+
public SvnCheckOutConsumer( ScmLogger logger, File workingDirectory )
{
super( logger, workingDirectory );
}
-
+
/** {@inheritDoc} */
protected void parseLine( String line )
{
@@ -84,4 +88,31 @@
{
return getFiles();
}
+
+ protected void addFile( ScmFile file )
+ {
+ files.add( file );
+ }
+
+ protected List getFiles()
+ {
+ List onlyFiles = new ArrayList();
+ for ( Iterator it = files.iterator(); it.hasNext(); )
+ {
+ ScmFile file = (ScmFile) it.next();
+
+ if ( !file.getStatus().equals( ScmFileStatus.DELETED )
+ && !new File( file.getPath() ).isFile() )
+ {
+ // no op
+ }
+ else
+ {
+ onlyFiles.add( file );
+ }
+ }
+
+ return onlyFiles;
+ }
+
}