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 ps...@apache.org on 2007/06/28 21:59:20 UTC
svn commit: r551686 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src:
main/java/org/apache/maven/scm/provider/perforce/command/add/
test/java/org/apache/maven/scm/provider/perforce/command/add/
test/resources/perforce/
Author: pschneider
Date: Thu Jun 28 12:59:18 2007
New Revision: 551686
URL: http://svn.apache.org/viewvc?view=rev&rev=551686
Log:
[SCM-323] Fixes regexp for line consumer when adding files to Perforce.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/addlog.txt
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java?view=diff&rev=551686&r1=551685&r2=551686
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java Thu Jun 28 12:59:18 2007
@@ -35,7 +35,7 @@
implements StreamConsumer
{
- private static final String PATTERN = "^([^#]+)#1 - (.*)";
+ private static final String PATTERN = "^([^#]+)#(\\d+) - (.*)";
private static final String FILE_BEGIN_TOKEN = "//";
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java?view=diff&rev=551686&r1=551685&r2=551686
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java Thu Jun 28 12:59:18 2007
@@ -51,7 +51,7 @@
}
List adds = consumer.getAdditions();
- assertEquals( "Wrong number of entries returned", 2, adds.size() );
+ assertEquals( "Wrong number of entries returned", 3, adds.size() );
String entry = (String) adds.get( 0 );
assertTrue( entry.startsWith( "//" ) );
assertTrue( entry.endsWith( "foo.xml" ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/addlog.txt
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/addlog.txt?view=diff&rev=551686&r1=551685&r2=551686
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/addlog.txt (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/addlog.txt Thu Jun 28 12:59:18 2007
@@ -1,2 +1,3 @@
//depot/something/foo.xml#1 - opened for add
-//depot/something/bar.xml#1 - opened for add
\ No newline at end of file
+//depot/something/bar.xml#1 - opened for add
+//depot/scm-323/release-pom.xml#123 - opened for add