From 819827a42ddb364f98c3a1a7eae2536dc54bc4cc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 12 Feb 2020 15:20:19 +0900 Subject: Fix blank line issues reported by flake8 - E301 expected 1 blank line - E302 expected 2 blank lines - E303 too many blank lines - E305 expected 2 blank lines after class or function definition - E306 expected 1 blank line before a nested definition Fixed automatically with autopep8: git ls-files | grep py$ | xargs autopep8 --in-place \ --select E301,E302,E303,E305,E306 Manually fix issues in project.py caused by misuse of block comments. Change-Id: Iee840fcaff48aae504ddac9c3e76d2acd484f6a9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254599 Reviewed-by: Mike Frysinger Tested-by: David Pursehouse --- subcmds/abandon.py | 2 ++ subcmds/branches.py | 2 ++ subcmds/checkout.py | 1 + subcmds/cherry_pick.py | 1 + subcmds/diff.py | 1 + subcmds/diffmanifests.py | 2 ++ subcmds/download.py | 1 + subcmds/forall.py | 3 +++ subcmds/gitc_delete.py | 1 + subcmds/grep.py | 3 ++- subcmds/help.py | 1 + subcmds/info.py | 3 ++- subcmds/init.py | 1 + subcmds/list.py | 1 + subcmds/manifest.py | 1 + subcmds/prune.py | 1 + subcmds/selfupdate.py | 1 + subcmds/smartsync.py | 1 + subcmds/stage.py | 3 +++ subcmds/start.py | 1 + subcmds/status.py | 1 + subcmds/sync.py | 9 +++++++++ subcmds/upload.py | 4 ++++ subcmds/version.py | 1 + 24 files changed, 44 insertions(+), 2 deletions(-) (limited to 'subcmds') diff --git a/subcmds/abandon.py b/subcmds/abandon.py index 9a645c0a..f3478129 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py @@ -21,6 +21,7 @@ from collections import defaultdict from git_command import git from progress import Progress + class Abandon(Command): common = True helpSummary = "Permanently abandon a development branch" @@ -32,6 +33,7 @@ deleting it (and all its history) from your local repository. It is equivalent to "git branch -D ". """ + def _Options(self, p): p.add_option('--all', dest='all', action='store_true', diff --git a/subcmds/branches.py b/subcmds/branches.py index b4894ec8..9709f7f0 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py @@ -19,6 +19,7 @@ import sys from color import Coloring from command import Command + class BranchColoring(Coloring): def __init__(self, config): Coloring.__init__(self, config, 'branch') @@ -26,6 +27,7 @@ class BranchColoring(Coloring): self.local = self.printer('local') self.notinproject = self.printer('notinproject', fg='red') + class BranchInfo(object): def __init__(self, name): self.name = name diff --git a/subcmds/checkout.py b/subcmds/checkout.py index c8a09a8e..efa31d26 100644 --- a/subcmds/checkout.py +++ b/subcmds/checkout.py @@ -19,6 +19,7 @@ import sys from command import Command from progress import Progress + class Checkout(Command): common = True helpSummary = "Checkout a branch for development" diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 8d81be33..3ad82109 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py @@ -22,6 +22,7 @@ from git_command import GitCommand CHANGE_ID_RE = re.compile(r'^\s*Change-Id: I([0-9a-f]{40})\s*$') + class CherryPick(Command): common = True helpSummary = "Cherry-pick a change." diff --git a/subcmds/diff.py b/subcmds/diff.py index fa41e70e..406baa28 100644 --- a/subcmds/diff.py +++ b/subcmds/diff.py @@ -16,6 +16,7 @@ from command import PagedCommand + class Diff(PagedCommand): common = True helpSummary = "Show changes between commit and working tree" diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 9bdb5e14..77f99df2 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py @@ -18,10 +18,12 @@ from color import Coloring from command import PagedCommand from manifest_xml import XmlManifest + class _Coloring(Coloring): def __init__(self, config): Coloring.__init__(self, config, "status") + class Diffmanifests(PagedCommand): """ A command to see logs in projects represented by manifests diff --git a/subcmds/download.py b/subcmds/download.py index fbd302aa..87d0ce04 100644 --- a/subcmds/download.py +++ b/subcmds/download.py @@ -23,6 +23,7 @@ from error import GitError CHANGE_RE = re.compile(r'^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$') + class Download(Command): common = True helpSummary = "Download and checkout a change" diff --git a/subcmds/forall.py b/subcmds/forall.py index 5d2be91f..dbf26f0b 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py @@ -277,6 +277,7 @@ without iterating through the remaining projects. return yield [mirror, opt, cmd, shell, cnt, config, project] + class WorkerKeyboardInterrupt(Exception): """ Keyboard interrupt exception for worker processes. """ pass @@ -285,6 +286,7 @@ class WorkerKeyboardInterrupt(Exception): def InitWorker(): signal.signal(signal.SIGINT, signal.SIG_IGN) + def DoWorkWrapper(args): """ A wrapper around the DoWork() method. @@ -303,6 +305,7 @@ def DoWorkWrapper(args): def DoWork(project, mirror, opt, cmd, shell, cnt, config): env = os.environ.copy() + def setenv(name, val): if val is None: val = '' diff --git a/subcmds/gitc_delete.py b/subcmds/gitc_delete.py index e5214b8e..1011276f 100644 --- a/subcmds/gitc_delete.py +++ b/subcmds/gitc_delete.py @@ -24,6 +24,7 @@ from pyversion import is_python3 if not is_python3(): input = raw_input + class GitcDelete(Command, GitcClientCommand): common = True visible_everywhere = False diff --git a/subcmds/grep.py b/subcmds/grep.py index 4dd85d57..13069286 100644 --- a/subcmds/grep.py +++ b/subcmds/grep.py @@ -23,12 +23,14 @@ from command import PagedCommand from error import GitError from git_command import git_require, GitCommand + class GrepColoring(Coloring): def __init__(self, config): Coloring.__init__(self, config, 'grep') self.project = self.printer('project', attr='bold') self.fail = self.printer('fail', fg='red') + class Grep(PagedCommand): common = True helpSummary = "Print lines matching a pattern" @@ -156,7 +158,6 @@ contain a line that matches both expressions: action='callback', callback=carry, help='Show only file names not containing matching lines') - def Execute(self, opt, args): out = GrepColoring(self.manifest.manifestProject.config) diff --git a/subcmds/help.py b/subcmds/help.py index 93b9a86d..36b3a7ae 100644 --- a/subcmds/help.py +++ b/subcmds/help.py @@ -23,6 +23,7 @@ from color import Coloring from command import PagedCommand, MirrorSafeCommand, GitcAvailableCommand, GitcClientCommand import gitc_utils + class Help(PagedCommand, MirrorSafeCommand): common = False helpSummary = "Display detailed help on a command" diff --git a/subcmds/info.py b/subcmds/info.py index 96fa6a4c..76f5d1d6 100644 --- a/subcmds/info.py +++ b/subcmds/info.py @@ -18,10 +18,12 @@ from command import PagedCommand from color import Coloring from git_refs import R_M + class _Coloring(Coloring): def __init__(self, config): Coloring.__init__(self, config, "status") + class Info(PagedCommand): common = True helpSummary = "Get info on the manifest branch, current branch or unmerged branches" @@ -41,7 +43,6 @@ class Info(PagedCommand): dest="local", action="store_true", help="Disable all remote operations") - def Execute(self, opt, args): self.out = _Coloring(self.manifest.globalConfig) self.heading = self.out.printer('heading', attr='bold') diff --git a/subcmds/init.py b/subcmds/init.py index 7181b86f..dde97286 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -37,6 +37,7 @@ from git_config import GitConfig from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD import platform_utils + class Init(InteractiveCommand, MirrorSafeCommand): common = True helpSummary = "Initialize repo in the current directory" diff --git a/subcmds/list.py b/subcmds/list.py index 1cd971ef..13cae5ff 100644 --- a/subcmds/list.py +++ b/subcmds/list.py @@ -18,6 +18,7 @@ from __future__ import print_function from command import Command, MirrorSafeCommand + class List(Command, MirrorSafeCommand): common = True helpSummary = "List projects and their associated directories" diff --git a/subcmds/manifest.py b/subcmds/manifest.py index 6bb01045..072c9ff7 100644 --- a/subcmds/manifest.py +++ b/subcmds/manifest.py @@ -20,6 +20,7 @@ import sys from command import PagedCommand + class Manifest(PagedCommand): common = False helpSummary = "Manifest inspection utility" diff --git a/subcmds/prune.py b/subcmds/prune.py index ff2fba1d..e90ff213 100644 --- a/subcmds/prune.py +++ b/subcmds/prune.py @@ -18,6 +18,7 @@ from __future__ import print_function from color import Coloring from command import PagedCommand + class Prune(PagedCommand): common = True helpSummary = "Prune (delete) already merged topics" diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py index b157e2f1..4817a862 100644 --- a/subcmds/selfupdate.py +++ b/subcmds/selfupdate.py @@ -22,6 +22,7 @@ from command import Command, MirrorSafeCommand from subcmds.sync import _PostRepoUpgrade from subcmds.sync import _PostRepoFetch + class Selfupdate(Command, MirrorSafeCommand): common = False helpSummary = "Update repo to the latest version" diff --git a/subcmds/smartsync.py b/subcmds/smartsync.py index 675b9834..6037e5a3 100644 --- a/subcmds/smartsync.py +++ b/subcmds/smartsync.py @@ -16,6 +16,7 @@ from subcmds.sync import Sync + class Smartsync(Sync): common = True helpSummary = "Update working tree to the latest known good revision" diff --git a/subcmds/stage.py b/subcmds/stage.py index aeb49513..4dce5ce5 100644 --- a/subcmds/stage.py +++ b/subcmds/stage.py @@ -21,6 +21,7 @@ from color import Coloring from command import InteractiveCommand from git_command import GitCommand + class _ProjectList(Coloring): def __init__(self, gc): Coloring.__init__(self, gc, 'interactive') @@ -28,6 +29,7 @@ class _ProjectList(Coloring): self.header = self.printer('header', attr='bold') self.help = self.printer('help', fg='red', attr='bold') + class Stage(InteractiveCommand): common = True helpSummary = "Stage file(s) for commit" @@ -105,6 +107,7 @@ The '%prog' command stages files to prepare the next commit. continue print('Bye.') + def _AddI(project): p = GitCommand(project, ['add', '--interactive'], bare=False) p.Wait() diff --git a/subcmds/start.py b/subcmds/start.py index f98f790a..adc6d293 100644 --- a/subcmds/start.py +++ b/subcmds/start.py @@ -25,6 +25,7 @@ import gitc_utils from progress import Progress from project import SyncBuffer + class Start(Command): common = True helpSummary = "Start a new branch for development" diff --git a/subcmds/status.py b/subcmds/status.py index a04ba922..b594bd89 100644 --- a/subcmds/status.py +++ b/subcmds/status.py @@ -31,6 +31,7 @@ import os from color import Coloring import platform_utils + class Status(PagedCommand): common = True helpSummary = "Show the working tree status" diff --git a/subcmds/sync.py b/subcmds/sync.py index 1ea102c0..c433ce6f 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -53,6 +53,7 @@ except ImportError: try: import resource + def _rlimit_nofile(): return resource.getrlimit(resource.RLIMIT_NOFILE) except ImportError: @@ -81,13 +82,16 @@ from manifest_xml import GitcManifest _ONE_DAY_S = 24 * 60 * 60 + class _FetchError(Exception): """Internal error thrown in _FetchHelper() when we don't want stack trace.""" pass + class _CheckoutError(Exception): """Internal error thrown in _CheckoutOne() when we don't want stack trace.""" + class Sync(Command, MirrorSafeCommand): jobs = 1 common = True @@ -1044,6 +1048,7 @@ later is required to fix a server side protocol bug. file=sys.stderr) sys.exit(1) + def _PostRepoUpgrade(manifest, quiet=False): wrapper = Wrapper() if wrapper.NeedSetupGnuPG(): @@ -1052,6 +1057,7 @@ def _PostRepoUpgrade(manifest, quiet=False): if project.Exists: project.PostRepoUpgrade() + def _PostRepoFetch(rp, no_repo_verify=False, verbose=False): if rp.HasChanges: print('info: A new version of repo is available', file=sys.stderr) @@ -1070,6 +1076,7 @@ def _PostRepoFetch(rp, no_repo_verify=False, verbose=False): print('repo version %s is current' % rp.work_git.describe(HEAD), file=sys.stderr) + def _VerifyTag(project): gpg_dir = os.path.expanduser('~/.repoconfig/gnupg') if not os.path.exists(gpg_dir): @@ -1174,6 +1181,8 @@ class _FetchTimes(object): # and supporting persistent-http[s]. It cannot change hosts from # request to request like the normal transport, the real url # is passed during initialization. + + class PersistentTransport(xmlrpc.client.Transport): def __init__(self, orig_host): self.orig_host = orig_host diff --git a/subcmds/upload.py b/subcmds/upload.py index 180496fc..bc373b3e 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -33,6 +33,7 @@ else: UNUSUAL_COMMIT_THRESHOLD = 5 + def _ConfirmManyUploads(multiple_branches=False): if multiple_branches: print('ATTENTION: One or more branches has an unusually high number ' @@ -44,17 +45,20 @@ def _ConfirmManyUploads(multiple_branches=False): answer = input("If you are sure you intend to do this, type 'yes': ").strip() return answer == "yes" + def _die(fmt, *args): msg = fmt % args print('error: %s' % msg, file=sys.stderr) sys.exit(1) + def _SplitEmails(values): result = [] for value in values: result.extend([s.strip() for s in value.split(',')]) return result + class Upload(InteractiveCommand): common = True helpSummary = "Upload changes for code review" diff --git a/subcmds/version.py b/subcmds/version.py index 761172b7..92316549 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -20,6 +20,7 @@ from command import Command, MirrorSafeCommand from git_command import git, RepoSourceVersion, user_agent from git_refs import HEAD + class Version(Command, MirrorSafeCommand): wrapper_version = None wrapper_path = None -- cgit v1.2.3-54-g00ecf