X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FControl.pm;h=416abc150104741bff85625bb03353ab0930a3dd;hb=4118f90e5b711616eeff28aef36615b0a892b57f;hp=631504a8d5420a24db292d736732201a3ad9113b;hpb=d61a76fc5e1b52929a02705c07ac03936fd14244;p=debbugs.git diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 631504a..416abc1 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; @@ -87,6 +87,7 @@ BEGIN{ severity => [qw(set_severity)], affects => [qw(affects)], summary => [qw(summary)], + outlook => [qw(outlook)], owner => [qw(owner)], title => [qw(set_title)], forward => [qw(set_forwarded)], @@ -99,6 +100,7 @@ BEGIN{ clone => [qw(clone_bug)], archive => [qw(bug_archive bug_unarchive), ], + limit => [qw(check_limit)], log => [qw(append_action_to_log), ], ); @@ -109,6 +111,7 @@ BEGIN{ use Debbugs::Config qw(:config); use Debbugs::Common qw(:lock buglog :misc get_hashname sort_versions); +use Debbugs::UTF8; use Debbugs::Status qw(bug_archiveable :read :hook writebug new_bug splitpackages split_status_fields get_bug_status); use Debbugs::CGI qw(html_escape); use Debbugs::Log qw(:misc :write); @@ -123,7 +126,7 @@ use IO::File; use Debbugs::Text qw(:templates); -use Debbugs::Mail qw(rfc822_date send_mail_message default_headers); +use Debbugs::Mail qw(rfc822_date send_mail_message default_headers encode_headers); use Debbugs::MIME qw(create_mime_message); use Mail::RFC822::Address qw(); @@ -132,6 +135,7 @@ use POSIX qw(strftime); use Storable qw(dclone nfreeze); use List::Util qw(first max); +use Encode qw(encode_utf8); use Carp; @@ -1112,7 +1116,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 { @@ -1227,7 +1231,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}'."; @@ -1312,7 +1316,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}'."; } @@ -1575,7 +1579,11 @@ sub set_found { if (not @svers) { @svers = $version; } - else { + elsif (not grep {$version eq $_} @svers) { + # The $version was not equal to one of the source + # versions, so it's probably unqualified (or just + # wrong). Delete it, and use the source versions + # instead. if (exists $found_versions{$version}) { delete $found_versions{$version}; $found_removed{$version} = 1; @@ -1588,7 +1596,7 @@ sub set_found { } # if the found we are adding matches any fixed # versions, remove them - my @temp = grep m{(^|/)\Q$sver\E}, keys %fixed_versions; + my @temp = grep m{(^|/)\Q$sver\E$}, keys %fixed_versions; delete $fixed_versions{$_} for @temp; $fixed_removed{$_} = 1 for @temp; } @@ -1612,7 +1620,7 @@ sub set_found { # in the case of removal, we only concern ourself with # the version passed, not the source version it maps # to - my @temp = grep m{(^|/)\Q$version\E}, keys %found_versions; + my @temp = grep m{(?:^|/)\Q$version\E$}, keys %found_versions; delete $found_versions{$_} for @temp; $found_removed{$_} = 1 for @temp; } @@ -2019,7 +2027,7 @@ sub set_merged { $new_locks += $n_locks; %data = %{$data}; @data = values %data; - if (not __check_limit(data => [@data], + if (not check_limit(data => [@data], exists $param{limit}?(limit => $param{limit}):(), transcript => $transcript, )) { @@ -2165,7 +2173,7 @@ sub set_merged { $locks--; } __end_control(%info); - for my $change (values %{$changes}, @{$disallowed_changes}) { + for my $change ((map {@{$_}} values %{$changes}), @{$disallowed_changes}) { print {$transcript} "$change->{field} of #$change->{bug} is '$change->{text_orig_value}' not '$change->{text_value}'\n"; } die "Unable to modify bugs so they could be merged"; @@ -2300,7 +2308,7 @@ sub __calculate_merge_status{ # look like. However, if merge is set, tags, fixed and found # are merged. if ($data->{bug_num} == $master_bug) { - for (qw(package forwarded severity blocks blockedby done owner summary affects)) { + for (qw(package forwarded severity blocks blockedby done owner summary outlook affects)) { $merge_status{$_} = $data->{$_} } } @@ -2316,6 +2324,17 @@ sub __calculate_merge_status{ @{$merge_status{"${_}_versions"}}{@{$data->{"${_}_versions"}}} = (1) x @{$data->{"${_}_versions"}}; } } + # if there is a non-source qualified version with a corresponding + # source qualified version, we only want to merge the source + # qualified version(s) + for (qw(fixed found)) { + my @unqualified_versions = grep {m{/}?0:1} keys %{$merge_status{"${_}_versions"}}; + for my $unqualified_version (@unqualified_versions) { + if (grep {m{/\Q$unqualified_version\E}} keys %{$merge_status{"${_}_versions"}}) { + delete $merge_status{"${_}_versions"}{$unqualified_version}; + } + } + } return (\%merge_status,$bugs_to_merge); } @@ -2370,6 +2389,10 @@ sub __calculate_merge_changes{ key => 'summary', options => [], }, + outlook => {func => \&outlook, + key => 'outlook', + options => [], + }, affects => {func => \&affects, key => 'package', options => [], @@ -2394,7 +2417,7 @@ sub __calculate_merge_changes{ allowed => 1, }, ); - for my $field (qw(forwarded severity blocks blockedby done owner summary affects package fixed_versions found_versions keywords)) { + for my $field (qw(forwarded severity blocks blockedby done owner summary outlook affects package fixed_versions found_versions keywords)) { # if the ideal bug already has the field set properly, we # continue on. if ($field eq 'keywords'){ @@ -2640,7 +2663,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. @@ -2651,23 +2674,66 @@ Otherwise, sets summary to the value passed. sub summary { - my %param = validate_with(params => \@_, + # outlook and summary are exactly the same, basically + return _summary('summary',@_); +} + +=head1 OUTLOOK FUNCTIONS + +=head2 outlook + + eval { + outlook(bug => $ref, + transcript => $transcript, + ($dl > 0 ? (debug => $transcript):()), + requester => $header{from}, + request_addr => $controlrequestaddr, + message => \@log, + affected_packages => \%affected_packages, + recipients => \%recipients, + outlook => undef, + ); + }; + if ($@) { + $errors++; + print {$transcript} "Failed to mark $ref with outlook foo: $@"; + } + +Handles all setting of outlook fields + +If outlook is undef, unsets the outlook + +If outlook is 0, sets the outlook to the first paragraph contained in +the message passed. + +If outlook is a positive integer, sets the outlook to the message specified. + +Otherwise, sets outlook to the value passed. + +=cut + + +sub outlook { + return _summary('outlook',@_); +} + +sub _summary { + my ($cmd,@params) = @_; + my %param = validate_with(params => \@params, spec => {bug => {type => SCALAR, regex => qr/^\d+$/, }, # specific options here - summary => {type => SCALAR|UNDEF, - default => 0, - }, + $cmd , {type => SCALAR|UNDEF, + default => 0, + }, %common_options, %append_action_options, }, ); -# croak "summary must be numeric or undef" if -# defined $param{summary} and not $param{summary} =~ /^\d+/; my %info = __begin_control(%param, - command => 'summary' + command => $cmd, ); my ($debug,$transcript) = @info{qw(debug transcript)}; @@ -2677,27 +2743,27 @@ sub summary { my $summary = ''; my $summary_msg = ''; my $action = ''; - if (not defined $param{summary}) { + if (not defined $param{$cmd}) { # do nothing - print {$debug} "Removing summary fields\n"; - $action = 'Removed summary'; + print {$debug} "Removing $cmd fields\n"; + $action = "Removed $cmd"; } - elsif ($param{summary} =~ /^\d+$/) { + elsif ($param{$cmd} =~ /^-?\d+$/) { my $log = []; my @records = Debbugs::Log::read_log_records(bug_num => $param{bug}); - if ($param{summary} == 0) { + if ($param{$cmd} == 0 or $param{$cmd} == -1) { $log = $param{message}; $summary_msg = @records + 1; } else { - if (($param{summary} - 1 ) > $#records) { - die "Message number '$param{summary}' exceeds the maximum message '$#records'"; + if (($param{$cmd} - 1 ) > $#records) { + die "Message number '$param{$cmd}' exceeds the maximum message '$#records'"; } - my $record = $records[($param{summary} - 1 )]; + my $record = $records[($param{$cmd} - 1 )]; if ($record->{type} !~ /incoming-recv|recips/) { - die "Message number '$param{summary}' is a invalid message type '$record->{type}'"; + die "Message number '$param{$cmd}' is a invalid message type '$record->{type}'"; } - $summary_msg = $param{summary}; + $summary_msg = $param{$cmd}; $log = [$record->{text}]; } my $p_o = Debbugs::MIME::parse(join('',@{$log})); @@ -2719,7 +2785,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| @@ -2736,38 +2802,38 @@ sub summary { next if $in_pseudoheaders; $paragraph .= $line ." \n"; } - print {$debug} "Summary is going to be '$paragraph'\n"; + print {$debug} ucfirst($cmd)." is going to be '$paragraph'\n"; $summary = $paragraph; $summary =~ s/[\n\r]/ /g; if (not length $summary) { - die "Unable to find summary message to use"; + die "Unable to find $cmd message to use"; } # trim off a trailing spaces $summary =~ s/\ *$//; } else { - $summary = $param{summary}; + $summary = $param{$cmd}; } for my $data (@data) { - print {$debug} "Going to change summary\n"; + print {$debug} "Going to change $cmd\n"; if (((not defined $summary or not length $summary) and - (not defined $data->{summary} or not length $data->{summary})) or - $summary eq $data->{summary}) { - print {$transcript} "Ignoring request to change the summary of bug $param{bug} to the same value\n"; + (not defined $data->{$cmd} or not length $data->{$cmd})) or + $summary eq $data->{$cmd}) { + print {$transcript} "Ignoring request to change the $cmd of bug $param{bug} to the same value\n"; next; } if (length $summary) { - if (length $data->{summary}) { - $action = "Summary replaced with message bug $param{bug} message $summary_msg"; + if (length $data->{$cmd}) { + $action = ucfirst($cmd)." replaced with message bug $param{bug} message $summary_msg"; } else { - $action = "Summary recorded from message bug $param{bug} message $summary_msg"; + $action = ucfirst($cmd)." recorded from message bug $param{bug} message $summary_msg"; } } my $old_data = dclone($data); - $data->{summary} = $summary; + $data->{$cmd} = $summary; append_action_to_log(bug => $data->{bug_num}, - command => 'summary', + command => $cmd, old_data => $old_data, new_data => $data, get_lock => 0, @@ -2897,19 +2963,19 @@ 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, 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, hash_slice(%param, keys %common_options, keys %append_action_options), @@ -3355,7 +3421,7 @@ sub append_action_to_log{ $nd{$key} = $new_data->{$key}; # $data_diff .= html_escape("$Debbugs::Status::fields{$key}: $new_data->{$key}")."\n"; } - $data_diff .= html_escape(Data::Dumper->Dump([\%nd],[qw(new_data)])); + $data_diff .= html_escape(Data::Dumper->Dump([encode_utf8_structure(\%nd)],[qw(new_data)])); $data_diff .= "-->\n"; $data_diff .= "\n"; } my $msg = join('', (exists $param{command} ? - "\n":"" + "\n":"" ), (length $param{requester} ? - "\n":"" + "\n":"" ), (length $param{request_addr} ? - "\n":"" + "\n":"" ), "\n", $data_diff, - "".html_escape($param{action})."\n"); + "".html_escape(encode_utf8_safely($param{action}))."\n"); if (length $param{requester}) { - $msg .= "Request was from ".html_escape($param{requester})."\n"; + $msg .= "Request was from ".html_escape(encode_utf8_safely($param{requester}))."\n"; } if (length $param{request_addr}) { - $msg .= "to ".html_escape($param{request_addr}).""; + $msg .= "to ".html_escape(encode_utf8_safely($param{request_addr})).""; } if (length $param{desc}) { - $msg .= ":
\n$param{desc}\n"; + $msg .= ":
\n".encode_utf8_safely($param{desc})."\n"; } else { $msg .= ".\n"; @@ -3401,7 +3467,7 @@ sub append_action_to_log{ $msg = ''; if ((ref($param{message}) and @{$param{message}}) or length($param{message})) { push @records, {type => exists $param{recips}?'recips':'incoming-recv', - exists $param{recips}?(recips => [make_list($param{recips})]):(), + exists $param{recips}?(recips => [map {encode_utf8_safely($_)} make_list($param{recips})]):(), text => join('',make_list($param{message})), }; } @@ -3525,13 +3591,14 @@ sub __return_append_to_log_options{ } if (not exists $param{message}) { my $date = rfc822_date(); - $param{message} = fill_in_template(template => 'mail/fake_control_message', - variables => {request_addr => $param{request_addr}, - requester => $param{requester}, - date => $date, - action => $action - }, - ); + $param{message} = + encode_headers(fill_in_template(template => 'mail/fake_control_message', + variables => {request_addr => $param{request_addr}, + requester => $param{requester}, + date => $date, + action => $action + }, + )); } if (not defined $action) { carp "Undefined action!"; @@ -3617,7 +3684,7 @@ sub __begin_control { } } } - if (not __check_limit(data => \@data, + if (not check_limit(data => \@data, exists $param{limit}?(limit => $param{limit}):(), transcript => $transcript, )) { @@ -3684,9 +3751,9 @@ sub __end_control { } -=head2 __check_limit +=head2 check_limit - __check_limit(data => \@data, limit => $param{limit}); + check_limit(data => \@data, limit => $param{limit}); Checks to make sure that bugs match any limits; each entry of @data @@ -3703,9 +3770,9 @@ limit to succeed. =cut -sub __check_limit{ +sub check_limit{ my %param = validate_with(params => \@_, - spec => {data => {type => ARRAYREF|SCALAR, + spec => {data => {type => ARRAYREF|HASHREF, }, limit => {type => HASHREF|UNDEF, }, @@ -3797,7 +3864,9 @@ sub __message_body_template{ my $hole_var = {'&bugurl' => sub{"$_[0]: ". 'http://'.$config{cgi_domain}.'/'. - Debbugs::CGI::bug_url($_[0]); + Debbugs::CGI::bug_links(bug => $_[0], + links_only => 1, + ); } };