]> git.donarmstrong.com Git - debbugs.git/blobdiff - scripts/service.in
[project @ 2005-07-30 03:22:36 by don]
[debbugs.git] / scripts / service.in
index 59d5c094fcee4fa6a81c5bc9c5c879804d3098d2..693caec7477f605b297b4604037b9bc6efca6c7d 100755 (executable)
@@ -1,11 +1,12 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.94 2003/10/02 13:48:38 cjwatson Exp $
+# $Id: service.in,v 1.111 2005/07/30 03:22:36 don Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
 
 use File::Copy;
 use MIME::Parser;
+use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 
 $config_path = '/etc/debbugs';
 $lib_path = '/usr/lib/debbugs';
@@ -46,6 +47,9 @@ my $entity = eval { $parser->parse_data(join('',@log)) };
 
 # header and decoded body respectively
 my (@headerlines, @bodylines);
+# Bug numbers to send e-mail to, hash so that we don't send to the
+# same bug twice.
+my (%bug_affected);
 
 if ($entity and $entity->head->tags) {
     @headerlines = @{$entity->head->header};
@@ -71,6 +75,7 @@ if ($entity and $entity->head->tags) {
 }
 
 for (@headerlines) {
+    $_ = decode_rfc1522($_);
     s/\n\s/ /g;
     print ">$_<\n" if $debug;
     if (s/^(\S+):\s*//) {
@@ -241,16 +246,22 @@ END
             last;
         }
 #### interesting ones start here
-    } elsif (m/^close\s+\#?(-?\d+)$/i) {
+    } elsif (m/^close\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) {
        $ok++;
        $ref= $1;
+       $bug_affected{$ref}=1;
+       $version= $2;
        if (&setbug) {
            &transcript("'close' is deprecated; see http://$gWebDomain/Developer$gHTMLSuffix#closing.\n");
-           if (length($data->{done})) {
+           if (length($data->{done}) and not defined($version)) {
                &transcript("$gBug is already closed, cannot re-close.\n\n");
                 &nochangebug;
             } else {
-                $action= "$gBug closed, send any further explanations to $data->{originator}";
+                $action= "$gBug " .
+                    (defined($version) ?
+                        "marked as fixed in version $version" :
+                        "closed") .
+                    ", send any further explanations to $data->{originator}";
                 do {
                     &addmaintainers($data);
                                        if ( length( $gDoneList ) > 0 && length( $gListDomain ) >
@@ -262,6 +273,7 @@ END
                         $data->{keywords}= join ' ', grep $_ ne 'pending',
                                                 @keywords;
                     }
+                    addfixedversions($data, $data->{package}, $version, 'binary');
 
                    $message= <<END;
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
@@ -272,6 +284,7 @@ References: $header{'message-id'} $data->{msgid}
 In-Reply-To: $data->{msgid}
 Message-ID: <handler.$ref.$nn.notifdonectrl.$midix\@$gEmailDomain>
 Reply-To: $ref\@$gEmailDomain
+X-$gProject-PR-Message: they-closed-control $ref
 
 This is an automatic notification regarding your $gBug report
 #$ref: $data->{subject},
@@ -291,9 +304,11 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^reassign\s+\#?(-?\d+)\s+(\S.*\S)$/i) {
+    } elsif (m/^reassign\s+\#?(-?\d+)\s+(\S+)(?:\s+(\d.*))?$/i) {
         $ok++;
         $ref= $1; $newpackage= $2;
+       $bug_affected{$ref}=1;
+        $version= $3;
        $newpackage =~ y/A-Z/a-z/;
         if (&setbug) {
             if (length($data->{package})) {
@@ -305,6 +320,10 @@ END
             do {
                 &addmaintainers($data);
                 $data->{package}= $newpackage;
+                $data->{found_versions}= [];
+                $data->{fixed_versions}= [];
+                # TODO: what if $newpackage is a source package?
+                addfoundversions($data, $data->{package}, $version, 'binary');
                 &addmaintainers($data);
             } while (&getnextbug);
         }
@@ -314,7 +333,11 @@ END
              m/^reopen\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($noriginator=$2, 1) : 0) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         if (&setbug) {
+            if (@{$data->{fixed_versions}}) {
+                &transcript("'reopen' is deprecated when a bug has been closed with a version;\nuse 'found' or 'submitter' as appropriate instead.\n");
+            }
             if (!length($data->{done})) {
                 &transcript("$gBug is already open, cannot reopen.\n\n");
                 &nochangebug;
@@ -325,30 +348,87 @@ END
                 do {
                     &addmaintainers($data);
                     $data->{originator}= $noriginator eq '' ?  $data->{originator} : $noriginator;
+                    $data->{fixed_versions}= [];
                     $data->{done}= '';
                 } while (&getnextbug);
             }
         }
+    } elsif (m/^found\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            if (!length($data->{done}) and not defined($version)) {
+                &transcript("$gBug is already open, cannot reopen.\n\n");
+                &nochangebug;
+            } else {
+                $action=
+                    defined($version) ?
+                        "$gBug marked as found in version $version." :
+                        "$gBug reopened.";
+                do {
+                    &addmaintainers($data);
+                    # The 'done' field gets a bit weird with version
+                    # tracking, because a bug may be closed by multiple
+                    # people in different branches. Until we have something
+                    # more flexible, we set it every time a bug is fixed,
+                    # and clear it precisely when a found command is
+                    # received for the rightmost fixed-in version, which
+                    # equates to the most recent fixing of the bug, or when
+                    # a versionless found command is received.
+                    if (defined $version) {
+                        my $lastfixed =
+                            (reverse @{$data->{fixed_versions}})[0];
+                        # TODO: what if $data->{package} is a source package?
+                        addfoundversions($data, $data->{package}, $version, 'binary');
+                        if (defined $lastfixed and not grep { $_ eq $lastfixed } @{$data->{fixed_versions}}) {
+                            $data->{done} = '';
+                        }
+                    } else {
+                        # Versionless found; assume old-style "not fixed at
+                        # all".
+                        $data->{fixed_versions} = [];
+                        $data->{done} = '';
+                    }
+                } while (&getnextbug);
+            }
+        }
+    } elsif (m/^notfound\s+\#?(-?\d+)\s+(\d.*)$/i) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            $action= "$gBug marked as not found in version $version.";
+            if (length($data->{done})) {
+                $extramessage= "(By the way, this $gBug is currently marked as done.)\n";
+            }
+            do {
+                &addmaintainers($data);
+                removefoundversions($data, $data->{package}, $version, 'binary');
+            } while (&getnextbug);
+        }
     } elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) :
              m/^submitter\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newsubmitter=$2, 1) : 0) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
             $ref = $clonebugs{$ref};
         }
         if (&getbug) {
-            &foundbug;
-            &addmaintainers($data);
-            $oldsubmitter= $data->{originator};
-            $data->{originator}= $newsubmitter;
-            $action= "Changed $gBug submitter from $oldsubmitter to $newsubmitter.";
-            &savebug;
-            &transcript("$action\n");
-            if (length($data->{done})) {
-                &transcript("(By the way, that $gBug is currently marked as done.)\n");
-            }
-            &transcript("\n");
-            $message= <<END;
+            if (&checkpkglimit) {
+                &foundbug;
+                &addmaintainers($data);
+                $oldsubmitter= $data->{originator};
+                $data->{originator}= $newsubmitter;
+                $action= "Changed $gBug submitter from $oldsubmitter to $newsubmitter.";
+                &savebug;
+                &transcript("$action\n");
+                if (length($data->{done})) {
+                    &transcript("(By the way, that $gBug is currently marked as done.)\n");
+                }
+                &transcript("\n");
+                $message= <<END;
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $oldsubmitter
 Subject: $gBug#$ref submitter address changed
@@ -357,12 +437,15 @@ References: $header{'message-id'} $data->{msgid}
 In-Reply-To: $data->{msgid}
 Message-ID: <handler.$ref.$nn.newsubmitter.$midix\@$gEmailDomain>
 Reply-To: $ref\@$gEmailDomain
+X-$gProject-PR-Message: submitter-changed $ref
 
 The submitter address recorded for your $gBug report
 #$ref: $data->{subject}
 has been changed.
 
-The new submitter address for this report is
+The old submitter address for this report was
+$oldsubmitter.
+The new submitter address is
 $newsubmitter.
 
 This change was made by
@@ -373,13 +456,17 @@ $gMaintainer
 (administrator, $gProject $gBugs database)
 
 END
-            &sendmailmessage($message,$oldsubmitter);
+                &sendmailmessage($message,$oldsubmitter);
+            } else {
+                &cancelbug;
+            }
         } else {
             &notfoundbug;
         }
     } elsif (m/^forwarded\s+\#?(-?\d+)\s+(\S.*\S)$/i) {
         $ok++;
         $ref= $1; $whereto= $2;
+       $bug_affected{$ref}=1;
         if (&setbug) {
             if (length($data->{forwarded})) {
     $action= "Forwarded-to-address changed from $data->{forwarded} to $whereto.";
@@ -400,6 +487,7 @@ END
     } elsif (m/^notforwarded\s+\#?(-?\d+)$/i) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         if (&setbug) {
             if (!length($data->{forwarded})) {
                 &transcript("$gBug is not marked as having been forwarded.\n\n");
@@ -416,6 +504,7 @@ END
        m/^priority\s+\#?(-?\d+)\s+([-0-9a-z]+)$/i) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         $newseverity= $2;
         if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) {
             &transcript("Severity level \`$newseverity' is not known.\n".
@@ -426,7 +515,7 @@ END
         } elsif (&setbug) {
             $printseverity= $data->{severity};
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';
-           $action= "Severity set to \`$newseverity'.";
+           $action= "Severity set to \`$newseverity' from \`$printseverity'";
            do {
                 &addmaintainers($data);
                 if (defined $gStrongList and isstrongseverity($newseverity)) {
@@ -438,6 +527,7 @@ END
     } elsif (m/^tags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) {
        $ok++;
        $ref = $1; $addsubcode = $3; $tags = $4;
+       $bug_affected{$ref}=1;
        $addsub = "add";
        if (defined $addsubcode) {
            $addsub = "sub" if ($addsubcode eq "-");
@@ -473,12 +563,14 @@ END
            do {
                 &addmaintainers($data);
                $data->{keywords} = '' if ($addsub eq "set");
+               # Allow removing obsolete tags.
                if ($addsub eq "sub") {
                    foreach my $t (@badtags) {
                        $data->{keywords} = join ' ', grep $_ ne $t, 
                            split ' ', $data->{keywords};
                    }
                }
+               # Now process all other additions and subtractions.
                foreach my $t (@okaytags) {
                    $data->{keywords} = join ' ', grep $_ ne $t, 
                        split ' ', $data->{keywords};
@@ -490,26 +582,32 @@ END
     } elsif (m/^retitle\s+\#?(-?\d+)\s+(\S.*\S)\s*$/i) {
         $ok++;
         $ref= $1; $newtitle= $2;
+       $bug_affected{$ref}=1;
        if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
            $ref = $clonebugs{$ref};
        }
         if (&getbug) {
-            &foundbug;
-            &addmaintainers($data);
-            $data->{subject}= $newtitle;
-            $action= "Changed $gBug title.";
-            &savebug;
-            &transcript("$action\n");
-            if (length($data->{done})) {
-                &transcript("(By the way, that $gBug is currently marked as done.)\n");
+            if (&checkpkglimit) {
+                &foundbug;
+                &addmaintainers($data);
+                $data->{subject}= $newtitle;
+                $action= "Changed $gBug title.";
+                &savebug;
+                &transcript("$action\n");
+                if (length($data->{done})) {
+                    &transcript("(By the way, that $gBug is currently marked as done.)\n");
+                }
+                &transcript("\n");
+            } else {
+                &cancelbug;
             }
-            &transcript("\n");
         } else {
             &notfoundbug;
         }
     } elsif (m/^unmerge\s+\#?(-?\d+)$/i) {
        $ok++;
        $ref= $1;
+       $bug_affected{$ref} = 1;
        if (&setbug) {
            if (!length($data->{mergedwith})) {
                &transcript("$gBug is not marked as being merged with any others.\n\n");
@@ -519,6 +617,7 @@ END
                $action= "Disconnected #$ref from all other report(s).";
                @newmergelist= split(/ /,$data->{mergedwith});
                 $discref= $ref;
+               @bug_affected{@newmergelist} = 1 x @newmergelist;
                 do {
                     &addmaintainers($data);
                    $data->{mergedwith}= ($ref == $discref) ? ''
@@ -526,11 +625,13 @@ END
                 } while (&getnextbug);
            }
        }
-    } elsif (m/^merge\s+(-?\d+(\s+-?\d+)+)\s*$/i) {
+    } elsif (m/^merge\s+#?(-?\d+(\s+#?-?\d+)+)\s*$/i) {
        $ok++;
-        @tomerge= sort { $a <=> $b } split(/\s+/,$1);
+        @tomerge= sort { $a <=> $b } split(/\s+#?/,$1);
         @newmergelist= ();
        my %tags = ();
+       my %found = ();
+       my %fixed = ();
         &getmerge;
         while (defined($ref= shift(@tomerge))) {
             &transcript("D| checking merge $ref\n") if $dl;
@@ -540,6 +641,7 @@ END
            }
            next if grep($_ eq $ref,@newmergelist);
            if (!&getbug) { &notfoundbug; @newmergelist=(); last }
+            if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; }
             &foundbug;
             &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl;
            $mismatch= '';
@@ -550,6 +652,8 @@ END
            &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open');
            &checkmatch('owner','m_owner',$data->{owner});
            foreach my $t (split /\s+/, $data->{keywords}) { $tags{$t} = 1; }
+           foreach my $f (@{$data->{found_versions}}) { $found{$f} = 1; }
+           foreach my $f (@{$data->{fixed_versions}}) { $fixed{$f} = 1; }
            if (length($mismatch)) {
                &transcript("Mismatch - only $gBugs in same state can be merged:\n".
                             $mismatch."\n");
@@ -562,11 +666,15 @@ END
        if (@newmergelist) {
             @newmergelist= sort { $a <=> $b } @newmergelist;
             $action= "Merged @newmergelist.";
+           delete @fixed{keys %found};
            for $ref (@newmergelist) {
                &getbug || die "huh ?  $gBug $ref disappeared during merge";
                 &addmaintainers($data);
+               @bug_affected{@newmergelist} = 1 x @newmergelist;
                $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
                $data->{keywords}= join(' ', keys %tags);
+               $data->{found_versions}= [sort keys %found];
+               $data->{fixed_versions}= [sort keys %fixed];
                &savebug;
            }
            &transcript("$action\n\n");
@@ -580,6 +688,7 @@ END
        $newbugsneeded = scalar(@newclonedids);
 
        $ref = $origref;
+       $bug_affected{$ref} = 1;
        if (&setbug) {
            if (length($data->{mergedwith})) {
                &transcript("$gBug is marked as being merged with others.\n\n");
@@ -602,6 +711,7 @@ END
                &getnextbug;
                my $ohash = get_hashname($origref);
                $ref = $firstref;
+               @bug_affected{@newclonedids} = 1 x @newclonedids;
                for $newclonedid (@newclonedids) {
                    $clonebugs{$newclonedid} = $ref;
            
@@ -631,6 +741,7 @@ END
              m/^owner\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newowner = $2, 1) : 0) {
         $ok++;
         $ref = $1;
+       $bug_affected{$ref} = 1;
         if (&setbug) {
             if (length $data->{owner}) {
                 $action = "Owner changed from $data->{owner} to $newowner.";
@@ -649,6 +760,7 @@ END
     } elsif (m/^noowner\s+\#?(-?\d+)$/i) {
         $ok++;
         $ref = $1;
+       $bug_affected{$ref} = 1;
         if (&setbug) {
             if (length $data->{owner}) {
                 $action = "Removed annotation that $gBug was owned by " .
@@ -707,6 +819,9 @@ if (@maintccs) {
     $maintccs .= "Cc: " . join(",\n    ",@maintccs) . "\n";
 }
 
+# Add Bcc's to subscribed bugs
+push @bcc, map {"bugs=$_\@$gListDomain"} keys %bug_affected;
+
 if (!defined $header{'subject'} || $header{'subject'} eq "") {
   $header{'subject'} = "your mail";
 }
@@ -719,6 +834,7 @@ In-Reply-To: $header{'message-id'}
 References: $header{'message-id'}
 Message-ID: <handler.s.$nn.transcript\@$gEmailDomain>
 Precedence: bulk
+X-$gProject-PR-Message: transcript
 
 ${transcript}Please contact me if you need assistance.
 
@@ -749,6 +865,13 @@ unlink("incoming/P$nn") || &quit("unlinking incoming/P$nn: $!");
 sub sendmailmessage {
     local ($message,@recips) = @_;
     $message = "X-Loop: $gMaintainerEmail\n" . $message;
+    # The original message received is written out above, so before
+    # writing out the other messages we've sent out, we need to
+    # RFC1522 encode the header.
+    my ($header,$body) = split /\n\n/, $message, 2;
+    $header = encode_rfc1522($header);
+    $message = $header . qq(\n\n). $body;
+
     print "mailing to >@recips<\n" if $debug;
     $c= open(D,"|-");
     defined($c) || &quit("mailing forking for sendmail: $!");
@@ -790,6 +913,14 @@ sub checkmatch {
     }
 }
 
+sub checkpkglimit {
+    if (keys %limit_pkgs and not defined $limit_pkgs{$data->{package}}) {
+        &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n");
+        return 0;
+    }
+    return 1;
+}
+
 # High-level bug manipulation calls
 # Do announcements themselves
 #
@@ -832,11 +963,10 @@ sub setbug {
         return 0;
     }
 
-    if (keys(%limit_pkgs) && not defined $limit_pkgs{$data->{package}}) {
-       &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n");
-       &cancelbug;
-       return 0;
-    } 
+    if (!&checkpkglimit) {
+        &cancelbug;
+        return 0;
+    }
 
     @thisbugmergelist= split(/ /,$data->{mergedwith});
     if (!@thisbugmergelist) {
@@ -1012,6 +1142,7 @@ References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.help.$midix\@$gEmailDomain>
 Precedence: bulk
+X-$gProject-PR-Message: doc-text $relpath
 
 END
     $ok++;
@@ -1039,6 +1170,7 @@ References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.info.$midix\@$gEmailDomain>
 Precedence: bulk
+X-$gProject-PR-Message: doc-html $relpath
 
 END
          $ok++;
@@ -1054,12 +1186,14 @@ sub addmaintainers {
     # Data structure is:
     #   maintainer email address &c -> assoc of packages -> assoc of bug#'s
     my $data = shift;
-    my ($p, $addmaint, $pshow);
+    my ($p, $addmaint);
     &ensuremaintainersloaded;
     $anymaintfound=0; $anymaintnotfound=0;
     for $p (split(m/[ \t?,():]+/, $data->{package})) {
        $p =~ y/A-Z/a-z/;
-        $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : '');
+       $p =~ /([a-z0-9.+-]+)/;
+       $p = $1;
+       next unless defined $p;
        if (defined $gSubscriptionDomain) {
            if (defined($pkgsrc{$p})) {
                addbcc("$pkgsrc{$p}\@$gSubscriptionDomain");
@@ -1151,6 +1285,7 @@ References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.info.$midix\@$gEmailDomain>
 Precedence: bulk
+X-$gProject-PR-Message: getinfo
 
 $description follows: