Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 55196 invoked from network); 28 Jun 2007 21:17:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Jun 2007 21:17:31 -0000 Received: (qmail 97970 invoked by uid 500); 28 Jun 2007 21:17:34 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 97947 invoked by uid 500); 28 Jun 2007 21:17:33 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Delivered-To: moderator for scm-commits@maven.apache.org Received: (qmail 44589 invoked by uid 99); 28 Jun 2007 19:59:45 -0000 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 28 Jun 2007 19:59:20 -0000 To: scm-commits@maven.apache.org From: pschneider@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070628195920.7ECFA1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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