commit 83c66ec661e39e47795086a5d26d0f3782ac1d49
author Aravind Vasudevan <aravindvasudev@google.com> Thu Sep 28 19:06:59 2023 +0000
committer LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 28 19:46:49 2023 +0000
tree 8a70e4d697b2dbd9fc379d3ba8cefbe355308e64
parent 87058c6ca5ec2c66d0850f1015de01ec6c0dd758

Reset info logs back to print in sync

Bug: b/292704435
Change-Id: Ib4b4873de726888fc68e476167ff2dcd74ec9045
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/387974
Tested-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
Reviewed-by: Jason Chang <jasonnc@google.com>

repo_logging.py

diff --git a/repo_logging.py b/repo_logging.py
index 5862535..49f0ee8 100644
--- a/repo_logging.py
+++ b/repo_logging.py
@@ -88,5 +88,5 @@
         )
 
         diff = len(err.aggregate_errors) - MAX_PRINT_ERRORS
-        if diff:
+        if diff > 0:
             self.error("+%d additional errors...", diff)

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index bdb5616..87d3cd8 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -1112,10 +1112,9 @@
             )
             if expected:
                 if not opt.quiet:
-                    logger.info(
-                        "%s: Shared project %s found, disabling pruning.",
-                        relpath,
-                        project.name,
+                    print(
+                        "\r%s: Shared project %s found, disabling pruning."
+                        % (relpath, project.name)
                     )
 
                 if git_require((2, 7, 0)):
@@ -1132,7 +1131,7 @@
                     project.config.SetString("gc.pruneExpire", "never")
             else:
                 if not opt.quiet:
-                    logger.info("%s: not shared, disabling pruning.", relpath)
+                    print(f"\r{relpath}: not shared, disabling pruning.")
                 project.config.SetString("extensions.preciousObjects", None)
                 project.config.SetString("gc.pruneExpire", None)
 
@@ -1366,7 +1365,7 @@
 
         manifest_server = manifest.manifest_server
         if not opt.quiet:
-            logger.info("Using manifest server %s", manifest_server)
+            print("Using manifest server %s" % manifest_server)
 
         if "@" not in manifest_server:
             username = None
@@ -1699,7 +1698,7 @@
         if opt.mp_update:
             self._UpdateAllManifestProjects(opt, mp, manifest_name, errors)
         else:
-            logger.info("Skipping update of local manifest project.")
+            print("Skipping update of local manifest project.")
 
         # Now that the manifests are up-to-date, setup options whose defaults
         # might be in the manifest.
@@ -1855,7 +1854,7 @@
             )
 
         if not opt.quiet:
-            logger.info("repo sync has finished successfully.")
+            print("repo sync has finished successfully.")
 
 
 def _PostRepoUpgrade(manifest, quiet=False):
@@ -1878,7 +1877,7 @@
 
 def _PostRepoFetch(rp, repo_verify=True, verbose=False):
     if rp.HasChanges:
-        logger.info("info: A new version of repo is available")
+        logger.warn("info: A new version of repo is available")
         wrapper = Wrapper()
         try:
             rev = rp.bare_git.describe(rp.GetRevisionId())
@@ -1900,15 +1899,13 @@
                 rp.work_git.reset("--keep", new_rev)
             except GitError as e:
                 raise RepoUnhandledExceptionError(e)
-            logger.info("info: Restarting repo with latest version")
+            print("info: Restarting repo with latest version")
             raise RepoChangedException(["--repo-upgraded"])
         else:
             logger.warning("warning: Skipped upgrade to unverified version")
     else:
         if verbose:
-            logger.info(
-                "repo version %s is current", rp.work_git.describe(HEAD)
-            )
+            print("repo version %s is current", rp.work_git.describe(HEAD))
 
 
 class _FetchTimes(object):