[Bps-public-commit] Prophet branch, master, updated. a53e0972929dd51df27feaa63bbca753a0b18928

[jesse]

The branch, master has been updated
       via  a53e0972929dd51df27feaa63bbca753a0b18928 (commit)
       via  8715e95481401f63f3a2e8af9bfbaeba4cb4833d (commit)
      from  106b9ccc91b96e0c9ed97fdafa061c44c2397fcd (commit)

Summary of changes:
 lib/Prophet/CLI/Command/Merge.pm |   15 ++++++++-------
 t/simple-push.t                  |   10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 8715e95481401f63f3a2e8af9bfbaeba4cb4833d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Jun 4 13:00:31 2009 -0400

    test updates to keep up with api changes

diff --git a/t/simple-push.t b/t/simple-push.t
index 60c05fc..341dabd 100644
--- a/t/simple-push.t
+++ b/t/simple-push.t
@@ -78,9 +78,9 @@ my $changesets;
 $bob->traverse_changesets(
     after    => $alice->last_changeset_from_source($bob->uuid),
     callback => sub {
-        my $cs = shift;
-        return unless $alice->should_accept_changeset( $cs);
-        push @{$changesets}, $cs->as_hash;
+        my %args = (@_);
+        return unless $alice->should_accept_changeset( $args{changeset});
+        push @{$changesets}, $args{changeset}->as_hash;
     }
 );
 
@@ -158,8 +158,8 @@ my $new_changesets;
 $bob->traverse_changesets(
     after    => $alice->last_changeset_from_source($bob->uuid),
     callback => sub {
-        my $cs = shift;
-        return unless $cs->has_changes, push @{$new_changesets}, $cs->as_hash;
+        my %args = (@_);
+        return unless $args{changeset}->has_changes, push @{$new_changesets}, $args{changeset}->as_hash;
         }
 
 );

commit a53e0972929dd51df27feaa63bbca753a0b18928
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Jun 4 13:00:45 2009 -0400

    perlitdy

diff --git a/lib/Prophet/CLI/Command/Merge.pm b/lib/Prophet/CLI/Command/Merge.pm
index 4e43515..ec22822 100644
--- a/lib/Prophet/CLI/Command/Merge.pm
+++ b/lib/Prophet/CLI/Command/Merge.pm
@@ -94,14 +94,15 @@ sub _do_merge {
 
     if ( $self->has_arg('dry-run') ) {
 
-    $self->source->traverse_changesets(
-        after    => $source_last_seen,
-        callback => sub { 
+        $self->source->traverse_changesets(
+            after    => $source_last_seen,
+            callback => sub {
                 my %args = (@_);
-                if ($self->target->should_accept_changeset($args{changeset})) {
-                        print $args{changeset}->as_string;
-                } 
-         });
+                if ( $self->target->should_accept_changeset( $args{changeset} ) ) {
+                    print $args{changeset}->as_string;
+                }
+            }
+        );
 
     } else {
 

-----------------------------------------------------------------------