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

Unified Diff: PRESUBMIT.py

Issue 28219: Add Don't end with whitespaces and <=80 cols rules. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: PRESUBMIT.py
===================================================================
--- PRESUBMIT.py (revision 10900)
+++ PRESUBMIT.py (working copy)
@@ -9,17 +9,25 @@
details on the presubmit API built into gcl.
"""
-
-import os
-
-
# Files with these extensions will be considered source files
-SOURCE_FILE_EXTENSIONS = ['.c', '.cc', '.cpp', '.h', '.m', '.mm', '.py']
+SOURCE_FILE_EXTENSIONS = [
+ '.c', '.cc', '.cpp', '.h', '.m', '.mm', '.py', '.mk', '.am', '.html',
+ '.htm', '.json',
+]
+EXCLUDED_PATHS = [
+ r"breakpad[\\\/].*",
+ r"chrome[\\\/]Debug[\\\/].*",
+ r"chrome[\\\/]Hammer[\\\/].*",
+ r"chrome[\\\/]Release[\\\/].*",
+ r"xcodebuild[\\\/].*",
+ r"skia[\\\/].*",
+ r".*third_party[\\\/].*",
+ r"v8[\\\/].*",
+]
-
def ReadFile(path):
"""Given a path, returns the full contents of the file.
-
+
Reads files in binary format.
"""
fo = open(path, 'rb')
@@ -35,33 +43,71 @@
def CheckChangeOnUpload(input_api, output_api):
- return (CheckNoCrOrTabs(input_api, output_api) +
- input_api.canned_checks.CheckDoNotSubmit(input_api, output_api))
+ return LocalChecks(input_api, output_api)
def CheckChangeOnCommit(input_api, output_api):
- # No extra checks on commit for now
- return CheckChangeOnUpload(input_api, output_api)
+ return (LocalChecks(input_api, output_api) +
+ input_api.canned_checks.CheckDoNotSubmit(input_api, output_api))
-def CheckNoCrOrTabs(input_api, output_api):
- """Reports an error if source files use CR (or CRLF) or TAB.
+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.
+
+ Note that the whole file is checked, not only the changes.
"""
cr_files = []
tab_files = []
results = []
-
- for f in input_api.AffectedTextFiles(include_deletes=False):
+ excluded_paths = [input_api.re.compile(x) for x in EXCLUDED_PATHS]
+ files = input_api.AffectedFiles()
+ for f in files:
path = f.LocalPath()
- root, ext = os.path.splitext(path)
- if ext in SOURCE_FILE_EXTENSIONS:
- # Need to read the file ourselves since AffectedFile.NewContents()
- # will normalize line endings.
- contents = _ReadFile(path)
- if '\r' in contents:
- cr_files.append(path)
- if '\t' in contents:
- tab_files.append(path)
+ 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 = _ReadFile(path)
+ if '\r' in contents:
+ cr_files.append(path)
+
+ local_errors = []
+ # Remove EOL character.
+ lines = contents.splitlines(False)
+ 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:// to exceed the max_cols rule.
+ if max_cols and len(line) > max_cols and not 'http://' in line:
+ 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.
+ results.extend(local_errors[0:min(len(local_errors), 5)])
+
if cr_files:
results.append(output_api.PresubmitError(
'Found CR (or CRLF) line ending in these files, please use only LF:',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698