Author: handyande
Date: Sat Dec 15 10:20:50 2007
New Revision: 604480
URL: http://svn.apache.org/viewvc?rev=604480&view=rev
Log:
Actually list files that have been deleted in update/status/diff even though
the files no longer exist
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.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/status/CvsStatusConsumer.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/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/status/SvnStatusConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java?rev=604480&r1=604479&r2=604480&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
Sat Dec 15 10:20:50 2007
@@ -153,6 +153,11 @@
private boolean addChangedFile( ScmFileStatus status, String tmpLine )
{
File tmpFile = new File( workingDirectory, tmpLine );
+ if ( status.equals( ScmFileStatus.DELETED ) )
+ {
+ return true;
+ }
+
if ( tmpFile.isFile() )
{
currentFile = tmpLine;
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/status/CvsStatusConsumer.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/status/CvsStatusConsumer.java?rev=604480&r1=604479&r2=604480&view=diff
==============================================================================
---
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/status/CvsStatusConsumer.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/status/CvsStatusConsumer.java
Sat Dec 15 10:20:50 2007
@@ -110,7 +110,7 @@
}
// If the file isn't a file; don't add it.
- if ( !new File( workingDirectory, file ).isFile() )
+ if ( !status.equals( ScmFileStatus.DELETED ) && !new File(
workingDirectory, file ).isFile() )
{
return;
}
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=604480&r1=604479&r2=604480&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
Sat Dec 15 10:20:50 2007
@@ -20,6 +20,7 @@
*/
import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
@@ -70,7 +71,9 @@
{
for ( Iterator it = files.iterator(); it.hasNext(); )
{
- if ( !new File( workingDirectory, ( (ScmFile) it.next()
).getPath() ).isFile() )
+ ScmFile file = (ScmFile) it.next();
+
+ if ( !file.getStatus().equals( ScmFileStatus.DELETED ) && !new
File( workingDirectory, file.getPath() ).isFile() )
{
it.remove();
}
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/status/SvnStatusConsumer.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/status/SvnStatusConsumer.java?rev=604480&r1=604479&r2=604480&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/status/SvnStatusConsumer.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/status/SvnStatusConsumer.java
Sat Dec 15 10:20:50 2007
@@ -178,7 +178,7 @@
}
// If the file isn't a file; don't add it.
- if ( !new File( workingDirectory, file ).isFile() )
+ if ( !status.equals( ScmFileStatus.DELETED ) && !new File(
workingDirectory, file ).isFile() )
{
return;
}
