Bug 366629: Bugmail messed up if adding dependency for resolved bug in new bug

Bugzilla/BugMail.pm

@@ -215,6 +215,7 @@ sub Send {
                    $when_restriction
           ORDER BY bugs_activity.bug_when", undef, @args);
 
+    my @new_depbugs;
     my $difftext = "";
     my $diffheader = "";
     my @diffparts;
@@ -238,6 +239,9 @@ sub Send {
             $old = format_time_decimal($old);
             $new = format_time_decimal($new);
         }
+        if ($fieldname eq 'dependson') {
+            push(@new_depbugs, grep {$_ =~ /^\d+$/} split(/[\s,]+/, $new));
+        }
         if ($attachid) {
             ($diffpart->{'isprivate'}) = $dbh->selectrow_array(
                 'SELECT isprivate FROM attachments WHERE attach_id = ?',
@@ -252,7 +256,17 @@ sub Send {
     }
     $values{'changed_fields'} = join(' ', @changedfields);
 
+    my @depbugs;
     my $deptext = "";
+    # Do not include data about dependent bugs when they have just been added.
+    # Completely skip checking for dependent bugs on bug creation as all
+    # dependencies bugs will just have been added.
+    if ($start) {
+        my $dep_restriction = "";
+        if (scalar @new_depbugs) {
+            $dep_restriction = "AND bugs_activity.bug_id NOT IN (" .
+                               join(", ", @new_depbugs) . ")";
+        }
 
         my $dependency_diffs = $dbh->selectall_arrayref(
            "SELECT bugs_activity.bug_id, bugs.short_desc, fielddefs.name, 
@@ -268,12 +282,12 @@ sub Send {
                AND (fielddefs.name = 'bug_status'
                     OR fielddefs.name = 'resolution')
                    $when_restriction
+                   $dep_restriction
           ORDER BY bugs_activity.bug_when, bugs.bug_id", undef, @args);
 
         my $thisdiff = "";
         my $lastbug = "";
         my $interestingchange = 0;
-    my @depbugs;
         foreach my $dependency_diff (@$dependency_diffs) {
             my ($depbug, $summary, $what, $old, $new) = @$dependency_diff;
 
@@ -297,14 +311,12 @@ sub Send {
             {
                 $interestingchange = 1;
             }
-        
             push(@depbugs, $depbug);
         }
 
         if ($interestingchange) {
             $deptext .= $thisdiff;
         }
-
         $deptext = trim($deptext);
 
         if ($deptext) {
@@ -312,7 +324,7 @@ sub Send {
             $diffpart->{'text'} = "\n" . trim("\n\n" . $deptext);
             push(@diffparts, $diffpart);
         }
-
+    }
 
     my ($raw_comments, $anyprivate, $count) = get_comments_by_bug($id, $start, $end);