[Bps-public-commit] SD branch, master, updated. afd8976a2037884ec85ca961a2bef5bf8cd268a4

[jesse]

The branch, master has been updated
       via  afd8976a2037884ec85ca961a2bef5bf8cd268a4 (commit)
       via  e51d29b8e5a112f945b38cb9271e60a13ec81aae (commit)
      from  48c0c57ecb232d64295b12c72b37ae89021e2691 (commit)

Summary of changes:
 lib/App/SD/CLI/Command/Log.pm |    4 ++--
 t/sd-log.t                    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit e51d29b8e5a112f945b38cb9271e60a13ec81aae
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jun 19 07:13:46 2009 -0500

    Reorder the sd log output so it's more obvious that a changeset # is the original_changeset_number

diff --git a/lib/App/SD/CLI/Command/Log.pm b/lib/App/SD/CLI/Command/Log.pm
index c1f555b..3f3aef1 100644
--- a/lib/App/SD/CLI/Command/Log.pm
+++ b/lib/App/SD/CLI/Command/Log.pm
@@ -18,10 +18,10 @@ sub handle_changeset {
         },
         header_callback => sub {
             my $c = shift;
-            sprintf "%s - %s : %s @ %s\n",
+            sprintf "%s - %s : %s@%s\n",
                 $c->created,
-                $c->original_sequence_no,
                 ( $c->creator || '(unknown)' ),
+                $c->original_sequence_no,
                 $c->original_source_uuid
                 ;
             }
diff --git a/t/sd-log.t b/t/sd-log.t
index 504f10f..bf92fc2 100644
--- a/t/sd-log.t
+++ b/t/sd-log.t
@@ -26,7 +26,7 @@ my ($log_id, $log_uuid) = create_ticket_ok( '--', 'summary', 'logs rock!');
 
 run_output_matches_unordered( 'sd', [ 'log', 'LATEST' ],
     [
-        qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{PROPHET_EMAIL} @ $replica_uuid$/,
+        qr/^\d{4}-\d{2}-\d{2}.+ - $ENV{PROPHET_EMAIL} : \d+@@{[$replica_uuid]}$/,
         qr/^ # Ticket \d+ \(logs rock!\)$/,
         '  + "original_replica" set to "'.$replica_uuid.'"',
         '  + "creator" set to "'.$ENV{PROPHET_EMAIL}.'"',
@@ -49,7 +49,7 @@ run_output_matches( 'sd', [ 'ticket',
 # check the log
 run_output_matches( 'sd', [ 'log', 'LATEST' ],
     [
-        qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{PROPHET_EMAIL} @ $replica_uuid$/,
+        qr/^\d{4}-\d{2}-\d{2}.+ - $ENV{PROPHET_EMAIL} : \d+@@{[$replica_uuid]}$/,
         qr/^ # Ticket \d+ \(logs rock!\)$/,
         '  > "reporter" changed from "'.$ENV{PROPHET_EMAIL}.'" to "foo at bar.com".',
         '',

commit afd8976a2037884ec85ca961a2bef5bf8cd268a4
Merge: e51d29b... 48c0c57...
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jun 19 09:57:01 2009 -0500

    Merge branch 'master' of fsck.com:/git/sd
    
    * 'master' of fsck.com:/git/sd:
      output is utf8 encoded, decode for binary data
      typo fix


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