Bug 97956 - Give summary and URL of bugs added or removed from dependencies in bugmail

Bugzilla/BugMail.pm

@@ -118,6 +118,9 @@ sub Send {
     my %recipients;
     my %watching;
 
+    # We also record bugs that are referenced
+    my @referenced_bug_ids = ();
+
     # Now we work out all the people involved with this bug, and note all of
     # the relationships in a hash. The keys are userids, the values are an
     # array of role constants.
@@ -161,8 +164,17 @@ sub Send {
                 $recipients{$uid}->{+REL_ASSIGNEE} = BIT_DIRECT if $uid;
             }
         }
+
+        if ($change->{field_name} eq 'dependson' || $change->{field_name} eq 'blocked') {
+            push @referenced_bug_ids, split(/[\s,]+/, $change->{old});
+            push @referenced_bug_ids, split(/[\s,]+/, $change->{new});
+        }
     }
 
+    my $referenced_bugs = scalar(@referenced_bug_ids)
+        ? Bugzilla::Bug->new_from_list([uniq @referenced_bug_ids])
+        : [];
+
     # Make sure %user_cache has every user in it so far referenced
     foreach my $user_id (keys %recipients) {
         $user_cache{$user_id} ||= new Bugzilla::User($user_id);
@@ -258,7 +270,8 @@ sub Send {
                                          $watching{$user_id} : undef,
                       diffs           => \@diffs,
                       rels_which_want => \%rels_which_want,
-                      dep_only => $params->{dep_only}
+                      dep_only        => $params->{dep_only},
+                      referenced_bugs => $referenced_bugs,
                     });
                 push(@sent, $user->login) if $sent_mail;
             }
@@ -289,6 +302,7 @@ sub sendMail {
     my @diffs           = @{ $params->{diffs} };
     my $relRef          = $params->{rels_which_want};
     my $dep_only        = $params->{dep_only};
+    my $referenced_bugs = $params->{referenced_bugs};
 
     # Only display changes the user is allowed see.
     my @display_diffs;
@@ -350,6 +364,7 @@ sub sendMail {
         changer            => $changer,
         diffs              => \@display_diffs,
         changedfields      => \@changedfields,
+        referenced_bugs    => $user->visible_bugs($referenced_bugs),
         new_comments       => \@send_comments,
         threadingmarker    => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
         bugmailtype        => $bugmailtype,

template/en/default/email/bugmail.html.tmpl

@@ -29,6 +29,23 @@
         </div>
       [% END %]
       </p>
+
+      [% IF referenced_bugs.size %]
+        <div id="referenced">
+          <hr style="border: 1px dashed #969696">
+          <b>Referenced [% terms.Bugs %]:</b>
+          <ul>
+            [% FOREACH ref_bug = referenced_bugs %]
+              <li>
+                [[% "${terms.Bug} ${ref_bug.id}" FILTER bug_link(ref_bug, {full_url => 1, user => to_user}) FILTER none %]] 
+                [% ref_bug.short_desc FILTER html %]
+              </li>
+            [% END %]
+          </ul>
+        </div>
+        <br>
+      [% END %]
+
       <hr>
       <span>You are receiving this mail because:</span>
 

template/en/default/email/bugmail.txt.tmpl

@@ -22,6 +22,15 @@
 [%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) %]
 [% END %]
 
+[% IF referenced_bugs.size %]
+
+Referenced [% terms.Bugs %]:
+
+[% FOREACH ref_bug = referenced_bugs %]
+[%+ urlbase %]show_bug.cgi?id=[% ref_bug.id %]
+[%+ "[" _ terms.Bug _ " " _ ref_bug.id _ "] " _ ref_bug.short_desc FILTER wrap_comment %]
+[% END %]
+[% END %]
 -- [%# Protect the trailing space of the signature marker %]
 You are receiving this mail because:
 [% SET reason_lines = [] %]