switch to 4 space indent
Leave the recipes/ code at 2 space to match the rest of the recipes
project in other repos.
Reformatted using:
files=( $(
git ls-tree -r --name-only HEAD | \
grep -Ev -e '^(third_party|recipes)/' | \
grep '\.py$';
git grep -l '#!/usr/bin/env.*python' | grep -v '\.py$'
) )
parallel ./yapf -i -- "${files[@]}"
~/chromiumos/chromite/contrib/reflow_overlong_comments "${files[@]}"
The files that still had strings that were too long were manually
reformatted because they were easy and only a few issues.
autoninja.py
clang_format.py
download_from_google_storage.py
fix_encoding.py
gclient_utils.py
git_cache.py
git_common.py
git_map_branches.py
git_reparent_branch.py
gn.py
my_activity.py
owners_finder.py
presubmit_canned_checks.py
reclient_helper.py
reclientreport.py
roll_dep.py
rustfmt.py
siso.py
split_cl.py
subcommand.py
subprocess2.py
swift_format.py
upload_to_google_storage.py
These files still had lines (strings) that were too long, so the pylint
warnings were suppressed with a TODO.
auth.py
gclient.py
gclient_eval.py
gclient_paths.py
gclient_scm.py
gerrit_util.py
git_cl.py
presubmit_canned_checks.py
presubmit_support.py
scm.py
Change-Id: Ia6535c4f2c48d46b589ec1e791dde6c6b2ea858f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4836379
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
diff --git a/clang_format.py b/clang_format.py
index 4e7b1ba..bfe3b4b 100755
--- a/clang_format.py
+++ b/clang_format.py
@@ -2,7 +2,6 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-
"""Redirects to the version of clang-format checked into the Chrome tree.
clang-format binaries are pulled down from Google Cloud Storage whenever you
@@ -18,77 +17,81 @@
class NotFoundError(Exception):
- """A file could not be found."""
- def __init__(self, e):
- Exception.__init__(self,
- 'Problem while looking for clang-format in Chromium source tree:\n'
- '%s' % e)
+ """A file could not be found."""
+ def __init__(self, e):
+ Exception.__init__(
+ self,
+ 'Problem while looking for clang-format in Chromium source tree:\n'
+ '%s' % e)
def FindClangFormatToolInChromiumTree():
- """Return a path to the clang-format executable, or die trying."""
- primary_solution_path = gclient_paths.GetPrimarySolutionPath()
- if primary_solution_path:
- bin_path = os.path.join(primary_solution_path, 'third_party',
- 'clang-format',
- 'clang-format' + gclient_paths.GetExeSuffix())
- if os.path.exists(bin_path):
- return bin_path
+ """Return a path to the clang-format executable, or die trying."""
+ primary_solution_path = gclient_paths.GetPrimarySolutionPath()
+ if primary_solution_path:
+ bin_path = os.path.join(primary_solution_path, 'third_party',
+ 'clang-format',
+ 'clang-format' + gclient_paths.GetExeSuffix())
+ if os.path.exists(bin_path):
+ return bin_path
- bin_path = gclient_paths.GetBuildtoolsPlatformBinaryPath()
- if not bin_path:
- raise NotFoundError(
- 'Could not find checkout in any parent of the current path.\n'
- 'Set CHROMIUM_BUILDTOOLS_PATH to use outside of a chromium checkout.')
+ bin_path = gclient_paths.GetBuildtoolsPlatformBinaryPath()
+ if not bin_path:
+ raise NotFoundError(
+ 'Could not find checkout in any parent of the current path.\n'
+ 'Set CHROMIUM_BUILDTOOLS_PATH to use outside of a chromium '
+ 'checkout.')
- tool_path = os.path.join(bin_path,
- 'clang-format' + gclient_paths.GetExeSuffix())
- if not os.path.exists(tool_path):
- raise NotFoundError('File does not exist: %s' % tool_path)
- return tool_path
+ tool_path = os.path.join(bin_path,
+ 'clang-format' + gclient_paths.GetExeSuffix())
+ if not os.path.exists(tool_path):
+ raise NotFoundError('File does not exist: %s' % tool_path)
+ return tool_path
def FindClangFormatScriptInChromiumTree(script_name):
- """Return a path to a clang-format helper script, or die trying."""
- primary_solution_path = gclient_paths.GetPrimarySolutionPath()
- if primary_solution_path:
- script_path = os.path.join(primary_solution_path, 'third_party',
- 'clang-format', 'script', script_name)
- if os.path.exists(script_path):
- return script_path
+ """Return a path to a clang-format helper script, or die trying."""
+ primary_solution_path = gclient_paths.GetPrimarySolutionPath()
+ if primary_solution_path:
+ script_path = os.path.join(primary_solution_path, 'third_party',
+ 'clang-format', 'script', script_name)
+ if os.path.exists(script_path):
+ return script_path
- tools_path = gclient_paths.GetBuildtoolsPath()
- if not tools_path:
- raise NotFoundError(
- 'Could not find checkout in any parent of the current path.\n',
- 'Set CHROMIUM_BUILDTOOLS_PATH to use outside of a chromium checkout.')
+ tools_path = gclient_paths.GetBuildtoolsPath()
+ if not tools_path:
+ raise NotFoundError(
+ 'Could not find checkout in any parent of the current path.\n',
+ 'Set CHROMIUM_BUILDTOOLS_PATH to use outside of a chromium '
+ 'checkout.')
- script_path = os.path.join(tools_path, 'clang_format', 'script', script_name)
- if not os.path.exists(script_path):
- raise NotFoundError('File does not exist: %s' % script_path)
- return script_path
+ script_path = os.path.join(tools_path, 'clang_format', 'script',
+ script_name)
+ if not os.path.exists(script_path):
+ raise NotFoundError('File does not exist: %s' % script_path)
+ return script_path
def main(args):
- try:
- tool = FindClangFormatToolInChromiumTree()
- except NotFoundError as e:
- sys.stderr.write("%s\n" % str(e))
- return 1
+ try:
+ tool = FindClangFormatToolInChromiumTree()
+ except NotFoundError as e:
+ sys.stderr.write("%s\n" % str(e))
+ return 1
- # Add some visibility to --help showing where the tool lives, since this
- # redirection can be a little opaque.
- help_syntax = ('-h', '--help', '-help', '-help-list', '--help-list')
- if any(match in args for match in help_syntax):
- print(
- '\nDepot tools redirects you to the clang-format at:\n %s\n' % tool)
+ # Add some visibility to --help showing where the tool lives, since this
+ # redirection can be a little opaque.
+ help_syntax = ('-h', '--help', '-help', '-help-list', '--help-list')
+ if any(match in args for match in help_syntax):
+ print('\nDepot tools redirects you to the clang-format at:\n %s\n' %
+ tool)
- return subprocess.call([tool] + args)
+ return subprocess.call([tool] + args)
if __name__ == '__main__':
- try:
- sys.exit(main(sys.argv[1:]))
- except KeyboardInterrupt:
- sys.stderr.write('interrupted\n')
- sys.exit(1)
+ try:
+ sys.exit(main(sys.argv[1:]))
+ except KeyboardInterrupt:
+ sys.stderr.write('interrupted\n')
+ sys.exit(1)