[Bps-public-commit] r11294 - in SVN-PropDB: . lib/Prophet

[jesse at bestpractical.com]

Author: jesse
Date: Mon Mar 31 05:21:45 2008
New Revision: 11294

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/lib/Prophet/Handle.pm
   SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm
   SVN-PropDB/lib/Prophet/Test.pm

Log:
 r28838 at 68-246-241-50:  jesse | 2008-03-30 23:21:32 -1000
  * now we know whether a changeset that was previously recorded is a nullification or a resolution


Modified: SVN-PropDB/lib/Prophet/Handle.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Handle.pm	(original)
+++ SVN-PropDB/lib/Prophet/Handle.pm	Mon Mar 31 05:21:45 2008
@@ -132,6 +132,8 @@
     warn "==> to record $changeset / $inside_edit";
     $self->begin_edit() unless ($inside_edit);
     $self->_integrate_change($_) for ($changeset->changes);
+    $self->current_edit->change_prop( 'prophet:special-type'  => 'nullification') if ($changeset->is_nullification);
+    $self->current_edit->change_prop( 'prophet:special-type'  => 'resolution') if ($changeset->is_resolution);
     $self->commit_edit() unless ($inside_edit);
 
 }

Modified: SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm	(original)
+++ SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm	Mon Mar 31 05:21:45 2008
@@ -96,6 +96,8 @@
             source_uuid          => $self->uuid,
             original_source_uuid => $revprops->{'prophet:original-source'} || $self->uuid,
             original_sequence_no => $revprops->{'prophet:original-sequence-no'} || $entry->{'revision'},
+            is_nullification     => (($revprops->{'prophet:special-type'} || '') eq 'nullification')?1:0,
+            is_resolution        => (($revprops->{'prophet:special-type'} || '') eq 'resolution')?1:0,
 
         });
 

Modified: SVN-PropDB/lib/Prophet/Test.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Test.pm	(original)
+++ SVN-PropDB/lib/Prophet/Test.pm	Mon Mar 31 05:21:45 2008
@@ -219,9 +219,9 @@
   my $coderef = shift;
 
   local $ENV{'PROPHET_REPO'} = repo_path_for($username);
- my (@ret)=  $coderef->();
+ my $ret=  $coderef->();
  $REPLICA_UUIDS{$username} = replica_uuid();
- return @ret;
+ return $ret;
 }