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/version.py | 75 +++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 34 deletions(-) (limited to 'subcmds/version.py') diff --git a/subcmds/version.py b/subcmds/version.py index c68cb0af..c539db63 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -22,45 +22,52 @@ from wrapper import Wrapper class Version(Command, MirrorSafeCommand): - wrapper_version = None - wrapper_path = None + wrapper_version = None + wrapper_path = None - COMMON = False - helpSummary = "Display the version of repo" - helpUsage = """ + COMMON = False + helpSummary = "Display the version of repo" + helpUsage = """ %prog """ - def Execute(self, opt, args): - rp = self.manifest.repoProject - rem = rp.GetRemote() - branch = rp.GetBranch('default') + def Execute(self, opt, args): + rp = self.manifest.repoProject + rem = rp.GetRemote() + branch = rp.GetBranch("default") - # These might not be the same. Report them both. - src_ver = RepoSourceVersion() - rp_ver = rp.bare_git.describe(HEAD) - print('repo version %s' % rp_ver) - print(' (from %s)' % rem.url) - print(' (tracking %s)' % branch.merge) - print(' (%s)' % rp.bare_git.log('-1', '--format=%cD', HEAD)) + # These might not be the same. Report them both. + src_ver = RepoSourceVersion() + rp_ver = rp.bare_git.describe(HEAD) + print("repo version %s" % rp_ver) + print(" (from %s)" % rem.url) + print(" (tracking %s)" % branch.merge) + print(" (%s)" % rp.bare_git.log("-1", "--format=%cD", HEAD)) - if self.wrapper_path is not None: - print('repo launcher version %s' % self.wrapper_version) - print(' (from %s)' % self.wrapper_path) + if self.wrapper_path is not None: + print("repo launcher version %s" % self.wrapper_version) + print(" (from %s)" % self.wrapper_path) - if src_ver != rp_ver: - print(' (currently at %s)' % src_ver) + if src_ver != rp_ver: + print(" (currently at %s)" % src_ver) - print('repo User-Agent %s' % user_agent.repo) - print('git %s' % git.version_tuple().full) - print('git User-Agent %s' % user_agent.git) - print('Python %s' % sys.version) - uname = platform.uname() - if sys.version_info.major < 3: - # Python 3 returns a named tuple, but Python 2 is simpler. - print(uname) - else: - print('OS %s %s (%s)' % (uname.system, uname.release, uname.version)) - print('CPU %s (%s)' % - (uname.machine, uname.processor if uname.processor else 'unknown')) - print('Bug reports:', Wrapper().BUG_URL) + print("repo User-Agent %s" % user_agent.repo) + print("git %s" % git.version_tuple().full) + print("git User-Agent %s" % user_agent.git) + print("Python %s" % sys.version) + uname = platform.uname() + if sys.version_info.major < 3: + # Python 3 returns a named tuple, but Python 2 is simpler. + print(uname) + else: + print( + "OS %s %s (%s)" % (uname.system, uname.release, uname.version) + ) + print( + "CPU %s (%s)" + % ( + uname.machine, + uname.processor if uname.processor else "unknown", + ) + ) + print("Bug reports:", Wrapper().BUG_URL) -- cgit v1.2.3-54-g00ecf