From a6c52f566acfbff5b0f37158c0d33adf05d250e5 Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 3 Nov 2022 16:51:19 -0400 Subject: Set tracing to always on and save to .repo/TRACE_FILE. - add `--trace_to_stderr` option so stderr will include trace outputs and any other errors that get sent to stderr - while TRACE_FILE will only include trace outputs piggy-backing on: https://gerrit-review.googlesource.com/c/git-repo/+/349154 Change-Id: I3895a84de4b2784f17fac4325521cd5e72e645e2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/350114 Reviewed-by: LaMont Jones Tested-by: Joanna Wang --- subcmds/sync.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'subcmds') diff --git a/subcmds/sync.py b/subcmds/sync.py index fe63b484..082b254f 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -60,7 +60,7 @@ from error import RepoChangedException, GitError, ManifestParseError import platform_utils from project import SyncBuffer from progress import Progress -from repo_trace import IsTrace, Trace +from repo_trace import Trace import ssh from wrapper import Wrapper from manifest_xml import GitcManifest @@ -739,7 +739,6 @@ later is required to fix a server side protocol bug. bak_dir = os.path.join(objdir, '.repo', 'pack.bak') if not _BACKUP_OBJECTS or not platform_utils.isdir(pack_dir): return - saved = [] files = set(platform_utils.listdir(pack_dir)) to_backup = [] for f in files: @@ -751,12 +750,10 @@ later is required to fix a server side protocol bug. for fname in to_backup: bak_fname = os.path.join(bak_dir, fname) if not os.path.exists(bak_fname): - saved.append(fname) - # Use a tmp file so that we are sure of a complete copy. - shutil.copy(os.path.join(pack_dir, fname), bak_fname + '.tmp') - shutil.move(bak_fname + '.tmp', bak_fname) - if saved: - Trace('%s saved %s', bare_git._project.name, ' '.join(saved)) + with Trace('%s saved %s', bare_git._project.name, fname): + # Use a tmp file so that we are sure of a complete copy. + shutil.copy(os.path.join(pack_dir, fname), bak_fname + '.tmp') + shutil.move(bak_fname + '.tmp', bak_fname) def _GCProjects(self, projects, opt, err_event): pm = Progress('Garbage collecting', len(projects), delay=False, quiet=opt.quiet) -- cgit v1.2.3-54-g00ecf