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/git_rename_branch.py b/git_rename_branch.py
index 95094e8..a600eb2 100755
--- a/git_rename_branch.py
+++ b/git_rename_branch.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.
-
"""Rename the current branch while maintaining correct dependencies."""
import argparse
@@ -13,43 +12,47 @@
from git_common import current_branch, run, set_branch_config, branch_config
from git_common import branch_config_map
+
def main(args):
- current = current_branch()
- if current == 'HEAD':
- current = None
- old_name_help = 'The old branch to rename.'
- if current:
- old_name_help += ' (default %(default)r)'
+ current = current_branch()
+ if current == 'HEAD':
+ current = None
+ old_name_help = 'The old branch to rename.'
+ if current:
+ old_name_help += ' (default %(default)r)'
- parser = argparse.ArgumentParser()
- parser.add_argument('old_name', nargs=('?' if current else 1),
- help=old_name_help, default=current)
- parser.add_argument('new_name', help='The new branch name.')
+ parser = argparse.ArgumentParser()
+ parser.add_argument('old_name',
+ nargs=('?' if current else 1),
+ help=old_name_help,
+ default=current)
+ parser.add_argument('new_name', help='The new branch name.')
- opts = parser.parse_args(args)
+ opts = parser.parse_args(args)
- # when nargs=1, we get a list :(
- if isinstance(opts.old_name, list):
- opts.old_name = opts.old_name[0]
+ # when nargs=1, we get a list :(
+ if isinstance(opts.old_name, list):
+ opts.old_name = opts.old_name[0]
- try:
- run('branch', '-m', opts.old_name, opts.new_name)
+ try:
+ run('branch', '-m', opts.old_name, opts.new_name)
- # update the downstreams
- for branch, merge in branch_config_map('merge').items():
- if merge == 'refs/heads/' + opts.old_name:
- # Only care about local branches
- if branch_config(branch, 'remote') == '.':
- set_branch_config(branch, 'merge', 'refs/heads/' + opts.new_name)
- except subprocess2.CalledProcessError as cpe:
- sys.stderr.write(cpe.stderr.decode('utf-8', 'replace'))
- return 1
- return 0
+ # update the downstreams
+ for branch, merge in branch_config_map('merge').items():
+ if merge == 'refs/heads/' + opts.old_name:
+ # Only care about local branches
+ if branch_config(branch, 'remote') == '.':
+ set_branch_config(branch, 'merge',
+ 'refs/heads/' + opts.new_name)
+ except subprocess2.CalledProcessError as cpe:
+ sys.stderr.write(cpe.stderr.decode('utf-8', 'replace'))
+ return 1
+ return 0
if __name__ == '__main__': # pragma: no cover
- 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)