Rietveld: rely on CQ to decide whether to send email.

appengine/chromium_rietveld/codereview/views.py

Index: appengine/chromium_rietveld/codereview/views.py
diff --git a/appengine/chromium_rietveld/codereview/views.py b/appengine/chromium_rietveld/codereview/views.py
index bb9609f1d43798db0197be80c932cca75892fe92..744e0822e6772db92a7bf004a74f91180264f4e9 100644
--- a/appengine/chromium_rietveld/codereview/views.py
+++ b/appengine/chromium_rietveld/codereview/views.py
@@ -311,9 +311,14 @@ class PublishForm(forms.Form):
   in_reply_to = forms.CharField(required=False,
                                 max_length=MAX_DB_KEY_LENGTH,
                                 widget=forms.HiddenInput())
-  automated = forms.BooleanField(required=False, widget=forms.HiddenInput(),
-                                 initial=True)
-  verbose = forms.BooleanField(required=False, widget=forms.HiddenInput())
+  auto_generated = forms.BooleanField(required=False,
+                                      widget=forms.HiddenInput(),
+                                      initial=False)
+  cq_dry_run = forms.BooleanField(required=False,
+                                  widget=forms.HiddenInput(),
+                                  initial=False)
+  cq_status_url = forms.CharField(required=False,
+                                  widget=forms.HiddenInput())
 
 
 class MiniPublishForm(forms.Form):
@@ -337,9 +342,14 @@ class MiniPublishForm(forms.Form):
   no_redirect = forms.BooleanField(required=False,
                                    widget=forms.HiddenInput())
   commit = forms.BooleanField(required=False, widget=forms.HiddenInput())
-  automated = forms.BooleanField(required=False, widget=forms.HiddenInput(),
-                                 initial=True)
-  verbose = forms.BooleanField(required=False, widget=forms.HiddenInput())
+  auto_generated = forms.BooleanField(required=False,
+                                      widget=forms.HiddenInput(),
+                                      initial=False)
+  cq_dry_run = forms.BooleanField(required=False,
+                                  widget=forms.HiddenInput(),
+                                  initial=False)
+  cq_status_url = forms.CharField(required=False,
+                                  widget=forms.HiddenInput())
 
 
 class BlockForm(forms.Form):
@@ -3419,22 +3429,18 @@ def publish(request):
   if comments:
     logging.warn('Publishing %d comments', len(comments))
 
+  email_to = None
   if request.user.email().lower() in (CQ_COMMIT_BOT_EMAIL, CQ_SERVICE_ACCOUNT):
-    issue.update_cq_status_url_if_any(form.cleaned_data['message'])
+    if form.cleaned_data['cq_status_url']:
+      issue.update_cq_status_url_if_any(
+          form.cleaned_data['cq_status_url'].strip())
+
+    if form.cleaned_data['cq_dry_run']:
+      # Email only the triggerer and the CL owner the dry run result,
+      # More details are in http://crbug.com/626427.
+      email_to = list(set([issue.owner.email(),
+                           issue.cq_dry_run_last_triggered_by]))
 
-  # 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)
   msg = make_message(request, issue,
                      form.cleaned_data['message'],
                      comments,
@@ -3442,7 +3448,7 @@ def publish(request):
                      draft=draft_message,
                      email_to=email_to,
                      in_reply_to=form.cleaned_data.get('in_reply_to'),
-                     auto_generated=auto_generated)
+                     auto_generated=form.cleaned_data['auto_generated'])
   tbd.append(msg)
 
   for obj in tbd: