commit c80e3f6026fcee94871c47c796afef9197a477d4
author Puneet Kumar <puneetster@chromium.org> Mon Aug 13 19:01:18 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Aug 14 18:24:03 2012 -0700
tree 87dba9b40d8961580658e938d3753e632b11bfc5
parent 28766e6d35887b475c44ffdad2d927ab682fe690

Add check for BRANCH= tag on project specific repos

BUG=none
TEST="Test that a upload in the projects specified by this CL
      require a BRANCH= line in the commit message;

      Also test that the check is ignored if the PRESUBMIT.cfg file
      has a branch_check: false"

Change-Id: Ia6315145e24ae7f4dcc26a40ebcef9224d4bdba5
Reviewed-on: https://gerrit.chromium.org/gerrit/30127
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Puneet Kumar <puneetster@chromium.org>
Tested-by: Puneet Kumar <puneetster@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 7b3db58..b5215e3 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -359,6 +359,16 @@
       return HookFailure('Invalid JSON in %s: %s' % (f, e))
 
 
+def _check_change_has_branch_field(project, commit):
+  """Check for a non-empty 'BRANCH=' field in the commit message."""
+  BRANCH_RE = r'\nBRANCH=\S+'
+
+  if not re.search(BRANCH_RE, _get_commit_desc(commit)):
+    msg = ('Changelist description needs BRANCH field (after first line)\n'
+           'E.g. BRANCH=none or BRANCH=link,snow')
+    return HookFailure(msg)
+
+
 # Base
 
 
@@ -379,10 +389,16 @@
 _PROJECT_SPECIFIC_HOOKS = {
     "chromiumos/third_party/kernel": [_run_checkpatch],
     "chromiumos/third_party/kernel-next": [_run_checkpatch],
-    "chromiumos/third_party/u-boot": [_run_checkpatch_no_tree],
-    "chromiumos/platform/u-boot-vboot-integration": [_run_checkpatch_no_tree],
-    "chromiumos/platform/ec": [_run_checkpatch_no_tree],
-    "chromeos/platform/ec-private": [_run_checkpatch_no_tree],
+    "chromiumos/third_party/u-boot": [_run_checkpatch_no_tree,
+                                      _check_change_has_branch_field],
+    "chromiumos/platform/ec": [_run_checkpatch_no_tree,
+                               _check_change_has_branch_field],
+    "chromeos/platform/ec-private": [_run_checkpatch_no_tree,
+                                     _check_change_has_branch_field],
+    "chromeos/third_party/coreboot": [_check_change_has_branch_field],
+    "chromiumos/platform/vboot_reference": [_check_change_has_branch_field],
+    "chromiumos/platform/mosys": [_check_change_has_branch_field],
+    "chromiumos/third_party/flashrom": [_check_change_has_branch_field],
     "chromeos/autotest-tools": [_run_json_check],
 }
 
@@ -394,6 +410,7 @@
     'long_line_check': _check_no_long_lines,
     'cros_license_check': _check_license,
     'tab_check': _check_no_tabs,
+    'branch_check': _check_change_has_branch_field,
 }
 
 
@@ -431,7 +448,8 @@
   hooks = [hook for hook in _COMMON_HOOKS if hook not in disabled_hooks]
 
   if project in _PROJECT_SPECIFIC_HOOKS:
-    hooks.extend(_PROJECT_SPECIFIC_HOOKS[project])
+    hooks.extend(hook for hook in _PROJECT_SPECIFIC_HOOKS[project]
+                 if hook not in disabled_hooks)
 
   return hooks