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

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 293 matching lines @@
                             max_length=MAX_MESSAGE,
                             widget=forms.Textarea(attrs={'cols': 60}))
   message_only = forms.BooleanField(required=False,
                                     widget=forms.HiddenInput())
   no_redirect = forms.BooleanField(required=False,
                                    widget=forms.HiddenInput())
   commit = forms.BooleanField(required=False, widget=forms.HiddenInput())
   in_reply_to = forms.CharField(required=False,
                                 max_length=MAX_DB_KEY_LENGTH,
                                 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())
+  automated = forms.BooleanField(required=False, widget=forms.HiddenInput(),
+                                 initial=True)
+  verbose = forms.BooleanField(required=False, widget=forms.HiddenInput())
 
 
 class MiniPublishForm(forms.Form):
 
   reviewers = forms.CharField(
       required=False,
       max_length=MAX_REVIEWERS,
       widget=AccountInput(attrs={'size': 60}),
       help_text=REQUIRED_REVIEWERS_HELP_TEXT)
   cc = forms.CharField(required=False,
                        max_length=MAX_CC,
                        label = 'CC',
                        widget=AccountInput(attrs={'size': 60}))
   send_mail = forms.BooleanField(required=False)
   add_as_reviewer = forms.BooleanField(required=False, initial=True)
   message = forms.CharField(required=False,
                             max_length=MAX_MESSAGE,
                             widget=forms.Textarea(attrs={'cols': 60}))
   message_only = forms.BooleanField(required=False,
                                     widget=forms.HiddenInput())
   no_redirect = forms.BooleanField(required=False,
                                    widget=forms.HiddenInput())
   commit = 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())
+  automated = forms.BooleanField(required=False, widget=forms.HiddenInput(),
+                                 initial=True)
+  verbose = forms.BooleanField(required=False, widget=forms.HiddenInput())
 
 
 class BlockForm(forms.Form):
   blocked = forms.BooleanField(
       required=False,
       help_text='Should this user be blocked')
 
 
 FORM_CONTEXT_VALUES = [(z, '%d lines' % z) for z in models.CONTEXT_CHOICES]
 FORM_CONTEXT_VALUES.append(('', 'Whole file'))
@@ skipping 3059 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))
 
+  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
-  if request.user.email().lower() in (CQ_COMMIT_BOT_EMAIL, CQ_SERVICE_ACCOUNT):
-    if form.cleaned_data['cq_status_url']:
-      issue.update_cq_status_url(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]))
-
+  # 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,
                      form.cleaned_data['send_mail'],
                      draft=draft_message,
                      email_to=email_to,
                      in_reply_to=form.cleaned_data.get('in_reply_to'),
-                     auto_generated=form.cleaned_data['auto_generated'])
+                     auto_generated=auto_generated)
   tbd.append(msg)
 
   for obj in tbd:
     obj.put()
 
   if form.cleaned_data['commit'] and not issue.cq_dry_run and not issue.closed:
     notify_approvers_of_new_patchsets(request, issue)
 
   notify_xmpp.notify_issue(request, issue, 'Comments published')
 
@@ skipping 2120 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})