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/01/23 17:52:42 UTC
svn commit: r371591 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java
Author: evenisse
Date: Mon Jan 23 08:52:33 2006
New Revision: 371591
URL: http://svn.apache.org/viewcvs?rev=371591&view=rev
Log:
Add locked file status.
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java?rev=371591&r1=371590&r2=371591&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Mon Jan 23 08:52:33 2006
@@ -40,6 +40,8 @@
public static final ScmFileStatus MODIFIED = new ScmFileStatus( "modified" );
+ public static final ScmFileStatus LOCKED = new ScmFileStatus( "locked" );
+
public static final ScmFileStatus UNKNOWN = new ScmFileStatus( "unknown" );
private String name;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java?rev=371591&r1=371590&r2=371591&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/status/SvnStatusConsumer.java Mon Jan 23 08:52:33 2006
@@ -88,11 +88,15 @@
{
status = ScmFileStatus.CONFLICT;
}
+ else if ( statusString.equals( "L" ) )
+ {
+ status = ScmFileStatus.LOCKED;
+ }
else
{
logger.info( "Unknown file status: '" + statusString + "'." );
- return;
+ status = ScmFileStatus.UNKNOWN;
}
// If the file isn't a file; don't add it.