From 4c80921d22c20a28d531c9e3e8a0ce4433c6509d Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Fri, 8 Dec 2023 13:42:17 -0800 Subject: Don't log spam `repo sync` by default Most times a repo sync after some time (week+) results in a bunch of messages, which are not very useful for average user: - discarding 1 commits - Deleting obsolete checkout. Bug: N/A Test: repo sync Change-Id: I881eab61f9f261e98f3656c09e73ddd159ce288c Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/397038 Reviewed-by: Josip Sokcevic Commit-Queue: Josip Sokcevic Tested-by: Tomasz Wasilczyk --- subcmds/sync.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'subcmds/sync.py') diff --git a/subcmds/sync.py b/subcmds/sync.py index b7236629..ac6a451b 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -956,12 +956,13 @@ later is required to fix a server side protocol bug. return _FetchMainResult(all_projects) - def _CheckoutOne(self, detach_head, force_sync, project): + def _CheckoutOne(self, detach_head, force_sync, verbose, project): """Checkout work tree for one project Args: detach_head: Whether to leave a detached HEAD. force_sync: Force checking out of the repo. + verbose: Whether to show verbose messages. project: Project object for the project to checkout. Returns: @@ -975,7 +976,7 @@ later is required to fix a server side protocol bug. errors = [] try: project.Sync_LocalHalf( - syncbuf, force_sync=force_sync, errors=errors + syncbuf, force_sync=force_sync, errors=errors, verbose=verbose ) success = syncbuf.Finish() except GitError as e: @@ -1042,7 +1043,7 @@ later is required to fix a server side protocol bug. proc_res = self.ExecuteInParallel( opt.jobs_checkout, functools.partial( - self._CheckoutOne, opt.detach_head, opt.force_sync + self._CheckoutOne, opt.detach_head, opt.force_sync, opt.verbose ), all_projects, callback=_ProcessResults, @@ -1288,7 +1289,7 @@ later is required to fix a server side protocol bug. groups=None, ) project.DeleteWorktree( - quiet=opt.quiet, force=opt.force_remove_dirty + verbose=opt.verbose, force=opt.force_remove_dirty ) new_project_paths.sort() @@ -1533,7 +1534,10 @@ later is required to fix a server side protocol bug. syncbuf = SyncBuffer(mp.config) start = time.time() mp.Sync_LocalHalf( - syncbuf, submodules=mp.manifest.HasSubmodules, errors=errors + syncbuf, + submodules=mp.manifest.HasSubmodules, + errors=errors, + verbose=opt.verbose, ) clean = syncbuf.Finish() self.event_log.AddSync( -- cgit v1.2.3-54-g00ecf