commit e39d0cd4025c21dfc1da385702f99fe0cea15aac
author Mike Frysinger <vapier@chromium.org> Mon Nov 25 13:30:06 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Nov 25 19:41:26 2019 +0000
tree ddc3ff37cd644ffa6038fe5e4a65230a3a6fea4d
parent 6d28b59e84d0c198b4616a2a6e8860b2d1f9726e

pre-upload: reject CQ-DEPEND lines

These were only for the old CQ system.  We use Cq-Depend: tags now.
Reject the old style to help people migrate.

BUG=None
TEST=`repo upload` works

Change-Id: I442b093be67bbc237c5a49ff346b569214c44068
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/1933029
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 5f1f95d..511324d 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -634,13 +634,20 @@
   except ValueError as ex:
     return HookFailure(msg, [example, str(ex)])
   # Check that Cq-Depend is in the same paragraph as Change-Id.
-  msg = 'Cq-Depend (or CQ-DEPEND) is not in the same paragraph as Change-Id.'
+  msg = 'Cq-Depend is not in the same paragraph as Change-Id.'
   paragraphs = desc.split('\n\n')
   for paragraph in paragraphs:
-    if (re.search(r'^Cq-Depend:', paragraph, re.M) or
-        re.search(r'^CQ-DEPEND=', paragraph, re.M)) \
-        and not re.search('^Change-Id:', paragraph, re.M):
+    if (re.search(r'^Cq-Depend:', paragraph, re.M) and not
+        re.search('^Change-Id:', paragraph, re.M)):
       return HookFailure(msg)
+
+  # We no longer support CQ-DEPEND= lines.
+  if re.search(r'^CQ-DEPEND[=:]', desc, re.M):
+    return HookFailure(
+        'CQ-DEPEND= is no longer supported.  Please see:\n'
+        'https://chromium.googlesource.com/chromiumos/docs/+/HEAD/'
+        'contributing.md#CQ-DEPEND')
+
   return None
 
 

pre-upload_unittest.py

diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index 62e5d90..f672a7c 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -1166,6 +1166,7 @@
     self.assertMessageRejected('\nCq-Depend=chromium=1234\n')
     self.assertMessageRejected('\nCq-Depend: None\n')
     self.assertMessageRejected('\nCq-Depend: chromium:1234\n\nChange-Id: I123')
+    self.assertMessageRejected('\nCQ-DEPEND=1234\n')
 
 
 class CheckCommitMessageContribution(CommitMessageTestCase):