Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 46576 invoked from network); 8 Mar 2006 16:39:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Mar 2006 16:39:55 -0000 Received: (qmail 27405 invoked by uid 500); 8 Mar 2006 16:39:55 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 27392 invoked by uid 500); 8 Mar 2006 16:39:54 -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-commits@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 27380 invoked by uid 99); 8 Mar 2006 16:39:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Mar 2006 08:39:54 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 08 Mar 2006 08:39:54 -0800 Received: (qmail 46377 invoked by uid 65534); 8 Mar 2006 16:39:33 -0000 Message-ID: <20060308163933.46376.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r384262 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/update/ maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/ Date: Wed, 08 Mar 2006 16:39:32 -0000 To: scm-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Wed Mar 8 08:39:31 2006 New Revision: 384262 URL: http://svn.apache.org/viewcvs?rev=384262&view=rev Log: Add in changes list only entries with a date greater than startdate Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=384262&r1=384261&r2=384262&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Wed Mar 8 08:39:31 2006 @@ -30,6 +30,7 @@ import org.apache.maven.scm.provider.ScmProviderRepository; import java.util.ArrayList; +import java.util.Date; import java.util.Iterator; import java.util.List; @@ -68,9 +69,28 @@ if ( changeLogSet != null ) { + Date startDate = null; + + try + { + parameters.getDate( CommandParameter.START_DATE ); + } + catch ( ScmException e ) + { + //Do nothing, startDate isn't define. + } + for ( Iterator i = changeLogSet.getChangeSets().iterator(); i.hasNext(); ) { ChangeSet change = (ChangeSet) i.next(); + + if ( startDate != null ) + { + if ( startDate.after( change.getDate() ) ) + { + continue; + } + } for ( Iterator j = filesList.iterator(); j.hasNext(); ) { Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java?rev=384262&r1=384261&r2=384262&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java Wed Mar 8 08:39:31 2006 @@ -44,6 +44,7 @@ public void testChangeLogCommand() throws Exception { + Thread.sleep( 1000 ); ScmProvider provider = getScmManager().getProviderByRepository( getScmRepository() ); ScmFileSet fileSet = new ScmFileSet( getWorkingCopy() ); Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=384262&r1=384261&r2=384262&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Wed Mar 8 08:39:31 2006 @@ -16,6 +16,7 @@ * limitations under the License. */ +import org.apache.maven.scm.ChangeSet; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmFileStatus; @@ -27,6 +28,7 @@ import org.apache.maven.scm.repository.ScmRepository; import java.io.File; +import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.TreeSet; @@ -109,6 +111,10 @@ ScmManager scmManager = getScmManager(); + Date lastUpdate = new Date( System.currentTimeMillis() ); + + Thread.sleep( 1000 ); + commit( getWorkingCopy(), repository ); // ---------------------------------------------------------------------- @@ -116,7 +122,7 @@ // ---------------------------------------------------------------------- UpdateScmResult result = scmManager.getProviderByUrl( getScmUrl() ) - .update( repository, new ScmFileSet( getUpdatingCopy() ), null ); + .update( repository, new ScmFileSet( getUpdatingCopy() ), null, lastUpdate ); assertNotNull( "The command returned a null result.", result ); @@ -131,6 +137,12 @@ assertNotNull( "The changed files list is null", changedFiles ); assertFalse( "The changed files list is empty", changedFiles.isEmpty() ); + + for ( Iterator i = changedFiles.iterator(); i.hasNext(); ) + { + ChangeSet changeSet = (ChangeSet) i.next(); + System.out.println( changeSet.toXML() ); + } // ---------------------------------------------------------------------- // Assert the files in the updated files list