Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: PRESUBMIT.py

Issue 119432: Use new canned checks in PRESUBMIT.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | PRESUBMIT_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: PRESUBMIT.py
===================================================================
--- PRESUBMIT.py (revision 18064)
+++ PRESUBMIT.py (working copy)
@@ -9,44 +9,58 @@
details on the presubmit API built into gcl.
"""
-# Files with these extensions are considered source files.
-SOURCE_FILE_EXTENSIONS = [
- '.c', '.cc', '.cpp', '.h', '.m', '.mm', '.py', '.mk', '.am', '.json',
-]
-EXCLUDED_PATHS = [
+EXCLUDED_PATHS = (
r"breakpad[\\\/].*",
- r"chrome[\\\/]Debug[\\\/].*",
- r"chrome[\\\/]Release[\\\/].*",
- r"sconsbuild[\\\/].*",
- r"xcodebuild[\\\/].*",
r"skia[\\\/].*",
- r".*third_party[\\\/].*",
r"v8[\\\/].*",
-]
+)
def CheckChangeOnUpload(input_api, output_api):
- # TODO(maruel): max_cols is temporarily disabled. Reenable once the source
- # tree is in better shape.
results = []
- results.extend(LocalChecks(input_api, output_api, max_cols=0))
+ # What does this code do?
+ # It loads the default black list (e.g. third_party, experimental, etc) and
+ # add our black list (breakpad, skia and v8 are still not following
+ # google style and are not really living this repository).
+ # See presubmit_support.py InputApi.FilterSourceFile for the (simple) usage.
+ black_list = input_api.DEFAULT_BLACK_LIST + EXCLUDED_PATHS
+ sources = lambda x: input_api.FilterSourceFile(x, black_list=black_list)
+
+ results.extend(input_api.canned_checks.CheckLongLines(input_api,
+ output_api,
+ sources))
+ results.extend(input_api.canned_checks.CheckChangeHasNoTabs(input_api,
+ output_api,
+ sources))
results.extend(input_api.canned_checks.CheckChangeHasBugField(input_api,
output_api))
results.extend(input_api.canned_checks.CheckChangeHasTestField(input_api,
output_api))
+ results.extend(input_api.canned_checks.CheckChangeSvnEolStyle(input_api,
+ output_api,
+ sources))
return results
def CheckChangeOnCommit(input_api, output_api):
results = []
- # TODO(maruel): max_cols is temporarily disabled. Reenable once the source
- # tree is in better shape.
- results.extend(LocalChecks(input_api, output_api, max_cols=0))
+ black_list = input_api.DEFAULT_BLACK_LIST + EXCLUDED_PATHS
+ sources = lambda x: input_api.FilterSourceFile(x, black_list=black_list)
+ results.extend(input_api.canned_checks.CheckLongLines(input_api,
+ output_api,
+ sources))
+ results.extend(input_api.canned_checks.CheckChangeHasNoTabs(input_api,
+ output_api,
+ sources))
results.extend(input_api.canned_checks.CheckChangeHasBugField(input_api,
output_api))
results.extend(input_api.canned_checks.CheckChangeHasTestField(input_api,
output_api))
+ results.extend(input_api.canned_checks.CheckChangeSvnEolStyle(input_api,
+ output_api,
+ sources))
# Make sure the tree is 'open'.
+ # TODO(maruel): Run it in a separate thread to parallelize checks?
results.extend(input_api.canned_checks.CheckTreeIsOpen(
input_api, output_api,
'http://chromium-status.appspot.com/status', '0'
@@ -55,93 +69,12 @@
return results
-def LocalChecks(input_api, output_api, max_cols=80):
- """Reports an error if for any source file in SOURCE_FILE_EXTENSIONS:
- - uses CR (or CRLF)
- - contains a TAB
- - has a line that ends with whitespace
- - contains a line >|max_cols| cols unless |max_cols| is 0.
- - File does not end in a newline, or ends in more than one.
-
- Note that the whole file is checked, not only the changes.
- """
- C_SOURCE_FILE_EXTENSIONS = ('.c', '.cc', '.cpp', '.h', '.inl')
- cr_files = []
- eof_files = []
- results = []
- excluded_paths = [input_api.re.compile(x) for x in EXCLUDED_PATHS]
- files = input_api.AffectedFiles(include_deletes=False)
- for f in files:
- path = f.LocalPath()
- root, ext = input_api.os_path.splitext(path)
- # Look for unsupported extensions.
- if not ext in SOURCE_FILE_EXTENSIONS:
- continue
- # Look for excluded paths.
- found = False
- for item in excluded_paths:
- if item.match(path):
- found = True
- break
- if found:
- continue
-
- # Need to read the file ourselves since AffectedFile.NewContents()
- # will normalize line endings.
- contents = input_api.ReadFile(f)
- if '\r' in contents:
- cr_files.append(path)
-
- # Check that the file ends in one and only one newline character.
- if len(contents) > 0 and (contents[-1:] != "\n" or contents[-2:-1] == "\n"):
- eof_files.append(path)
-
- local_errors = []
- # Remove end of line character.
- lines = contents.splitlines()
- line_num = 1
- for line in lines:
- if line.endswith(' '):
- local_errors.append(output_api.PresubmitError(
- '%s, line %s ends with whitespaces.' %
- (path, line_num)))
- # Accept lines with http://, https:// and C #define/#pragma/#include to
- # exceed the max_cols rule.
- if (max_cols and
- len(line) > max_cols and
- not 'http://' in line and
- not 'https://' in line and
- not (line[0] == '#' and ext in C_SOURCE_FILE_EXTENSIONS)):
- local_errors.append(output_api.PresubmitError(
- '%s, line %s has %s chars, please reduce to %d chars.' %
- (path, line_num, len(line), max_cols)))
- if '\t' in line:
- local_errors.append(output_api.PresubmitError(
- "%s, line %s contains a tab character." %
- (path, line_num)))
- line_num += 1
- # Just show the first 5 errors.
- if len(local_errors) == 6:
- local_errors.pop()
- local_errors.append(output_api.PresubmitError("... and more."))
- break
- results.extend(local_errors)
-
- if cr_files:
- results.append(output_api.PresubmitError(
- 'Found CR (or CRLF) line ending in these files, please use only LF:',
- items=cr_files))
- if eof_files:
- results.append(output_api.PresubmitError(
- 'These files should end in one (and only one) newline character:',
- items=eof_files))
- return results
-
-
def CheckTryJobExecution(input_api, output_api):
+ outputs = []
+ if not input_api.change.issue or not input_api.change.patchset:
+ return outputs
url = "http://codereview.chromium.org/%d/get_build_results/%d" % (
input_api.change.issue, input_api.change.patchset)
- outputs = []
try:
connection = input_api.urllib2.urlopen(url)
# platform|status|url
« no previous file with comments | « no previous file | PRESUBMIT_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698