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

[jesse at bestpractical.com]

Author: jesse
Date: Mon Sep 15 00:18:37 2008
New Revision: 15970

Modified:
   Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
   Prophet/trunk/lib/Prophet/CLI/Command/Pull.pm
   Prophet/trunk/lib/Prophet/ChangeSet.pm
   Prophet/trunk/lib/Prophet/Record.pm

Log:
* minor style changes

Modified: Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	Mon Sep 15 00:18:37 2008
@@ -38,7 +38,6 @@
 sub print_report {
     my $self = shift;
     my $changesets = shift;
-    print "\n";
     if ($changesets == 0) {
         print "No new changesets.\n";
     }

Modified: Prophet/trunk/lib/Prophet/CLI/Command/Pull.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Pull.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Pull.pm	Mon Sep 15 00:18:37 2008
@@ -30,6 +30,7 @@
         #if ( $self->has_arg('all') || $self->has_arg('local') );
         $self->set_arg( from => $from );
         super();
+        print "\n";
     }
 
     if ( $self->arg('from') && !exists $previous_sources{$self->arg('from')} ) {

Modified: Prophet/trunk/lib/Prophet/ChangeSet.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/ChangeSet.pm	(original)
+++ Prophet/trunk/lib/Prophet/ChangeSet.pm	Mon Sep 15 00:18:37 2008
@@ -219,7 +219,7 @@
 
     for my $change ( $self->changes ) {
         next if $args{change_filter} && !$args{change_filter}->($change);
-        $body .= $change->as_string( header_callback => $args{change_header} );
+        $body .= $change->as_string( header_callback => $args{change_header} ) || next;
         $body .= "\n";
     }
 

Modified: Prophet/trunk/lib/Prophet/Record.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Record.pm	(original)
+++ Prophet/trunk/lib/Prophet/Record.pm	Mon Sep 15 00:18:37 2008
@@ -750,11 +750,7 @@
 
 sub history_as_string {
     my $self = shift;
-    my $out = "History for record "
-            . $self->luid
-            . " (" . $self->uuid . ")"
-            . "\n\n";
-
+    my $out ='';
     for my $changeset ($self->changesets) {
         $out .= $changeset->as_string(change_filter => sub {
             shift->record_uuid eq $self->uuid