android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: add progress bar to garbage collection phase

Browse Source 
This can take a few seconds, if not a lot more, so add a progress bar
so users understand what's going on.

Change-Id: I5b4b54c1bbb9ec18728f979521310f7087afaa5c
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/302802
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2021-04-08 22:47:44 -04:00
parent 347f9ed393
commit 65af2602b5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
subcmds/sync.py
View File

@ -501,34 +501,39 @@ later is required to fix a server side protocol bug.
return ret and not err_results return ret and not err_results
def _GCProjects(self, projects, opt, err_event): def _GCProjects(self, projects, opt, err_event):
pm = Progress('Garbage collecting', len(projects), delay=False)
pm.update(inc=0, msg='prescan')
gc_gitdirs = {} gc_gitdirs = {}
for project in projects: for project in projects:
# Make sure pruning never kicks in with shared projects. # Make sure pruning never kicks in with shared projects.
if (not project.use_git_worktrees and if (not project.use_git_worktrees and
len(project.manifest.GetProjectsWithName(project.name)) > 1): len(project.manifest.GetProjectsWithName(project.name)) > 1):
if not opt.quiet: if not opt.quiet:
print('%s: Shared project %s found, disabling pruning.' % #pm.update(inc=0, msg='Shared project found')
print('\r%s: Shared project %s found, disabling pruning.' %
(project.relpath, project.name)) (project.relpath, project.name))
if git_require((2, 7, 0)): if git_require((2, 7, 0)):
project.EnableRepositoryExtension('preciousObjects') project.EnableRepositoryExtension('preciousObjects')
else: else:
# This isn't perfect, but it's the best we can do with old git. # This isn't perfect, but it's the best we can do with old git.
print('%s: WARNING: shared projects are unreliable when using old ' print('\r%s: WARNING: shared projects are unreliable when using old '
'versions of git; please upgrade to git-2.7.0+.' 'versions of git; please upgrade to git-2.7.0+.'
% (project.relpath,), % (project.relpath,),
file=sys.stderr) file=sys.stderr)
project.config.SetString('gc.pruneExpire', 'never') project.config.SetString('gc.pruneExpire', 'never')
gc_gitdirs[project.gitdir] = project.bare_git gc_gitdirs[project.gitdir] = project.bare_git
if multiprocessing: pm.update(inc=len(projects) - len(gc_gitdirs), msg='warming up')
cpu_count = multiprocessing.cpu_count()
else: cpu_count = os.cpu_count()
cpu_count = 1
jobs = min(self.jobs, cpu_count) jobs = min(self.jobs, cpu_count)
if jobs < 2: if jobs < 2:
for bare_git in gc_gitdirs.values(): for bare_git in gc_gitdirs.values():
pm.update(msg=bare_git._project.name)
bare_git.gc('--auto') bare_git.gc('--auto')
pm.end()
return return
config = {'pack.threads': cpu_count // jobs if cpu_count > jobs else 1} config = {'pack.threads': cpu_count // jobs if cpu_count > jobs else 1}
@ -537,6 +542,7 @@ later is required to fix a server side protocol bug.
sem = _threading.Semaphore(jobs) sem = _threading.Semaphore(jobs)
def GC(bare_git): def GC(bare_git):
pm.start(bare_git._project.name)
try: try:
try: try:
bare_git.gc('--auto', config=config) bare_git.gc('--auto', config=config)
@ -546,6 +552,7 @@ later is required to fix a server side protocol bug.
err_event.set() err_event.set()
raise raise
finally: finally:
pm.finish(bare_git._project.name)
sem.release() sem.release()
for bare_git in gc_gitdirs.values(): for bare_git in gc_gitdirs.values():
@ -559,6 +566,7 @@ later is required to fix a server side protocol bug.
for t in threads: for t in threads:
t.join() t.join()
pm.end()
def _ReloadManifest(self, manifest_name=None): def _ReloadManifest(self, manifest_name=None):
if manifest_name: if manifest_name: