From ea2e330e43c182dc16b0111ebc69ee5a71ee4ce1 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Sat, 11 Mar 2023 06:46:20 +0000 Subject: Format codebase with black and check formatting in CQ Apply rules set by https://gerrit-review.googlesource.com/c/git-repo/+/362954/ across the codebase and fix any lingering errors caught by flake8. Also check black formatting in run_tests (and CQ). Bug: b/267675342 Change-Id: I972d77649dac351150dcfeb1cd1ad0ea2efc1956 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/363474 Reviewed-by: Mike Frysinger Tested-by: Gavin Mak Commit-Queue: Gavin Mak --- subcmds/abandon.py | 167 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 73 deletions(-) (limited to 'subcmds/abandon.py') diff --git a/subcmds/abandon.py b/subcmds/abandon.py index c3d2d5b7..1f687f53 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py @@ -23,9 +23,9 @@ from progress import Progress class Abandon(Command): - COMMON = True - helpSummary = "Permanently abandon a development branch" - helpUsage = """ + COMMON = True + helpSummary = "Permanently abandon a development branch" + helpUsage = """ %prog [--all | ] [...] This subcommand permanently abandons a development branch by @@ -33,83 +33,104 @@ deleting it (and all its history) from your local repository. It is equivalent to "git branch -D ". """ - PARALLEL_JOBS = DEFAULT_LOCAL_JOBS + PARALLEL_JOBS = DEFAULT_LOCAL_JOBS - def _Options(self, p): - p.add_option('--all', - dest='all', action='store_true', - help='delete all branches in all projects') + def _Options(self, p): + p.add_option( + "--all", + dest="all", + action="store_true", + help="delete all branches in all projects", + ) - def ValidateOptions(self, opt, args): - if not opt.all and not args: - self.Usage() + def ValidateOptions(self, opt, args): + if not opt.all and not args: + self.Usage() - if not opt.all: - nb = args[0] - if not git.check_ref_format('heads/%s' % nb): - self.OptionParser.error("'%s' is not a valid branch name" % nb) - else: - args.insert(0, "'All local branches'") + if not opt.all: + nb = args[0] + if not git.check_ref_format("heads/%s" % nb): + self.OptionParser.error("'%s' is not a valid branch name" % nb) + else: + args.insert(0, "'All local branches'") - def _ExecuteOne(self, all_branches, nb, project): - """Abandon one project.""" - if all_branches: - branches = project.GetBranches() - else: - branches = [nb] + def _ExecuteOne(self, all_branches, nb, project): + """Abandon one project.""" + if all_branches: + branches = project.GetBranches() + else: + branches = [nb] - ret = {} - for name in branches: - status = project.AbandonBranch(name) - if status is not None: - ret[name] = status - return (ret, project) + ret = {} + for name in branches: + status = project.AbandonBranch(name) + if status is not None: + ret[name] = status + return (ret, project) - def Execute(self, opt, args): - nb = args[0] - err = defaultdict(list) - success = defaultdict(list) - all_projects = self.GetProjects(args[1:], all_manifests=not opt.this_manifest_only) - _RelPath = lambda p: p.RelPath(local=opt.this_manifest_only) + def Execute(self, opt, args): + nb = args[0] + err = defaultdict(list) + success = defaultdict(list) + all_projects = self.GetProjects( + args[1:], all_manifests=not opt.this_manifest_only + ) + _RelPath = lambda p: p.RelPath(local=opt.this_manifest_only) - def _ProcessResults(_pool, pm, states): - for (results, project) in states: - for branch, status in results.items(): - if status: - success[branch].append(project) - else: - err[branch].append(project) - pm.update() + def _ProcessResults(_pool, pm, states): + for results, project in states: + for branch, status in results.items(): + if status: + success[branch].append(project) + else: + err[branch].append(project) + pm.update() - self.ExecuteInParallel( - opt.jobs, - functools.partial(self._ExecuteOne, opt.all, nb), - all_projects, - callback=_ProcessResults, - output=Progress('Abandon %s' % (nb,), len(all_projects), quiet=opt.quiet)) + self.ExecuteInParallel( + opt.jobs, + functools.partial(self._ExecuteOne, opt.all, nb), + all_projects, + callback=_ProcessResults, + output=Progress( + "Abandon %s" % (nb,), len(all_projects), quiet=opt.quiet + ), + ) - width = max(itertools.chain( - [25], (len(x) for x in itertools.chain(success, err)))) - if err: - for br in err.keys(): - err_msg = "error: cannot abandon %s" % br - print(err_msg, file=sys.stderr) - for proj in err[br]: - print(' ' * len(err_msg) + " | %s" % _RelPath(proj), file=sys.stderr) - sys.exit(1) - elif not success: - print('error: no project has local branch(es) : %s' % nb, - file=sys.stderr) - sys.exit(1) - else: - # Everything below here is displaying status. - if opt.quiet: - return - print('Abandoned branches:') - for br in success.keys(): - if len(all_projects) > 1 and len(all_projects) == len(success[br]): - result = "all project" + width = max( + itertools.chain( + [25], (len(x) for x in itertools.chain(success, err)) + ) + ) + if err: + for br in err.keys(): + err_msg = "error: cannot abandon %s" % br + print(err_msg, file=sys.stderr) + for proj in err[br]: + print( + " " * len(err_msg) + " | %s" % _RelPath(proj), + file=sys.stderr, + ) + sys.exit(1) + elif not success: + print( + "error: no project has local branch(es) : %s" % nb, + file=sys.stderr, + ) + sys.exit(1) else: - result = "%s" % ( - ('\n' + ' ' * width + '| ').join(_RelPath(p) for p in success[br])) - print("%s%s| %s\n" % (br, ' ' * (width - len(br)), result)) + # Everything below here is displaying status. + if opt.quiet: + return + print("Abandoned branches:") + for br in success.keys(): + if len(all_projects) > 1 and len(all_projects) == len( + success[br] + ): + result = "all project" + else: + result = "%s" % ( + ("\n" + " " * width + "| ").join( + _RelPath(p) for p in success[br] + ) + ) + print("%s%s| %s\n" % (br, " " * (width - len(br)), result)) -- cgit v1.2.3-54-g00ecf