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: report list of failing git trees

Browse Source 
When repo sync fails because some git trees are not in clean state and
as such can not be rebased automatically, it is a pain to figure out
which trees are the culprits.

With this patch the list of offending trees is printed when repo sync
reports checkout errors.

TEST=ran 'repo sync' and observed the proper list of directories show
     up after the final error message

Bug: https://crbug.com/gerrit/11293
Change-Id: Icdf1a03e9014ecb184f331f513cc9a2efc7d11ed
Signed-off-by: Vadim Bendebury <vbendeb@google.com>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/244053
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Vadim Bendebury 2019-11-06 11:05:00 -08:00 committed by Vadim Bendebury
parent 3164d40e22
commit dff919493a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subcmds/sync.py
View File

@ -440,7 +440,7 @@ later is required to fix a server side protocol bug.
finally: finally:
sem.release() sem.release()
def _CheckoutOne(self, opt, project, lock, pm, err_event): def _CheckoutOne(self, opt, project, lock, pm, err_event, err_results):
"""Checkout work tree for one project """Checkout work tree for one project
Args: Args:
@ -452,6 +452,8 @@ later is required to fix a server side protocol bug.
lock held). lock held).
err_event: We'll set this event in the case of an error (after printing err_event: We'll set this event in the case of an error (after printing
out info about the error). out info about the error).
err_results: A list of strings, paths to git repos where checkout
failed.
Returns: Returns:
Whether the fetch was successful. Whether the fetch was successful.
@ -496,6 +498,8 @@ later is required to fix a server side protocol bug.
raise raise
finally: finally:
if did_lock: if did_lock:
if not success:
err_results.append(project.relpath)
lock.release() lock.release()
finish = time.time() finish = time.time()
self.event_log.AddSync(project, event_log.TASK_SYNC_LOCAL, self.event_log.AddSync(project, event_log.TASK_SYNC_LOCAL,
@ -528,6 +532,7 @@ later is required to fix a server side protocol bug.
threads = set() threads = set()
sem = _threading.Semaphore(syncjobs) sem = _threading.Semaphore(syncjobs)
err_event = _threading.Event() err_event = _threading.Event()
err_results = []
for project in all_projects: for project in all_projects:
# Check for any errors before running any more tasks. # Check for any errors before running any more tasks.
@ -542,7 +547,8 @@ later is required to fix a server side protocol bug.
project=project, project=project,
lock=lock, lock=lock,
pm=pm, pm=pm,
err_event=err_event) err_event=err_event,
err_results=err_results)
if syncjobs > 1: if syncjobs > 1:
t = _threading.Thread(target=self._CheckoutWorker, t = _threading.Thread(target=self._CheckoutWorker,
kwargs=kwargs) kwargs=kwargs)
@ -560,6 +566,9 @@ later is required to fix a server side protocol bug.
# If we saw an error, exit with code 1 so that other scripts can check. # If we saw an error, exit with code 1 so that other scripts can check.
if err_event.isSet(): if err_event.isSet():
print('\nerror: Exited sync due to checkout errors', file=sys.stderr) print('\nerror: Exited sync due to checkout errors', file=sys.stderr)
if err_results:
print('Failing repos:\n%s' % '\n'.join(err_results),
file=sys.stderr)
sys.exit(1) sys.exit(1)
def _GCProjects(self, projects): def _GCProjects(self, projects):