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

[sartak at bestpractical.com]

Author: sartak
Date: Fri Jul 18 19:48:57 2008
New Revision: 14301

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/CLI/Command/Show.pm
   Prophet/trunk/lib/Prophet/Record.pm
   Prophet/trunk/lib/Prophet/Replica.pm
   Prophet/trunk/t/config.t

Log:


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Show.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Show.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Show.pm	Fri Jul 18 19:48:57 2008
@@ -69,12 +69,12 @@
         next if !defined($value);
 
         # color if we can (and should)
-        my ($colorized_field, $colorized_value);
+        my ($colorized_field, $colorized_value) = ($field, $value);
         if ($colorize) {
             ($colorized_field,$colorized_value) = $record->colorize($field => $value);
 
     }
-        push @fields, [$field, ($colorized_field|| $field), ($colorized_value ||$value)];
+        push @fields, [$field, $colorized_field, $colorized_value];
 
         # don't check length($field) here, since coloring will increase the
         # length but we only care about display length

Modified: Prophet/trunk/lib/Prophet/Record.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Record.pm	(original)
+++ Prophet/trunk/lib/Prophet/Record.pm	Fri Jul 18 19:48:57 2008
@@ -314,7 +314,7 @@
         }
     }
     if (@errors) {
-        die join( '', @errors )."\n";
+        die join( '', @errors );
     }
     return 1;
 }

Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Fri Jul 18 19:48:57 2008
@@ -426,12 +426,10 @@
 
     if ( $self->db_uuid && $args{for}->db_uuid && $self->db_uuid ne $args{for}->db_uuid ) {
         if ($args{force}) {
-            warn "WARNING: You are merging two different databases!\n";
+            warn "You are merging two different databases! This is highly unusual.";
         }
         else {
-            die "You are trying to merge two different databases! This is NOT\n".
-            "recommended. If you really want to do this,  add '--force' to\n".
-            "your commandline.\n\n"
+            confess "You are trying to merge two different databases! If you really want to do this, try adding a --force argument.\n"
             . "Local database:  " . $self->db_uuid      . "\n"
             . "Remote database: " . $args{for}->db_uuid . "\n";
         }

Modified: Prophet/trunk/t/config.t
==============================================================================
--- Prophet/trunk/t/config.t	(original)
+++ Prophet/trunk/t/config.t	Fri Jul 18 19:48:57 2008
@@ -5,7 +5,7 @@
 use Prophet::Test 'no_plan';
 use File::Temp qw'tempdir';
     $ENV{'PROPHET_REPO'} = tempdir( CLEANUP => 0 ) . '/repo-' . $$;
-delete $ENV{'PROPHET_APP_CONFIG'};
+
 
 use_ok('Prophet::CLI');
 # Test basic config file parsing