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/cherry_pick.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'subcmds/cherry_pick.py') diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 980720eb..f9ae3e32 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py @@ -18,9 +18,11 @@ import sys from command import Command from error import GitError from git_command import GitCommand +from repo_logging import RepoLogger CHANGE_ID_RE = re.compile(r"^\s*Change-Id: I([0-9a-f]{40})\s*$") +logger = RepoLogger(__file__) class CherryPick(Command): @@ -52,7 +54,7 @@ change id will be added. try: p.Wait() except GitError: - print(p.stderr, file=sys.stderr) + logger.error(p.stderr) raise sha1 = p.stdout.strip() @@ -67,9 +69,7 @@ change id will be added. try: p.Wait() except GitError: - print( - "error: Failed to retrieve old commit message", file=sys.stderr - ) + logger.error("error: Failed to retrieve old commit message") raise old_msg = self._StripHeader(p.stdout) @@ -85,14 +85,13 @@ change id will be added. try: p.Wait() except GitError as e: - print(str(e)) - print( + logger.error(e) + logger.warn( "NOTE: When committing (please see above) and editing the " "commit message, please remove the old Change-Id-line and " - "add:" + "add:\n%s", + self._GetReference(sha1), ) - print(self._GetReference(sha1), file=sys.stderr) - print(file=sys.stderr) raise if p.stdout: @@ -115,10 +114,7 @@ change id will be added. try: p.Wait() except GitError: - print( - "error: Failed to update commit message", - file=sys.stderr, - ) + logger.error("error: Failed to update commit message") raise def _IsChangeId(self, line): -- cgit v1.2.3-54-g00ecf