From cc1f41d782b39d852dbd9c738ff01eb8814d9e86 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 22 Oct 2026 23:46:37 -0400 Subject: [PATCH] style: use `import repo_logging` everywhere Align with Google style guides and `import repo_logging` as a module rather than import symbols out of it. Change-Id: Ie13c1f13be00dbf6dd3814a8780baf6453972237 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/647823 Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger Reviewed-by: Brian Gan --- git_command.py | 4 ++-- main.py | 4 ++-- project.py | 4 ++-- subcmds/abandon.py | 4 ++-- subcmds/checkout.py | 4 ++-- subcmds/cherry_pick.py | 4 ++-- subcmds/download.py | 4 ++-- subcmds/forall.py | 4 ++-- subcmds/grep.py | 4 ++-- subcmds/init.py | 4 ++-- subcmds/manifest.py | 4 ++-- subcmds/rebase.py | 4 ++-- subcmds/selfupdate.py | 4 ++-- subcmds/stage.py | 4 ++-- subcmds/start.py | 4 ++-- subcmds/sync.py | 4 ++-- subcmds/upload.py | 4 ++-- tests/test_repo_logging.py | 12 ++++++------ 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/git_command.py b/git_command.py index 86c7738ab..516a632dc 100644 --- a/git_command.py +++ b/git_command.py @@ -23,7 +23,7 @@ from typing import Any, Optional import error from git_trace2_event_log_base import BaseEventLog import platform_utils -from repo_logging import RepoLogger +import repo_logging import repo_trace from wrapper import Wrapper @@ -40,7 +40,7 @@ GIT_ERROR_STDOUT_LINES = 1 GIT_ERROR_STDERR_LINES = 10 INVALID_GIT_EXIT_CODE = 126 -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class _GitCall: diff --git a/main.py b/main.py index 3ff88bec8..cb6da0306 100755 --- a/main.py +++ b/main.py @@ -33,7 +33,7 @@ import time from typing import Optional import urllib.request -from repo_logging import RepoLogger +import repo_logging try: @@ -60,7 +60,7 @@ from wrapper import Wrapper from wrapper import WrapperPath -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) # NB: These do not need to be kept in sync with the repo launcher script. diff --git a/project.py b/project.py index 01f5e4668..d0e44f2f8 100644 --- a/project.py +++ b/project.py @@ -54,11 +54,11 @@ import git_superproject from git_trace2_event_log import EventLog import platform_utils import progress -from repo_logging import RepoLogger +import repo_logging import repo_trace -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class SyncNetworkHalfResult(NamedTuple): diff --git a/subcmds/abandon.py b/subcmds/abandon.py index 1350c86e6..d27f5f421 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py @@ -21,10 +21,10 @@ from command import DEFAULT_LOCAL_JOBS import error from git_command import IsValidBranchName from progress import Progress -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class AbandonError(error.RepoExitError): diff --git a/subcmds/checkout.py b/subcmds/checkout.py index e991a4a31..21b4b0d2b 100644 --- a/subcmds/checkout.py +++ b/subcmds/checkout.py @@ -19,10 +19,10 @@ from command import Command from command import DEFAULT_LOCAL_JOBS import error from progress import Progress -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class CheckoutBranchResult(NamedTuple): diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index f6a6cf934..0b504e937 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py @@ -19,11 +19,11 @@ from typing import Tuple from command import Command import error from git_command import GitCommand -from repo_logging import RepoLogger +import repo_logging CHANGE_ID_RE = re.compile(r"^\s*Change-Id: I([0-9a-f]{40})\s*$") -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class CherryPick(Command): diff --git a/subcmds/download.py b/subcmds/download.py index 7a1f6e357..50458efbd 100644 --- a/subcmds/download.py +++ b/subcmds/download.py @@ -17,11 +17,11 @@ import sys from command import Command import error -from repo_logging import RepoLogger +import repo_logging CHANGE_RE = re.compile(r"^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$") -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class DownloadCommandError(error.RepoExitError): diff --git a/subcmds/forall.py b/subcmds/forall.py index 598ab4988..05096d654 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py @@ -25,10 +25,10 @@ from color import Coloring from command import Command from command import DEFAULT_LOCAL_JOBS from command import MirrorSafeCommand -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) _CAN_COLOR = [ "branch", "diff", diff --git a/subcmds/grep.py b/subcmds/grep.py index 8da236af0..1a361daf7 100644 --- a/subcmds/grep.py +++ b/subcmds/grep.py @@ -21,10 +21,10 @@ from command import DEFAULT_LOCAL_JOBS from command import PagedCommand import error from git_command import GitCommand -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class GrepColoring(Coloring): diff --git a/subcmds/init.py b/subcmds/init.py index f1377f0cf..567040820 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -20,12 +20,12 @@ from command import InteractiveCommand from command import MirrorSafeCommand import error from git_command import git_require -from repo_logging import RepoLogger +import repo_logging from wrapper import Wrapper from wrapper import WrapperDir -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) _REPO_ALLOW_SHALLOW = os.environ.get("REPO_ALLOW_SHALLOW") diff --git a/subcmds/manifest.py b/subcmds/manifest.py index 548bac0db..2c58f1b3e 100644 --- a/subcmds/manifest.py +++ b/subcmds/manifest.py @@ -19,10 +19,10 @@ import os import sys from command import PagedCommand -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class OutputFormat(enum.Enum): diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 0099c4a90..a0cc2b195 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -19,10 +19,10 @@ from command import Command import error from git_command import GitCommand from project import Project -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class RebaseColoring(Coloring): diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py index d3f60c592..956ee85ad 100644 --- a/subcmds/selfupdate.py +++ b/subcmds/selfupdate.py @@ -17,12 +17,12 @@ import optparse from command import Command from command import MirrorSafeCommand import error -from repo_logging import RepoLogger +import repo_logging from subcmds.sync import _PostRepoFetch from subcmds.sync import _PostRepoUpgrade -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class SelfupdateError(error.RepoExitError): diff --git a/subcmds/stage.py b/subcmds/stage.py index 1c285fc19..bcab1fcca 100644 --- a/subcmds/stage.py +++ b/subcmds/stage.py @@ -17,10 +17,10 @@ import sys from color import Coloring from command import InteractiveCommand from git_command import GitCommand -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class _ProjectList(Coloring): diff --git a/subcmds/start.py b/subcmds/start.py index 98ac6b267..829e82eb1 100644 --- a/subcmds/start.py +++ b/subcmds/start.py @@ -21,10 +21,10 @@ import error from git_command import IsValidBranchName from git_config import IsImmutable from progress import Progress -from repo_logging import RepoLogger +import repo_logging -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class ExecuteOneResult(NamedTuple): diff --git a/subcmds/sync.py b/subcmds/sync.py index 2ab9dbd35..331b79d2a 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -76,7 +76,7 @@ from project import DeleteWorktreeError from project import Project from project import RemoteSpec from project import SyncBuffer -from repo_logging import RepoLogger +import repo_logging import repo_trace import ssh from wrapper import Wrapper @@ -90,7 +90,7 @@ _BLOAT_PACK_COUNT_THRESHOLD = 10 _BLOAT_SIZE_PACK_THRESHOLD_KB = 10 * 1024 * 1024 # 10 GiB in KiB _BLOAT_SIZE_GARBAGE_THRESHOLD_KB = 1 * 1024 * 1024 # 1 GiB in KiB -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) # Manifest server RPC that takes a single struct of named options. Servers # that do not implement it are called via the positional GetApprovedManifest. diff --git a/subcmds/upload.py b/subcmds/upload.py index 79652f921..1a9ab0eff 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -27,12 +27,12 @@ from git_refs import R_HEADS import git_superproject from hooks import RepoHook from project import ReviewableBranch -from repo_logging import RepoLogger +import repo_logging from subcmds.sync import LocalSyncState _DEFAULT_UNUSUAL_COMMIT_THRESHOLD = 5 -logger = RepoLogger(__file__) +logger = repo_logging.RepoLogger(__file__) class UploadExitError(error.SilentRepoExitError): diff --git a/tests/test_repo_logging.py b/tests/test_repo_logging.py index 035e2035f..28a80bd0d 100644 --- a/tests/test_repo_logging.py +++ b/tests/test_repo_logging.py @@ -24,13 +24,13 @@ import pytest from color import SetDefaultColoring import error -from repo_logging import RepoLogger +import repo_logging -@mock.patch.object(RepoLogger, "error") +@mock.patch.object(repo_logging.RepoLogger, "error") def test_log_aggregated_errors_logs_aggregated_errors(mock_error) -> None: """Test if log_aggregated_errors logs a list of aggregated errors.""" - logger = RepoLogger(__name__) + logger = repo_logging.RepoLogger(__name__) logger.log_aggregated_errors( error.RepoExitError( aggregate_errors=[ @@ -57,10 +57,10 @@ def test_log_aggregated_errors_logs_aggregated_errors(mock_error) -> None: ) -@mock.patch.object(RepoLogger, "error") +@mock.patch.object(repo_logging.RepoLogger, "error") def test_log_aggregated_errors_logs_single_error(mock_error) -> None: """Test if log_aggregated_errors logs empty aggregated_errors.""" - logger = RepoLogger(__name__) + logger = repo_logging.RepoLogger(__name__) logger.log_aggregated_errors(error.RepoExitError()) mock_error.assert_has_calls( @@ -99,7 +99,7 @@ def test_log_with_format_string(level: int) -> None: output = io.StringIO() with contextlib.redirect_stderr(output): - logger = RepoLogger(__name__) + logger = repo_logging.RepoLogger(__name__) logger.log(level, "%s", "100% pass") assert re.search(