PRESUBMIT.py: update arg name to avoid warnings on newer depot_tools Newer depot_tools have switched the argument naming convention again, and cause presubmits to print warnings even when using allow_list/block_list: presubmit_support.py:744: UserWarning: Use files_to_check in FilterSourceFile The logic is still backwards compatible (the allow_list is used if the new param is empty), but the warning is undesirable, as it is pure noise. Afaiu, as-is, this patch will force people to upgrade to a depot_tools that understands the new parameter name. Which feels like an annoyance for such a small change. One alternative would be to drop the argname qualification, and use purely positional args for now (then it'll work with either depot_tools version). Change-Id: I2302928ffd7863b2429e5f33e55ffc07134d7101
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 65ee8a9..9ccc4b6 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py
@@ -22,8 +22,8 @@ def long_line_sources(x): return input.FilterSourceFile( x, - allow_list=".*", - block_list=[ + files_to_check='.*', + files_to_skip=[ 'Android[.]bp', '.*[.]json$', '.*[.]sql$', '.*[.]out$', 'test/trace_processor/.*/index$', '.*\bBUILD$', 'WORKSPACE', '.*/Makefile$', '/perfetto_build_flags.h$' @@ -63,7 +63,7 @@ # If no GN files were modified, bail out. def build_file_filter(x): return input_api.FilterSourceFile( - x, allow_list=('.*BUILD[.]gn$', '.*[.]gni$', 'BUILD\.extras', tool)) + x, files_to_check=('.*BUILD[.]gn$', '.*[.]gni$', 'BUILD\.extras', tool)) if not input_api.AffectedSourceFiles(build_file_filter): return [] @@ -81,7 +81,7 @@ # If no GN files were modified, bail out. def build_file_filter(x): return input_api.FilterSourceFile( - x, allow_list=('.*BUILD[.]gn$', '.*[.]gni$', tool)) + x, files_to_check=('.*BUILD[.]gn$', '.*[.]gni$', tool)) if not input_api.AffectedSourceFiles(build_file_filter): return [] @@ -98,7 +98,7 @@ def file_filter(x): return input_api.FilterSourceFile( - x, allow_list=['.*[.]cc$', '.*[.]h$', tool]) + x, files_to_check=['.*[.]cc$', '.*[.]h$', tool]) if not input_api.AffectedSourceFiles(file_filter): return [] @@ -134,7 +134,7 @@ ] def file_filter(x): - return input_api.FilterSourceFile(x, allow_list=[r'.*\.h$', r'.*\.cc$']) + return input_api.FilterSourceFile(x, files_to_check=[r'.*\.h$', r'.*\.cc$']) errors = [] for f in input_api.AffectedSourceFiles(file_filter): @@ -151,7 +151,8 @@ tool = 'tools/check_include_violations' def file_filter(x): - return input_api.FilterSourceFile(x, allow_list=['include/.*[.]h$', tool]) + return input_api.FilterSourceFile( + x, files_to_check=['include/.*[.]h$', tool]) if not input_api.AffectedSourceFiles(file_filter): return [] @@ -165,7 +166,7 @@ def file_filter(x): return input_api.FilterSourceFile( - x, allow_list=['protos/perfetto/.*[.]proto$', '.*[.]h', tool]) + x, files_to_check=['protos/perfetto/.*[.]proto$', '.*[.]h', tool]) if not input_api.AffectedSourceFiles(file_filter): return [] @@ -182,7 +183,7 @@ def build_file_filter(x): return input_api.FilterSourceFile( - x, allow_list=['protos/perfetto/.*[.]proto$', tool]) + x, files_to_check=['protos/perfetto/.*[.]proto$', tool]) if not input_api.AffectedSourceFiles(build_file_filter): return [] @@ -216,7 +217,7 @@ def file_filter(x): return input_api.FilterSourceFile( - x, allow_list=['protos/perfetto/.*[.]proto$', tool]) + x, files_to_check=['protos/perfetto/.*[.]proto$', tool]) if not input_api.AffectedSourceFiles(file_filter): return []