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

appengine/chromium_rietveld/codereview/utils.py

 # Copyright 2011 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 78 matching lines @@
 
   Args:
     text: a string.
 
   Returns:
     A string with all line breaks converted to LF.
   """
   return text.replace('\r\n', '\n').replace('\r', '\n')
 
 
-_CQ_STATUS_URL_REGEX = re.compile(
-    '^https://.+/patch-status/(.+/)?(\d+)/(\d+)$', re.I)
+_CQ_STATUS_REGEX = re.compile(
+    '(dry run: )?CQ is trying da patch. Follow status at\s+'
+    '(https://.+/patch-status/(.+/)?(\d+)/(\d+))\s*', re.I)
 
 
-def parse_cq_status_url(url):
-  """Returns issue, patchset parsed from CQ status url.
+def parse_cq_status_url_message(msg):
+  """Returns url, issue, patchset parsed from CQ status message.
 
-  If parsing failed, returns None, None.
+  If parsing failed, returns None, None, None.
   """
-  # Example of url:
+  # Example of message, Dry Run prefix is optional.
+  # Dry run: CQ is trying da patch. Follow status at
   # https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2131593002/1
-  match = _CQ_STATUS_URL_REGEX.match(url)
+  match = _CQ_STATUS_REGEX.match(msg)
   if not match:
-    return None, None
-  _, issue, patchset = match.groups()
-  return int(issue), int(patchset)
+    return None, None, None
+  _, url, _, issue, patchset = match.groups()
+  return url, int(issue), int(patchset)