From 6ac6b90b05bc6a28325bd02d3b94c1b9deb24ba2 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Thu, 17 Jul 2025 13:17:32 -0700 Subject: [PATCH] sync: Improve UI and error reporting for interleaved mode This fixes two issues: 1. the progress bar could show a count greater than the total if new projects were discovered mid-sync. Update the progress bar total dynamically 2. Make "Stall detected" error message more actionable Bug: 432206932 Change-Id: Ie2a4ada5b1770cae0302fb06590641c522cbb7e7 --- subcmds/sync.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index 250925f49..a1ddc1662 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -2505,12 +2505,20 @@ later is required to fix a server side protocol bug. pending_relpaths = {p.relpath for p in projects_to_sync} if previously_pending_relpaths == pending_relpaths: - logger.error( - "Stall detected in interleaved sync, not all " - "projects could be synced." + stalled_projects_str = "\n".join( + f" - {path}" + for path in sorted(list(pending_relpaths)) ) - err_event.set() - break + logger.error( + "The following projects failed and could not " + "be synced:\n%s", + stalled_projects_str, + ) + # Ensure these are included in the final error report. + self._interleaved_err_checkout = True + self._interleaved_err_checkout_results.extend( + list(pending_relpaths) + ) previously_pending_relpaths = pending_relpaths self.get_parallel_context()[ @@ -2570,6 +2578,9 @@ later is required to fix a server side protocol bug. manifest=manifest, all_manifests=not opt.this_manifest_only, ) + new_total = len(project_list) + if new_total > pm.total: + pm.total = new_total finally: sync_event.set() sync_progress_thread.join()