20 files changed, 95 insertions, 66 deletions

diff --git a/subcmds/__init__.py b/subcmds/__init__.py
index 0754f708..965ad0bb 100644
--- a/subcmds/__init__.py
+++ b/subcmds/__init__.py
@@ -14,6 +14,7 @@
 
 import os
 
+
 # A mapping of the subcommand name to the class that implements it.
 all_commands = {}
 all_modules = []
diff --git a/subcmds/abandon.py b/subcmds/abandon.py
index 1499c75e..996c3d2c 100644
--- a/subcmds/abandon.py
+++ b/subcmds/abandon.py
@@ -17,10 +17,12 @@ import functools
 import itertools
 import sys
 
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
+from error import RepoError
+from error import RepoExitError
 from git_command import git
 from progress import Progress
-from error import RepoError, RepoExitError
 
 
 class AbandonError(RepoExitError):
diff --git a/subcmds/branches.py b/subcmds/branches.py
index 4d5bb196..33523c38 100644
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@@ -16,7 +16,8 @@ import itertools
 import sys
 
 from color import Coloring
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
 
 
 class BranchColoring(Coloring):
diff --git a/subcmds/checkout.py b/subcmds/checkout.py
index 033fd349..67f1838c 100644
--- a/subcmds/checkout.py
+++ b/subcmds/checkout.py
@@ -14,12 +14,14 @@
 
 import functools
 import sys
-
 from typing import NamedTuple
-from command import Command, DEFAULT_LOCAL_JOBS
+
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
+from error import GitError
+from error import RepoExitError
 from progress import Progress
 from project import Project
-from error import GitError, RepoExitError
 
 
 class CheckoutBranchResult(NamedTuple):
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index 7a4dd09e..980720eb 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -14,9 +14,11 @@
 
 import re
 import sys
+
 from command import Command
-from git_command import GitCommand
 from error import GitError
+from git_command import GitCommand
+
 
 CHANGE_ID_RE = re.compile(r"^\s*Change-Id: I([0-9a-f]{40})\s*$")
 
diff --git a/subcmds/diff.py b/subcmds/diff.py
index 5c627c0c..d9d72b40 100644
--- a/subcmds/diff.py
+++ b/subcmds/diff.py
@@ -15,7 +15,8 @@
 import functools
 import io
 
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import DEFAULT_LOCAL_JOBS
+from command import PagedCommand
 
 
 class Diff(PagedCommand):
diff --git a/subcmds/download.py b/subcmds/download.py
index 18e555be..e33698e1 100644
--- a/subcmds/download.py
+++ b/subcmds/download.py
@@ -16,7 +16,10 @@ import re
 import sys
 
 from command import Command
-from error import GitError, NoSuchProjectError, RepoExitError
+from error import GitError
+from error import NoSuchProjectError
+from error import RepoExitError
+
 
 CHANGE_RE = re.compile(r"^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$")
 
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 0a897357..9a02c49f 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -16,21 +16,20 @@ import errno
 import functools
 import io
 import multiprocessing
-import re
 import os
+import re
 import signal
-import sys
 import subprocess
+import sys
 
 from color import Coloring
-from command import (
-    DEFAULT_LOCAL_JOBS,
-    Command,
-    MirrorSafeCommand,
-    WORKER_BATCH_SIZE,
-)
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
+from command import MirrorSafeCommand
+from command import WORKER_BATCH_SIZE
 from error import ManifestInvalidRevisionError
 
+
 _CAN_COLOR = [
     "branch",
     "diff",
diff --git a/subcmds/grep.py b/subcmds/grep.py
index 9ebd776c..19c06d4d 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -14,12 +14,15 @@
 
 import functools
 import sys
+from typing import NamedTuple
 
 from color import Coloring
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
-from error import GitError, InvalidArgumentsError, SilentRepoExitError
+from command import DEFAULT_LOCAL_JOBS
+from command import PagedCommand
+from error import GitError
+from error import InvalidArgumentsError
+from error import SilentRepoExitError
 from git_command import GitCommand
-from typing import NamedTuple
 from project import Project
 
 
diff --git a/subcmds/help.py b/subcmds/help.py
index 0d7b664e..a839131b 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -16,14 +16,12 @@ import re
 import sys
 import textwrap
 
-from subcmds import all_commands
 from color import Coloring
-from command import (
-    PagedCommand,
-    MirrorSafeCommand,
-)
-from wrapper import Wrapper
+from command import MirrorSafeCommand
+from command import PagedCommand
 from error import RepoExitError
+from subcmds import all_commands
+from wrapper import Wrapper
 
 
 class InvalidHelpCommand(RepoExitError):
diff --git a/subcmds/info.py b/subcmds/info.py
index 6e7f3ed2..c24682c7 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -14,9 +14,10 @@
 
 import optparse
 
-from command import PagedCommand
 from color import Coloring
-from git_refs import R_M, R_HEADS
+from command import PagedCommand
+from git_refs import R_HEADS
+from git_refs import R_M
 
 
 class _Coloring(Coloring):
diff --git a/subcmds/init.py b/subcmds/init.py
index c5a2c54c..529b212b 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -16,11 +16,15 @@ import os
 import sys
 
 from color import Coloring
-from command import InteractiveCommand, MirrorSafeCommand
-from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
-from wrapper import Wrapper
-from error import UpdateManifestError
+from command import InteractiveCommand
+from command import MirrorSafeCommand
 from error import RepoUnhandledExceptionError
+from error import UpdateManifestError
+from git_command import git_require
+from git_command import MIN_GIT_VERSION_HARD
+from git_command import MIN_GIT_VERSION_SOFT
+from wrapper import Wrapper
+
 
 _REPO_ALLOW_SHALLOW = os.environ.get("REPO_ALLOW_SHALLOW")
 
diff --git a/subcmds/list.py b/subcmds/list.py
index 24e3e1fc..fba6a4dc 100644
--- a/subcmds/list.py
+++ b/subcmds/list.py
@@ -14,7 +14,8 @@
 
 import os
 
-from command import Command, MirrorSafeCommand
+from command import Command
+from command import MirrorSafeCommand
 
 
 class List(Command, MirrorSafeCommand):
diff --git a/subcmds/prune.py b/subcmds/prune.py
index 5a68c14a..f18471f3 100644
--- a/subcmds/prune.py
+++ b/subcmds/prune.py
@@ -15,7 +15,8 @@
 import itertools
 
 from color import Coloring
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import DEFAULT_LOCAL_JOBS
+from command import PagedCommand
 
 
 class Prune(PagedCommand):
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index 983fd630..51d963ee 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -15,10 +15,11 @@
 import optparse
 import sys
 
-from command import Command, MirrorSafeCommand
-from subcmds.sync import _PostRepoUpgrade
-from subcmds.sync import _PostRepoFetch
+from command import Command
+from command import MirrorSafeCommand
 from error import RepoExitError
+from subcmds.sync import _PostRepoFetch
+from subcmds.sync import _PostRepoUpgrade
 
 
 class SelfupdateError(RepoExitError):
diff --git a/subcmds/start.py b/subcmds/start.py
index 481d9ef2..7a42b26c 100644
--- a/subcmds/start.py
+++ b/subcmds/start.py
@@ -14,14 +14,15 @@
 
 import functools
 import sys
+from typing import NamedTuple
 
-from command import Command, DEFAULT_LOCAL_JOBS
-from git_config import IsImmutable
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
+from error import RepoExitError
 from git_command import git
+from git_config import IsImmutable
 from progress import Progress
 from project import Project
-from typing import NamedTuple
-from error import RepoExitError
 
 
 class ExecuteOneResult(NamedTuple):
diff --git a/subcmds/status.py b/subcmds/status.py
index 6e0026f9..dac61ab6 100644
--- a/subcmds/status.py
+++ b/subcmds/status.py
@@ -17,9 +17,9 @@ import glob
 import io
 import os
 
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
-
 from color import Coloring
+from command import DEFAULT_LOCAL_JOBS
+from command import PagedCommand
 import platform_utils
 
 
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 74bc4557..13c964b2 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -25,13 +25,14 @@ import socket
 import sys
 import tempfile
 import time
-from typing import NamedTuple, List, Set
+from typing import List, NamedTuple, Set
 import urllib.error
 import urllib.parse
 import urllib.request
 import xml.parsers.expat
 import xmlrpc.client
 
+
 try:
     import threading as _threading
 except ImportError:
@@ -49,34 +50,35 @@ except ImportError:
         return (256, 256)
 
 
+from command import Command
+from command import DEFAULT_LOCAL_JOBS
+from command import MirrorSafeCommand
+from command import WORKER_BATCH_SIZE
+from error import GitError
+from error import RepoChangedException
+from error import RepoExitError
+from error import RepoUnhandledExceptionError
+from error import SyncError
+from error import UpdateManifestError
 import event_log
 from git_command import git_require
 from git_config import GetUrlCookieFile
-from git_refs import R_HEADS, HEAD
+from git_refs import HEAD
+from git_refs import R_HEADS
 import git_superproject
+import platform_utils
+from progress import elapsed_str
+from progress import jobs_str
+from progress import Progress
+from project import DeleteWorktreeError
 from project import Project
 from project import RemoteSpec
-from command import (
-    Command,
-    DEFAULT_LOCAL_JOBS,
-    MirrorSafeCommand,
-    WORKER_BATCH_SIZE,
-)
-from error import (
-    RepoChangedException,
-    GitError,
-    RepoExitError,
-    SyncError,
-    UpdateManifestError,
-    RepoUnhandledExceptionError,
-)
-import platform_utils
-from project import SyncBuffer, DeleteWorktreeError
-from progress import Progress, elapsed_str, jobs_str
+from project import SyncBuffer
 from repo_trace import Trace
 import ssh
 from wrapper import Wrapper
 
+
 _ONE_DAY_S = 24 * 60 * 60
 
 # Env var to implicitly turn auto-gc back on.  This was added to allow a user to
diff --git a/subcmds/upload.py b/subcmds/upload.py
index b89525ce..ec89ad43 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -19,9 +19,12 @@ import re
 import sys
 from typing import List
 
-from command import DEFAULT_LOCAL_JOBS, InteractiveCommand
+from command import DEFAULT_LOCAL_JOBS
+from command import InteractiveCommand
 from editor import Editor
-from error import UploadError, SilentRepoExitError, GitError
+from error import GitError
+from error import SilentRepoExitError
+from error import UploadError
 from git_command import GitCommand
 from git_refs import R_HEADS
 from hooks import RepoHook
diff --git a/subcmds/version.py b/subcmds/version.py
index c539db63..71a03608 100644
--- a/subcmds/version.py
+++ b/subcmds/version.py
@@ -15,8 +15,11 @@
 import platform
 import sys
 
-from command import Command, MirrorSafeCommand
-from git_command import git, RepoSourceVersion, user_agent
+from command import Command
+from command import MirrorSafeCommand
+from git_command import git
+from git_command import RepoSourceVersion
+from git_command import user_agent
 from git_refs import HEAD
 from wrapper import Wrapper