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/diff.py | 85 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 38 deletions(-) (limited to 'subcmds/diff.py') diff --git a/subcmds/diff.py b/subcmds/diff.py index a606ee9a..5c627c0c 100644 --- a/subcmds/diff.py +++ b/subcmds/diff.py @@ -19,54 +19,63 @@ from command import DEFAULT_LOCAL_JOBS, PagedCommand class Diff(PagedCommand): - COMMON = True - helpSummary = "Show changes between commit and working tree" - helpUsage = """ + COMMON = True + helpSummary = "Show changes between commit and working tree" + helpUsage = """ %prog [...] The -u option causes '%prog' to generate diff output with file paths relative to the repository root, so the output can be applied to the Unix 'patch' command. """ - PARALLEL_JOBS = DEFAULT_LOCAL_JOBS + PARALLEL_JOBS = DEFAULT_LOCAL_JOBS - def _Options(self, p): - p.add_option('-u', '--absolute', - dest='absolute', action='store_true', - help='paths are relative to the repository root') + def _Options(self, p): + p.add_option( + "-u", + "--absolute", + dest="absolute", + action="store_true", + help="paths are relative to the repository root", + ) - def _ExecuteOne(self, absolute, local, project): - """Obtains the diff for a specific project. + def _ExecuteOne(self, absolute, local, project): + """Obtains the diff for a specific project. - Args: - absolute: Paths are relative to the root. - local: a boolean, if True, the path is relative to the local - (sub)manifest. If false, the path is relative to the - outermost manifest. - project: Project to get status of. + Args: + absolute: Paths are relative to the root. + local: a boolean, if True, the path is relative to the local + (sub)manifest. If false, the path is relative to the outermost + manifest. + project: Project to get status of. - Returns: - The status of the project. - """ - buf = io.StringIO() - ret = project.PrintWorkTreeDiff(absolute, output_redir=buf, local=local) - return (ret, buf.getvalue()) + Returns: + The status of the project. + """ + buf = io.StringIO() + ret = project.PrintWorkTreeDiff(absolute, output_redir=buf, local=local) + return (ret, buf.getvalue()) - def Execute(self, opt, args): - all_projects = self.GetProjects(args, all_manifests=not opt.this_manifest_only) + def Execute(self, opt, args): + all_projects = self.GetProjects( + args, all_manifests=not opt.this_manifest_only + ) - def _ProcessResults(_pool, _output, results): - ret = 0 - for (state, output) in results: - if output: - print(output, end='') - if not state: - ret = 1 - return ret + def _ProcessResults(_pool, _output, results): + ret = 0 + for state, output in results: + if output: + print(output, end="") + if not state: + ret = 1 + return ret - return self.ExecuteInParallel( - opt.jobs, - functools.partial(self._ExecuteOne, opt.absolute, opt.this_manifest_only), - all_projects, - callback=_ProcessResults, - ordered=True) + return self.ExecuteInParallel( + opt.jobs, + functools.partial( + self._ExecuteOne, opt.absolute, opt.this_manifest_only + ), + all_projects, + callback=_ProcessResults, + ordered=True, + ) -- cgit v1.2.3-54-g00ecf