From c993c5068e0f7e22124b1bfb17ad0425fe2b8c83 Mon Sep 17 00:00:00 2001 From: Aravind Vasudevan Date: Thu, 14 Sep 2023 08:46:44 +0000 Subject: subcmds: Use repo logger Bug: b/292704435 Change-Id: Ia3a45d87fc0bf0d4a1ba53050d9c3cd2dba20e55 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/386236 Reviewed-by: Jason Chang Commit-Queue: Aravind Vasudevan Tested-by: Aravind Vasudevan --- subcmds/abandon.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'subcmds/abandon.py') diff --git a/subcmds/abandon.py b/subcmds/abandon.py index 996c3d2c..f6c0c66c 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py @@ -15,7 +15,6 @@ import collections import functools import itertools -import sys from command import Command from command import DEFAULT_LOCAL_JOBS @@ -23,6 +22,10 @@ from error import RepoError from error import RepoExitError from git_command import git from progress import Progress +from repo_logging import RepoLogger + + +logger = RepoLogger(__file__) class AbandonError(RepoExitError): @@ -126,18 +129,12 @@ It is equivalent to "git branch -D ". if err: for br in err.keys(): err_msg = "error: cannot abandon %s" % br - print(err_msg, file=sys.stderr) + logger.error(err_msg) for proj in err[br]: - print( - " " * len(err_msg) + " | %s" % _RelPath(proj), - file=sys.stderr, - ) + logger.error(" " * len(err_msg) + " | %s", _RelPath(proj)) raise AbandonError(aggregate_errors=aggregate_errors) elif not success: - print( - "error: no project has local branch(es) : %s" % nb, - file=sys.stderr, - ) + logger.error("error: no project has local branch(es) : %s", nb) raise AbandonError(aggregate_errors=aggregate_errors) else: # Everything below here is displaying status. -- cgit v1.2.3-54-g00ecf