X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=blobdiff_plain;f=Debbugs%2FControl.pm;h=aaa8925a0adfedf8f33ab86be49d9e5a35f28d08;hp=0390ba72cc6290a7da86ad382c05819bf215311c;hb=611a4b401fce2979a485476787afb136acf86af9;hpb=562a7c58b49da86ab3e63855952f9ebc3fdad4f1

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 0390ba7..aaa8925 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -75,7 +75,7 @@ is true, the above options must be present, and their values are used.
 use warnings;
 use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 BEGIN{
      $VERSION = 1.00;
@@ -444,7 +444,6 @@ sub set_blocks {
 	    }
 	}
     }
-    my @new_blockers = keys %blockers;
     for my $data (@data) {
 	my $old_data = dclone($data);
 	# remove blockers and/or add new ones as appropriate
@@ -487,9 +486,7 @@ sub set_blocks {
     $mungable_blocks{add} = \%added_blockers if keys %added_blockers;
     my $new_locks = 0;
     for my $add_remove (keys %mungable_blocks) {
-	my @munge_blockers;
 	my %munge_blockers;
-	my $block_locks = 0;
 	for my $blocker (keys %{$mungable_blocks{$add_remove}}) {
 	    next if $munge_blockers{$blocker};
 	    my ($temp_locks, @blocking_data) =
@@ -628,10 +625,8 @@ sub set_tag {
 	__begin_control(%param,
 			command  => 'tag'
 		       );
-    my ($debug,$transcript) =
-	@info{qw(debug transcript)};
+    my $transcript = $info{transcript};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my @tags = make_list($param{tag});
     if (not @tags and ($param{remove} or $param{add})) {
 	if ($param{remove}) {
@@ -649,11 +644,9 @@ sub set_tag {
 	my $action = 'Did not alter tags';
 	my %tag_added = ();
 	my %tag_removed = ();
-	my %fixed_removed = ();
 	my @old_tags = split /\,?\s+/, $data->{keywords};
 	my %tags;
 	@tags{@old_tags} = (1) x @old_tags;
-	my $reopened = 0;
 	my $old_data = dclone($data);
 	if (not $param{add} and not $param{remove}) {
 	    $tag_removed{$_} = 1 for @old_tags;
@@ -773,10 +766,8 @@ sub set_severity {
 	__begin_control(%param,
 			command  => 'severity'
 		       );
-    my ($debug,$transcript) =
-	@info{qw(debug transcript)};
+    my $transcript = $info{transcript};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
 
     my $action = '';
     for my $data (@data) {
@@ -878,10 +869,8 @@ sub set_done {
 	__begin_control(%param,
 			command  => $param{reopen}?'reopen':'done',
 		       );
-    my ($debug,$transcript) =
-	@info{qw(debug transcript)};
+    my $transcript = $info{transcript};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my $action ='';
 
     if ($param{reopen}) {
@@ -941,7 +930,6 @@ sub set_done {
     }
     else {
 	my %submitter_notified;
-	my $requester_notified = 0;
 	my $orig_report_set = 0;
 	for my $data (@data) {
 	    if (exists $data->{done} and
@@ -1100,7 +1088,6 @@ sub set_submitter {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my $action = '';
     # here we only concern ourselves with the first of the merged bugs
     for my $data ($data[0]) {
@@ -1116,7 +1103,7 @@ sub set_submitter {
 	}
 	else {
 	    if (defined $data->{originator} and length($data->{originator})) {
-		$action= "Changed $config{bug} submitter to '$param{submitter}' from '$data->{originator}'";
+		$action= "Changed $config{bug} submitter to '$param{submitter}' from '$data->{originator}'.";
 		$notify_old_submitter = 1;
 	    }
 	    else {
@@ -1215,7 +1202,6 @@ sub set_forwarded {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my $action = '';
     for my $data (@data) {
 	my $old_data = dclone($data);
@@ -1231,7 +1217,7 @@ sub set_forwarded {
 		$action= "Unset $config{bug} forwarded-to-address";
 	    }
 	    elsif (defined $data->{forwarded} and length($data->{forwarded})) {
-		$action= "Changed $config{bug} forwarded-to-address to '$param{forwarded}' from '$data->{forwarded}'";
+		$action= "Changed $config{bug} forwarded-to-address to '$param{forwarded}' from '$data->{forwarded}'.";
 	    }
 	    else {
 		$action= "Set $config{bug} forwarded-to-address to '$param{forwarded}'.";
@@ -1304,7 +1290,6 @@ sub set_title {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my $action = '';
     for my $data (@data) {
 	my $old_data = dclone($data);
@@ -1316,7 +1301,7 @@ sub set_title {
 	}
 	else {
 	    if (defined $data->{subject} and length($data->{subject})) {
-		$action= "Changed $config{bug} title to '$param{title}' from '$data->{subject}'";
+		$action= "Changed $config{bug} title to '$param{title}' from '$data->{subject}'.";
 	    } else {
 		$action= "Set $config{bug} title to '$param{title}'.";
 	    }
@@ -1399,7 +1384,6 @@ sub set_package {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     # clean up the new package
     my $new_package =
 	join(',',
@@ -1523,7 +1507,6 @@ sub set_found {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my %versions;
     for my $version (make_list($param{found})) {
 	next unless defined $version;
@@ -1743,7 +1726,6 @@ sub set_fixed {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my %versions;
     for my $version (make_list($param{fixed})) {
 	next unless defined $version;
@@ -1970,7 +1952,6 @@ sub set_merged {
 	return;
     }
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my %data;
     my %merged_bugs;
     for my $data (@data) {
@@ -1981,7 +1962,6 @@ sub set_merged {
     # handle unmerging
     my $new_locks = 0;
     if (not exists $param{merge_with}) {
-	my $ok_to_unmerge = 1;
 	delete $merged_bugs{$param{bug}};
 	if (not keys %merged_bugs) {
 	    print {$transcript} "Ignoring request to unmerge a bug which is not merged with any others.\n";
@@ -2015,9 +1995,6 @@ sub set_merged {
 	return;
     }
     # lock and load all of the bugs we need
-    my @bugs_to_load = keys %merging;
-    my $bug_to_load;
-    my %merge_added;
     my ($data,$n_locks) =
 	__lock_and_load_merged_bugs(bugs_to_load => [keys %merging],
 				    data => \@data,
@@ -2109,7 +2086,6 @@ sub set_merged {
 		    my %target_blockedby;
 		    @target_blockedby{@{$change->{func_value}}} = (1) x @{$change->{func_value}};
 		    my %unhandled_targets = %target_blockedby;
-		    my @blocks_to_remove;
 		    for my $key (split / /,$change->{orig_value}) {
 			delete $unhandled_targets{$key};
 			next if exists $target_blockedby{$key};
@@ -2560,7 +2536,6 @@ sub affects {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     my $action = '';
     for my $data (@data) {
 	$action = '';
@@ -2663,7 +2638,7 @@ Handles all setting of summary fields
 
 If summary is undef, unsets the summary
 
-If summary is 0, sets the summary to the first paragraph contained in
+If summary is 0 or -1, sets the summary to the first paragraph contained in
 the message passed.
 
 If summary is a positive integer, sets the summary to the message specified.
@@ -2738,7 +2713,6 @@ sub _summary {
     my ($debug,$transcript) =
 	@info{qw(debug transcript)};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
     # figure out the log that we're going to use
     my $summary = '';
     my $summary_msg = '';
@@ -2748,10 +2722,10 @@ sub _summary {
 	 print {$debug} "Removing $cmd fields\n";
 	 $action = "Removed $cmd";
     }
-    elsif ($param{$cmd} =~ /^\d+$/) {
+    elsif ($param{$cmd} =~ /^-?\d+$/) {
 	 my $log = [];
 	 my @records = Debbugs::Log::read_log_records(bug_num => $param{bug});
-	 if ($param{$cmd} == 0) {
+	 if ($param{$cmd} == 0 or $param{$cmd} == -1) {
 	      $log = $param{message};
 	      $summary_msg = @records + 1;
 	 }
@@ -2785,7 +2759,7 @@ sub _summary {
 	      }
 	      # skip a paragraph if it looks like it's control or
 	      # pseudo-headers
-	      if ($line =~ m{^\s*(?:Package|Source|Version|User|Tag|Severity)\:\s+\S}xi or #pseudo headers
+	      if ($line =~ m{^\s*(?:Package|Source|Version|User|Tag|Severity|Control)\:\s+\S}xi or #pseudo headers
 		  $line =~ m{^(?:package:?|(?:no|)owner|severity|tags?|summary| #control
 				 \#|reopen|close|(?:not|)(?:fixed|found)|clone|
 				 debug|(?:not|)forwarded|priority|
@@ -2894,10 +2868,8 @@ sub clone_bug {
 	__begin_control(%param,
 			command  => 'clone'
 		       );
-    my ($debug,$transcript) =
-	@info{qw(debug transcript)};
+    my $transcript = $info{transcript};
     my @data = @{$info{data}};
-    my @bugs = @{$info{bugs}};
 
     my $action = '';
     for my $data (@data) {
@@ -2963,19 +2935,21 @@ sub clone_bug {
     # bugs that this bug is blocking are also blocked by the new clone(s)
     for my $bug (split ' ', $data->{blocks}) {
 	for my $new_bug (@new_bugs) {
-	    set_blocks(bug => $new_bug,
-		       block => $bug,
+	    set_blocks(bug => $bug,
+		       block => $new_bug,
+		       add => 1,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),
 		      );
 	}
     }
-    # bugs that this bug is blocked by are also blocking the new clone(s)
+    # bugs that are blocking this bug are also blocking the new clone(s)
     for my $bug (split ' ', $data->{blockedby}) {
 	for my $new_bug (@new_bugs) {
-	    set_blocks(bug => $bug,
-		       block => $new_bug,
+	    set_blocks(bug => $new_bug,
+		       block => $bug,
+		       add => 1,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),
@@ -3029,7 +3003,6 @@ sub owner {
      my ($debug,$transcript) =
 	@info{qw(debug transcript)};
      my @data = @{$info{data}};
-     my @bugs = @{$info{bugs}};
      my $action = '';
      for my $data (@data) {
 	  print {$debug} "Going to change owner to '".(defined $param{owner}?$param{owner}:'(going to unset it)')."'\n";
@@ -3242,7 +3215,6 @@ sub bug_unarchive {
 				command=>'unarchive');
      my ($debug,$transcript) =
 	 @info{qw(debug transcript)};
-     my @data = @{$info{data}};
      my @bugs = @{$info{bugs}};
      my $action = "$config{bug} unarchived.";
      my @files_to_remove;
@@ -3820,7 +3792,7 @@ LIMIT:	    for my $limit (make_list($param{limit}{$field})) {
 	    }
 	    if (not $match) {
 		$going_to_fail = 1;
-		print {$transcript} qq($field: ).join(', ',map{qq("$_")} make_list($data->{$field})).
+		print {$transcript} qq($field: ').join(', ',map{qq("$_")} make_list($data->{$field})).
 		    "' does not match at least one of ".
 		    join(', ',map {ref($_)?'(regex)':qq("$_")} make_list($param{limit}{$field}))."\n";
 	    }
@@ -3863,7 +3835,7 @@ sub __message_body_template{
      $extra_var ||={};
      my $hole_var = {'&bugurl' =>
 		     sub{"$_[0]: ".
-			     'http://'.$config{cgi_domain}.'/'.
+			     $config{cgi_domain}.'/'.
 				 Debbugs::CGI::bug_links(bug => $_[0],
 							 links_only => 1,
 							);