[Bps-public-commit] r17651 - in Prophet/trunk: lib/Prophet/CLI/Command t

[jesse at bestpractical.com]

Author: jesse
Date: Thu Jan  8 17:10:22 2009
New Revision: 17651

Modified:
   Prophet/trunk/lib/Prophet/CLI/Command/Publish.pm
   Prophet/trunk/lib/Prophet/Replica.pm
   Prophet/trunk/t/publish-html.t
   Prophet/trunk/t/publish-pull.t
   Prophet/trunk/t/real-conflicting-merge.t
   Prophet/trunk/t/simple-conflicting-merge.t

Log:
* A bit of mergeticket related cleanup

Modified: Prophet/trunk/lib/Prophet/CLI/Command/Publish.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Publish.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Publish.pm	Thu Jan  8 17:10:22 2009
@@ -109,7 +109,7 @@
     my $type = shift;
 
     # should we skip all _private types?
-    return 1 if $type eq '_merge_tickets';
+    return 1 if $type eq $Prophet::Replica::MERGETICKET_METATYPE;
 
     return 0;
 }

Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Thu Jan  8 17:10:22 2009
@@ -337,7 +337,7 @@
     my $self = shift;
     my ($source) = validate_pos( @_, { type => SCALAR } );
 
-    my $last =  $self->state_handle->_retrieve_metadata_for( $MERGETICKET_METATYPE, $source, 'last-changeset' ) || 0;
+    my $last =  $self->state_handle->metadata_storage( $MERGETICKET_METATYPE, 'last-changeset' )->($source) || 0;
     return $last;
 }
 

Modified: Prophet/trunk/t/publish-html.t
==============================================================================
--- Prophet/trunk/t/publish-html.t	(original)
+++ Prophet/trunk/t/publish-html.t	Thu Jan  8 17:10:22 2009
@@ -25,7 +25,7 @@
 
 my $dir = $alice_published;
 
-my $merge_tickets = File::Spec->catdir($dir => '_merge_tickets');
+my $merge_tickets = File::Spec->catdir($dir => $Prophet::Replica::MERGETICKET_METATYPE);
 ok(!-e $merge_tickets, "_merge_tickets template directory absent");
 
 my $bug = File::Spec->catdir($dir => 'Bug');

Modified: Prophet/trunk/t/publish-pull.t
==============================================================================
--- Prophet/trunk/t/publish-pull.t	(original)
+++ Prophet/trunk/t/publish-pull.t	Thu Jan  8 17:10:22 2009
@@ -135,7 +135,7 @@
 
         $changes->{ replica_uuid_for('alice') } = {
             change_type  => $change_type,
-            record_type  => '_merge_tickets',
+            record_type  => $Prophet::Replica::MERGETICKET_METATYPE,
             prop_changes => {
                 'last-changeset' => {
                     old_value => $prev_changeset_num,

Modified: Prophet/trunk/t/real-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/real-conflicting-merge.t	(original)
+++ Prophet/trunk/t/real-conflicting-merge.t	Thu Jan  8 17:10:22 2009
@@ -212,7 +212,7 @@
                     as_alice {
                         replica_uuid();
                     } => {
-                        record_type    => '_merge_tickets',
+                        record_type    => $Prophet::Replica::MERGETICKET_METATYPE,
                         change_type  => 'update_file',
                         prop_changes => {
                             'last-changeset' => {

Modified: Prophet/trunk/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/simple-conflicting-merge.t	(original)
+++ Prophet/trunk/t/simple-conflicting-merge.t	Thu Jan  8 17:10:22 2009
@@ -176,7 +176,7 @@
 
                 replica_uuid_for('alice') => {
                     change_type  => 'update_file',
-                    record_type    => '_merge_tickets',
+                    record_type    => $Prophet::Replica::MERGETICKET_METATYPE,
                     prop_changes => {
                         'last-changeset' => {
                             old_value => ($alice->latest_sequence_no-1),