Rietveld: don't email on "Dry Run: CQ is trying da patch"

appengine/chromium_rietveld/codereview/views.py

 # Copyright 2008 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 3401 matching lines @@
     tbd, comments = _get_draft_comments(request, issue)
   else:
     tbd = []
     comments = []
   issue.update_comment_count(len(comments))
   tbd.append(issue)
 
   if comments:
     logging.warn('Publishing %d comments', len(comments))
 
+  email_to = None
+  auto_generated = False
   if request.user.email().lower() in (CQ_COMMIT_BOT_EMAIL, CQ_SERVICE_ACCOUNT):
     issue.update_cq_status_url_if_any(form.cleaned_data['message'])
 
-  # Email only the triggerer and the CL owner if it was a CQ dry run request.
-  # More details are in http://crbug.com/476883.
-  email_to = None
-  # Mark CQ dry run messages as autogenerated.
-  # More details: http://crbug.com/596249.
-  auto_generated = False
-  if (request.user.email().lower() in (CQ_COMMIT_BOT_EMAIL, CQ_SERVICE_ACCOUNT)
-       and 'dry run' in form.cleaned_data['message'].lower()):
-    email_to = [issue.owner.email()]
-    auto_generated = True
-    if (issue.cq_dry_run_last_triggered_by and
-        issue.cq_dry_run_last_triggered_by != issue.owner.email()):
-      email_to.append(issue.cq_dry_run_last_triggered_by)
+    if utils.is_cq_dry_run_message(form.cleaned_data['message']):
+      # Mark CQ dry run messages as autogenerated.
+      # More details: http://crbug.com/596249.
+      auto_generated = True
+      # Email only the triggerer and the CL owner the dry run result,
+      # but don't email anyone on the first message.
+      # More details are in http://crbug.com/626427.
+      if utils.is_cq_dry_run_start_message(form.cleaned_data['message']):
+        email_to = []
+      else:
+        email_to = list(set([issue.owner.email(),
+                             issue.cq_dry_run_last_triggered_by]))
+
+
   msg = make_message(request, issue,
                      form.cleaned_data['message'],
                      comments,
                      form.cleaned_data['send_mail'],
                      draft=draft_message,
                      email_to=email_to,
                      in_reply_to=form.cleaned_data.get('in_reply_to'),
                      auto_generated=auto_generated)
   tbd.append(msg)
 
@@ skipping 2128 matching lines @@
     return HttpResponseNotFound()
   tops = []
   shame = []
   for i in data:
     if i.score == models.AccountStatsBase.NULL_SCORE:
       shame.append(i)
     else:
       tops.append(i)
   return respond(
       request, 'leaderboard.html', {'tops': tops, 'shame': shame, 'when': when})