From 221a31cd0a99bbaeb108f23847a694fb6dca2db1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@google.com>
Date: Thu, 5 Nov 2026 21:53:54 -0500
Subject: [PATCH] style: use `import git_trace2_event_log` everywhere

Align with Google style guides and `import git_trace2_event_log` as a
module rather than import symbols out of it.

Change-Id: I4fdb0692ccbcf38ecdd756a4417c68f0cfaebc0c
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/654815
Reviewed-by: Brian Gan <brgan@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
---
 .flake8    |  1 -
 main.py    | 10 ++++------
 project.py | 10 +++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.flake8 b/.flake8
index 39d1abee9..10b0980cf 100644
--- a/.flake8
+++ b/.flake8
@@ -12,7 +12,6 @@ per-file-ignores =
     git_trace2_event_log.py: IMR241,
     main.py: IMR241,
     manifest_xml.py: IMR241,
-    project.py: IMR241,
     subcmds/abandon.py: IMR241,
     subcmds/branches.py: IMR241,
     subcmds/checkout.py: IMR241,
diff --git a/main.py b/main.py
index 1e705e26b..99283e090 100755
--- a/main.py
+++ b/main.py
@@ -49,7 +49,7 @@ import error
 import event_log
 import git_command
 import git_config
-from git_trace2_event_log import EventLog
+import git_trace2_event_log
 import manifest_xml
 import pager
 import repo_trace
@@ -262,14 +262,12 @@ class _Repo:
             self._PrintHelp(short=True)
             return 1
 
-        git_trace2_event_log = EventLog()
-        run = (
-            lambda: self._RunLong(name, gopts, argv, git_trace2_event_log) or 0
-        )
+        git_event_log = git_trace2_event_log.EventLog()
+        run = lambda: self._RunLong(name, gopts, argv, git_event_log) or 0
         with repo_trace.Trace(
             "starting new command: %s [sid=%s]",
             ", ".join([name] + argv),
-            git_trace2_event_log.full_sid,
+            git_event_log.full_sid,
             first_trace=True,
         ):
             if gopts.trace_python:
diff --git a/project.py b/project.py
index 00655e7bc..c132cf30d 100644
--- a/project.py
+++ b/project.py
@@ -40,7 +40,7 @@ import git_config
 import git_refs
 import git_status
 import git_superproject
-from git_trace2_event_log import EventLog
+import git_trace2_event_log
 import platform_utils
 import progress
 import repo_logging
@@ -340,7 +340,7 @@ class ReviewableBranch:
         validate_certs=True,
         push_options=None,
         patchset_description=None,
-        git_event_log: Optional[EventLog] = None,
+        git_event_log: Optional[git_trace2_event_log.EventLog] = None,
         quiet: bool = False,
     ) -> None:
         self.project.UploadForReview(
@@ -1569,7 +1569,7 @@ class Project:
         validate_certs=True,
         push_options=None,
         patchset_description=None,
-        git_event_log: Optional[EventLog] = None,
+        git_event_log: Optional[git_trace2_event_log.EventLog] = None,
         quiet: bool = False,
     ) -> None:
         """Uploads the named branch for code review."""
@@ -6032,7 +6032,7 @@ class ManifestProject(MetaProject):
         # TODO(lamontjones): when refactoring sync (and init?) consider how to
         # better get the init options that we should use for new submanifests
         # that are added when syncing an existing workspace.
-        git_event_log = git_event_log or EventLog()
+        git_event_log = git_event_log or git_trace2_event_log.EventLog()
         spec = submanifest.ToSubmanifestSpec()
         # Use the init options from the existing manifestProject, or the parent
         # if it doesn't exist.
@@ -6162,7 +6162,7 @@ class ManifestProject(MetaProject):
             with_platform=False
         )
         platform = platform or "auto"
-        git_event_log = git_event_log or EventLog()
+        git_event_log = git_event_log or git_trace2_event_log.EventLog()
         if outer_manifest and self.manifest.is_submanifest:
             # In a multi-manifest checkout, use the outer manifest unless we are
             # told not to.