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

[jesse]

The branch, master has been updated
       via  673beb87b9fdc8f3dd1c7fa18760ddf219031913 (commit)
       via  926bd362ef4ce2a7ec69370cf9eef7736df1729b (commit)
      from  f983de65a7514296782e1a343ac072f03e9ad285 (commit)

Summary of changes:
 lib/App/SD/CLI/Dispatcher.pm            |    3 ++-
 lib/App/SD/Replica/gcode/PullEncoder.pm |    2 +-
 lib/App/SD/Replica/trac/PullEncoder.pm  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 926bd362ef4ce2a7ec69370cf9eef7736df1729b
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Jun 10 21:10:47 2009 -0400

    Use prophet's new centralized uuid generation code

diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index 49671a9..a8c241b 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -76,6 +76,7 @@ on qr/^(\w+)\s+tickets?(.*)$/ => sub {
     my $self = shift;
     my $primary = $1;
     my $secondary = $2;
+    next_rule if $primary eq 'help';
     my $cmd = join( ' ', grep { $_ ne '' } 'ticket',$primary, $secondary);
     my @orig_argv = @{$self->cli->context->raw_args};
     my ($subcommand, undef) = (shift @orig_argv, shift @orig_argv);
diff --git a/lib/App/SD/Replica/gcode/PullEncoder.pm b/lib/App/SD/Replica/gcode/PullEncoder.pm
index d2eb600..ebd2bf1 100644
--- a/lib/App/SD/Replica/gcode/PullEncoder.pm
+++ b/lib/App/SD/Replica/gcode/PullEncoder.pm
@@ -325,7 +325,7 @@ sub _include_change_comment {
     my $comment = Prophet::Change->new(
         {
             record_type => 'comment',
-            record_uuid => Data::UUID->new->create_str()
+            record_uuid => $self->sync_source->app_handle->uuid_generator->create_str(),
             ,    # comments are never edited, we can have a random uuid
             change_type => 'add_file'
         }
diff --git a/lib/App/SD/Replica/trac/PullEncoder.pm b/lib/App/SD/Replica/trac/PullEncoder.pm
index 369c872..e827775 100644
--- a/lib/App/SD/Replica/trac/PullEncoder.pm
+++ b/lib/App/SD/Replica/trac/PullEncoder.pm
@@ -241,8 +241,8 @@ sub transcode_one_txn {
 
     my $comment = Prophet::Change->new(
         {   record_type => 'comment',
-            record_uuid => Data::UUID->new->create_str()
-            ,    # comments are never edited, we can have a random uuid
+            record_uuid => $self->sync_source->app_handle->uuid_generator->create_str(),
+             # comments are never edited, we can have a random uuid
             change_type => 'add_file'
         }
     );

commit 673beb87b9fdc8f3dd1c7fa18760ddf219031913
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Jun 11 00:35:35 2009 -0400

    recognize base64 uuids on take/give

diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index a8c241b..08074e9 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -94,7 +94,7 @@ under ticket => sub {
     on details  => run_command('Ticket::Details');
 
     under [ [ 'give', 'assign' ] ] => sub {
-        on [qr/^(?:\d+|[0-9a-f]{8}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{12})$/, qr/^\S+$/] => sub {
+        on [qr/^(?:\d+|[0-9a-zA-Z\-\_]{22,24}|[0-9a-f]{8}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{12})$/, qr/^\S+$/] => sub {
             my $self = shift;
             my ($id, $owner) = ($1, $2);
 

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