[Rt-commit] r4367 - in RT-Integration-SVN: html/SVN

[alexmv at bestpractical.com]

Author: alexmv
Date: Thu Dec 29 15:46:45 2005
New Revision: 4367

Modified:
   RT-Integration-SVN/   (props changed)
   RT-Integration-SVN/html/SVN/PullUpdate.html

Log:
 r8508 at zoq-fot-pik:  chmrr | 2005-12-29 15:46:04 -0500
  * Patch from Dave Rolsky <autarch at urth.org> to add RT-Set-Queue and a
    debug flag


Modified: RT-Integration-SVN/html/SVN/PullUpdate.html
==============================================================================
--- RT-Integration-SVN/html/SVN/PullUpdate.html	(original)
+++ RT-Integration-SVN/html/SVN/PullUpdate.html	Thu Dec 29 15:46:45 2005
@@ -1,7 +1,9 @@
 <%ARGS>
 $rev
+$debug => 0
 </%ARGS>
 <%init>
+$r->content_type('text/plain');
 
 unless ( $rev =~ /^(\d+)$/ ) {
     $m->out("Numeric revision needed");
@@ -28,7 +30,7 @@
 
 }
 unless ( $rev == $revision )  {
-die "$LOOK log $REPO -r $rev\n$rev is not $revision\n$data" ;
+  die "$LOOK log $REPO -r $rev\n$rev is not $revision\n$data";
 }
 my @msg = <SVNLOOK>;
 $dashes = pop(@msg);
@@ -40,6 +42,9 @@
     $user->LoadByCols( Gecos => $actor );
 }
 
+$m->out("DEBUG: Found user " . $user->Name() . " as SVN committer\n")
+    if $debug;
+
 unless ( $user->id ) {
     die "Unknown user";
 }
@@ -49,31 +54,49 @@
 my $update_type   = 'comment';
 my $update_status = '';
 my $update_owner  = '';
+my $update_queue  = '';
 my %set;
 foreach my $line (@msg) {
     if ( $line =~ /^\s*RT-Ticket:\s*(\w*?)(?:\#?)(\d*)/i ) {
         next if ($1 && $1 !~ /^$RT::rtname$/i);
         $ticket = RT::Ticket->new($user);
         $ticket->Load($2);
+        $m->out("DEBUG: loaded ticket $2\n")
+            if $debug;
+    }
+    elsif ( $line =~ /^\s*RT-Queue:\s*(.+\w)\s*/i ) {
+        $update_queue = $1;
+        $m->out("DEBUG: set queue to $1\n")
+            if $debug;
     }
     elsif ( $line =~ /^\s*RT-Status:\s*(\w+)/i ) {
         $update_status = lc($1);
+        $m->out("DEBUG: set status to $1\n")
+            if $debug;
     }
     elsif ( $line =~ /^\s*RT-(?:Update|Action):\s*(comment|correspond)/i ) {
         $update_type = lc($1);
+        $m->out("DEBUG: update type is $1\n")
+            if $debug;
     }
     elsif ( $line =~ /^\s*RT-Owner:\s*(\w+)/i ) {
 	$update_owner = $1;
+        $m->out("DEBUG: set owner to $1\n")
+            if $debug;
     }
     elsif ( $line =~ /^\s*RT-(\w+):\s*(\w+)/i ) {
         $set{$1} = $2;
+        $m->out("DEBUG: set $1 to $2\n")
+            if $debug;
     }
     else {
         $update_msg .= $line;
     }
-
 }
 
+$m->out("DEBUG: update message is ...\n$update_msg\n")
+    if $debug;
+
 if ( $ticket && $ticket->id ) {
     my $refers_to = $ticket->RefersTo;
     while ( my $refer = $refers_to->Next ) {
@@ -93,6 +116,12 @@
     $ticket->$update_type( Content => $update_msg );
     $m->out( "Added commit text as $update_type\n" );
 
+    if ($update_queue) {
+        my ($status, $msg) = $ticket->SetQueue($update_queue);
+        $m->out( "Set queue to $update_queue\n" );
+        $m->out( "Failed: $msg\n" ) unless $status;
+    }
+
     if ($update_owner) {
 	my ($status, $msg) = $ticket->SetOwner($update_owner);
 	$m->out( "Set owner to $update_owner\n" );