From 53df136240bc78e8054085a2ef25c4240530a745 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 26 Jan 2012 21:24:23 +0000
Subject: [PATCH] Add upload and commit checks to a common function.

Add HasDescription and HasNoStrayWhitespace checks.

BUG=none
TEST=uploaded a dummy CL with violations.

Review URL: https://webrtc-codereview.appspot.com/372004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1556 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 PRESUBMIT.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index d2903093e2..33bdab3e06 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -6,8 +6,9 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-def CheckChangeOnUpload(input_api, output_api):
-  webrtc_license_header = (
+def _LicenseHeader(input_api):
+  """Returns the license header regexp."""
+  license_header = (
       r'.*? Copyright \(c\) %(year)s The WebRTC project authors\. '
         r'All Rights Reserved\.\n'
       r'.*?\n'
@@ -20,19 +21,34 @@ def CheckChangeOnUpload(input_api, output_api):
   ) % {
       'year': input_api.time.strftime('%Y'),
   }
+  return license_header
 
+def _CommonChecks(input_api, output_api):
+  """Checks common to both upload and commit."""
   results = []
-  # Ideally, maxlen would be 80.
   results.extend(input_api.canned_checks.CheckLongLines(
-      input_api, output_api, maxlen=95))
+      input_api, output_api))
   results.extend(input_api.canned_checks.CheckChangeHasNoTabs(
       input_api, output_api))
+  results.extend(input_api.canned_checks.CheckChangeHasNoStrayWhitespace(
+      input_api, output_api))
+  results.extend(input_api.canned_checks.CheckChangeTodoHasOwner(
+      input_api, output_api))
   results.extend(input_api.canned_checks.CheckLicense(
-      input_api, output_api, webrtc_license_header))
+      input_api, output_api, _LicenseHeader(input_api)))
+  return results
 
+def CheckChangeOnUpload(input_api, output_api):
+  results = []
+  results.extend(_CommonChecks(input_api, output_api))
   return results
 
 def CheckChangeOnCommit(input_api, output_api):
   results = []
+  results.extend(_CommonChecks(input_api, output_api))
   results.extend(input_api.canned_checks.CheckOwners(input_api, output_api))
+  results.extend(input_api.canned_checks.CheckChangeWasUploaded(
+      input_api, output_api))
+  results.extend(input_api.canned_checks.CheckChangeHasDescription(
+      input_api, output_api))
   return results