Bugzilla: Don't send mail if the only change is to the in-rietveld flag.

Reviewed by David Kilzer.

https://bugs.webkit.org/show_bug.cgi?id=39090

* Bugzilla/BugMail.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@59500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/Bugzilla/BugMail.pm b/BugsSite/Bugzilla/BugMail.pm
index 46f5597186db6b1bce30b9dd3212a4e51a51d358..d4c9a47f9a5abf1c97bf19cadc7c5a2f6195fdc5 100644 (file)
--- a/BugsSite/Bugzilla/BugMail.pm
+++ b/BugsSite/Bugzilla/BugMail.pm
@@ -574,6 +574,14 @@ sub sendMail {
                  && !($user->groups->{Bugzilla->params->{'insidergroup'}})
                 ) {
             $add_diff = 0;
+#if WEBKIT_CHANGES
+        # If the only thing we are modifying is the in-rietveld flag, don't
+        # include this diff.  If multiple flags are being modified,
+        # the diff text will have a comma seperating it.
+        # This will prevent mail from being sent.
+        } elsif ($diff->{'text'} =~ /in-rietveld/ && !($diff->{'text'} =~ /,/)) {
+            $add_diff = 0;
+#endif // WEBKIT_CHANGES
         } else {
             $add_diff = 1;
         }

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index c894ae48a77696e93c995148cf3c4ad4e3addc47..6a5cf391004a5e06b205a7b8bdec01a324a739c9 100644 (file)
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-13  Julie Parent  <jparent@chromium.org>
+
+        Reviewed by David Kilzer.
+
+        Bugzilla: Don't send mail if the only change is to the in-rietveld flag.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=39090
+
+        * Bugzilla/BugMail.pm:
+
 2010-05-12  Julie Parent  <jparent@chromium.org>
 
         Reviewed by Ojan Vafai.