summaryrefslogtreecommitdiffstats
path: root/subcmds/grep.py
diff options
context:
space:
mode:
authorAravind Vasudevan <aravindvasudev@google.com>2023-09-14 08:46:44 +0000
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-09-14 17:13:37 +0000
commitc993c5068e0f7e22124b1bfb17ad0425fe2b8c83 (patch)
tree7e1dadd9b04a42ebfd438e41f35c176f0f0578da /subcmds/grep.py
parentc3d7c8536c408a54c7af1486f0beec7a1b0eb0ad (diff)
downloadgit-repo-c993c5068e0f7e22124b1bfb17ad0425fe2b8c83.tar.gz
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 <jasonnc@google.com> Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com> Tested-by: Aravind Vasudevan <aravindvasudev@google.com>
Diffstat (limited to 'subcmds/grep.py')
-rw-r--r--subcmds/grep.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/subcmds/grep.py b/subcmds/grep.py
index 19c06d4d..b677b6bd 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -24,6 +24,10 @@ from error import InvalidArgumentsError
24from error import SilentRepoExitError 24from error import SilentRepoExitError
25from git_command import GitCommand 25from git_command import GitCommand
26from project import Project 26from project import Project
27from repo_logging import RepoLogger
28
29
30logger = RepoLogger(__file__)
27 31
28 32
29class GrepColoring(Coloring): 33class GrepColoring(Coloring):
@@ -371,7 +375,7 @@ contain a line that matches both expressions:
371 if opt.revision: 375 if opt.revision:
372 if "--cached" in cmd_argv: 376 if "--cached" in cmd_argv:
373 msg = "fatal: cannot combine --cached and --revision" 377 msg = "fatal: cannot combine --cached and --revision"
374 print(msg, file=sys.stderr) 378 logger.error(msg)
375 raise InvalidArgumentsError(msg) 379 raise InvalidArgumentsError(msg)
376 have_rev = True 380 have_rev = True
377 cmd_argv.extend(opt.revision) 381 cmd_argv.extend(opt.revision)
@@ -396,5 +400,5 @@ contain a line that matches both expressions:
396 sys.exit(0) 400 sys.exit(0)
397 elif have_rev and bad_rev: 401 elif have_rev and bad_rev:
398 for r in opt.revision: 402 for r in opt.revision:
399 print("error: can't search revision %s" % r, file=sys.stderr) 403 logger.error("error: can't search revision %s", r)
400 raise GrepCommandError(aggregate_errors=errors) 404 raise GrepCommandError(aggregate_errors=errors)