sync: Handle KeyboardInterrupt during checkout

sokcevicG · sokcevicG · commit d93fe60e8934 · 2025-01-08T13:36:52.000-08:00
KeyboardInterrupt is handled during NetworkHalf. This patch handles KeyboardInterrupt during LocalHalf. Bug: b/372069163 Change-Id: I26847f7ca3cdf1fe57b265b4f6b18cc8102d2921 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/447401 Tested-by: Josip Sokcevic <sokcevic@chromium.org> Reviewed-by: Gavin Mak <gavinmak@google.com>
diff --git a/subcmds/sync.py b/subcmds/sync.py
@@ -1058,6 +1058,8 @@ def _CheckoutOne(
                 verbose=verbose,
             )
             success = syncbuf.Finish()
+        except KeyboardInterrupt:
+            logger.error("Keyboard interrupt while processing %s", project.name)
         except GitError as e:
             logger.error(
                 "error.GitError: Cannot checkout %s: %s", project.name, e

Original file line number	Diff line number	Diff line change
`@@ -1058,6 +1058,8 @@ def _CheckoutOne(`
`1058`	`1058`	`verbose=verbose,`
`1059`	`1059`	`)`
`1060`	`1060`	`success = syncbuf.Finish()`
	`1061`	`+ except KeyboardInterrupt:`
	`1062`	`+ logger.error("Keyboard interrupt while processing %s", project.name)`
`1061`	`1063`	`except GitError as e:`
`1062`	`1064`	`logger.error(`
`1063`	`1065`	`"error.GitError: Cannot checkout %s: %s", project.name, e`