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_reparent_branch.py b/git_reparent_branch.py
index e84fdd7..3366a3e 100755
--- a/git_reparent_branch.py
+++ b/git_reparent_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.
-
"""Change the upstream of the current branch."""
import argparse
@@ -17,86 +16,90 @@
import git_rebase_update
import metrics
+
@metrics.collector.collect_metrics('git reparent-branch')
def main(args):
- root_ref = root()
+ root_ref = root()
- parser = argparse.ArgumentParser()
- g = parser.add_mutually_exclusive_group()
- g.add_argument('new_parent', nargs='?',
- help='New parent branch (or tag) to reparent to.')
- g.add_argument('--root', action='store_true',
- help='Reparent to the configured root branch (%s).' % root_ref)
- g.add_argument('--lkgr', action='store_true',
- help='Reparent to the lkgr tag.')
- opts = parser.parse_args(args)
+ parser = argparse.ArgumentParser()
+ g = parser.add_mutually_exclusive_group()
+ g.add_argument('new_parent',
+ nargs='?',
+ help='New parent branch (or tag) to reparent to.')
+ g.add_argument('--root',
+ action='store_true',
+ help='Reparent to the configured root branch (%s).' %
+ root_ref)
+ g.add_argument('--lkgr',
+ action='store_true',
+ help='Reparent to the lkgr tag.')
+ opts = parser.parse_args(args)
- # TODO(iannucci): Allow specification of the branch-to-reparent
+ # TODO(iannucci): Allow specification of the branch-to-reparent
- branch = current_branch()
+ branch = current_branch()
- if opts.root:
- new_parent = root_ref
- elif opts.lkgr:
- new_parent = 'lkgr'
- else:
- if not opts.new_parent:
- parser.error('Must specify new parent somehow')
- new_parent = opts.new_parent
- cur_parent = upstream(branch)
+ if opts.root:
+ new_parent = root_ref
+ elif opts.lkgr:
+ new_parent = 'lkgr'
+ else:
+ if not opts.new_parent:
+ parser.error('Must specify new parent somehow')
+ new_parent = opts.new_parent
+ cur_parent = upstream(branch)
- if branch == 'HEAD' or not branch:
- parser.error('Must be on the branch you want to reparent')
- if new_parent == cur_parent:
- parser.error('Cannot reparent a branch to its existing parent')
+ if branch == 'HEAD' or not branch:
+ parser.error('Must be on the branch you want to reparent')
+ if new_parent == cur_parent:
+ parser.error('Cannot reparent a branch to its existing parent')
- if not cur_parent:
- msg = (
- "Unable to determine %s@{upstream}.\n\nThis can happen if you didn't use "
- "`git new-branch` to create the branch and haven't used "
- "`git branch --set-upstream-to` to assign it one.\n\nPlease assign an "
- "upstream branch and then run this command again."
- )
- print(msg % branch, file=sys.stderr)
- return 1
+ if not cur_parent:
+ msg = (
+ "Unable to determine %s@{upstream}.\n\nThis can happen if you "
+ "didn't use `git new-branch` to create the branch and haven't used "
+ "`git branch --set-upstream-to` to assign it one.\n\nPlease assign "
+ "an upstream branch and then run this command again.")
+ print(msg % branch, file=sys.stderr)
+ return 1
- mbase = get_or_create_merge_base(branch, cur_parent)
+ mbase = get_or_create_merge_base(branch, cur_parent)
- all_tags = tags()
- if cur_parent in all_tags:
- cur_parent += ' [tag]'
+ all_tags = tags()
+ if cur_parent in all_tags:
+ cur_parent += ' [tag]'
- try:
- run('show-ref', new_parent)
- except subprocess2.CalledProcessError:
- print('fatal: invalid reference: %s' % new_parent, file=sys.stderr)
- return 1
+ try:
+ run('show-ref', new_parent)
+ except subprocess2.CalledProcessError:
+ print('fatal: invalid reference: %s' % new_parent, file=sys.stderr)
+ return 1
- if new_parent in all_tags:
- print("Reparenting %s to track %s [tag] (was %s)" % (branch, new_parent,
- cur_parent))
- set_branch_config(branch, 'remote', '.')
- set_branch_config(branch, 'merge', new_parent)
- else:
- print("Reparenting %s to track %s (was %s)" % (branch, new_parent,
- cur_parent))
- run('branch', '--set-upstream-to', new_parent, branch)
+ if new_parent in all_tags:
+ print("Reparenting %s to track %s [tag] (was %s)" %
+ (branch, new_parent, cur_parent))
+ set_branch_config(branch, 'remote', '.')
+ set_branch_config(branch, 'merge', new_parent)
+ else:
+ print("Reparenting %s to track %s (was %s)" %
+ (branch, new_parent, cur_parent))
+ run('branch', '--set-upstream-to', new_parent, branch)
- manual_merge_base(branch, mbase, new_parent)
+ manual_merge_base(branch, mbase, new_parent)
- # ONLY rebase-update the branch which moved (and dependants)
- _, branch_tree = get_branch_tree()
- branches = [branch]
- for branch, parent in topo_iter(branch_tree):
- if parent in branches:
- branches.append(branch)
- return git_rebase_update.main(['--no-fetch', '--keep-empty'] + branches)
+ # ONLY rebase-update the branch which moved (and dependants)
+ _, branch_tree = get_branch_tree()
+ branches = [branch]
+ for branch, parent in topo_iter(branch_tree):
+ if parent in branches:
+ branches.append(branch)
+ return git_rebase_update.main(['--no-fetch', '--keep-empty'] + branches)
if __name__ == '__main__': # pragma: no cover
- try:
- with metrics.collector.print_notice_and_exit():
- sys.exit(main(sys.argv[1:]))
- except KeyboardInterrupt:
- sys.stderr.write('interrupted\n')
- sys.exit(1)
+ try:
+ with metrics.collector.print_notice_and_exit():
+ sys.exit(main(sys.argv[1:]))
+ except KeyboardInterrupt:
+ sys.stderr.write('interrupted\n')
+ sys.exit(1)