[Bps-public-commit] r11421 - SVN-PropDB/lib/Prophet/Sync

[clkao at bestpractical.com]

Author: clkao
Date: Thu Apr  3 01:56:28 2008
New Revision: 11421

Modified:
   SVN-PropDB/lib/Prophet/Sync/Source.pm

Log:
consolidate $changesets_to_integrate and new_changesets_for()

Modified: SVN-PropDB/lib/Prophet/Sync/Source.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Sync/Source.pm	(original)
+++ SVN-PropDB/lib/Prophet/Sync/Source.pm	Thu Apr  3 01:56:28 2008
@@ -64,13 +64,9 @@
 
     my $resdb = $args{use_resdb} ? $self->fetch_resolutions( from => $source ) : undef;
 
-    my $changesets_to_integrate
-        = $source->fetch_changesets( after => $self->last_changeset_from_source( $source->uuid ) );
+    my $changesets_to_integrate = $source->new_changesets_for( $self );
 
     for my $changeset (@$changesets_to_integrate) {
-
-        next if $changeset->is_nullification || $changeset->is_resolution;
-        next if ( $self->has_seen_changeset($changeset) );
         $self->integrate_changeset(
             changeset         => $changeset,
             conflict_callback => $args{conflict_callback},