| Index: PRESUBMIT.py
|
| diff --git a/PRESUBMIT.py b/PRESUBMIT.py
|
| index 60e042437ecef585e704671cffc103a532f75b91..566aab6fe348f6e74fdd360ded5e9fc19170fe61 100644
|
| --- a/PRESUBMIT.py
|
| +++ b/PRESUBMIT.py
|
| @@ -8,6 +8,8 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
|
| for more details about the presubmit API built into gcl.
|
| """
|
|
|
| +import sys
|
| +
|
|
|
| _EXCLUDED_PATHS = ()
|
|
|
| @@ -46,6 +48,7 @@ def _CommonChecks(input_api, output_api):
|
| results.extend(_CheckForVersionControlConflicts(input_api, output_api))
|
| results.extend(_CheckPatchFiles(input_api, output_api))
|
| results.extend(_CheckTestExpectations(input_api, output_api))
|
| + results.extend(_CheckUnwantedDependencies(input_api, output_api))
|
| return results
|
|
|
|
|
| @@ -142,6 +145,59 @@ def _CheckStyle(input_api, output_api):
|
| return results
|
|
|
|
|
| +def _CheckUnwantedDependencies(input_api, output_api):
|
| + """Runs checkdeps on #include statements added in this
|
| + change. Breaking - rules is an error, breaking ! rules is a
|
| + warning.
|
| + """
|
| + # We need to wait until we have an input_api object and use this
|
| + # roundabout construct to import checkdeps because this file is
|
| + # eval-ed and thus doesn't have __file__.
|
| + original_sys_path = sys.path
|
| + try:
|
| + sys.path = sys.path + [input_api.os_path.realpath(input_api.os_path.join(
|
| + input_api.PresubmitLocalPath(), '..', '..', 'tools', 'checkdeps'))]
|
| + import checkdeps
|
| + from cpp_checker import CppChecker
|
| + from rules import Rule
|
| + finally:
|
| + # Restore sys.path to what it was before.
|
| + sys.path = original_sys_path
|
| +
|
| + added_includes = []
|
| + for f in input_api.AffectedFiles():
|
| + if not CppChecker.IsCppFile(f.LocalPath()):
|
| + continue
|
| +
|
| + changed_lines = [line for line_num, line in f.ChangedContents()]
|
| + added_includes.append([f.LocalPath(), changed_lines])
|
| +
|
| + deps_checker = checkdeps.DepsChecker(input_api.PresubmitLocalPath())
|
| +
|
| + error_descriptions = []
|
| + warning_descriptions = []
|
| + for path, rule_type, rule_description in deps_checker.CheckAddedCppIncludes(
|
| + added_includes):
|
| + description_with_path = '%s\n %s' % (path, rule_description)
|
| + if rule_type == Rule.DISALLOW:
|
| + error_descriptions.append(description_with_path)
|
| + else:
|
| + warning_descriptions.append(description_with_path)
|
| +
|
| + results = []
|
| + if error_descriptions:
|
| + results.append(output_api.PresubmitError(
|
| + 'You added one or more #includes that violate checkdeps rules.',
|
| + error_descriptions))
|
| + if warning_descriptions:
|
| + results.append(output_api.PresubmitPromptOrNotify(
|
| + 'You added one or more #includes of files that are temporarily\n'
|
| + 'allowed but being removed. Can you avoid introducing the\n'
|
| + '#include? See relevant DEPS file(s) for details and contacts.',
|
| + warning_descriptions))
|
| + return results
|
| +
|
| +
|
| def CheckChangeOnUpload(input_api, output_api):
|
| results = []
|
| results.extend(_CommonChecks(input_api, output_api))
|
|
|