Only ever catch InteractionStopped at the highest level

Author: PawelLipski

docs/man/git-machete.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GIT-MACHETE" "1" "Oct 10, 2025" "" "git-machete"
+.TH "GIT-MACHETE" "1" "Nov 11, 2025" "" "git-machete"
 .SH NAME
 git-machete \- git-machete 3.37.1
 .sp

git_machete/cli.py

@@ -502,6 +502,13 @@ def set_utils_global_variables(parsed_args: argparse.Namespace) -> None:
 
 
 def launch(orig_args: List[str]) -> None:
+    try:
+        launch_interruptible(orig_args)
+    except InteractionStopped:
+        pass
+
+
+def launch_interruptible(orig_args: List[str]) -> None:
     initial_current_directory: Optional[str] = utils.get_current_directory_or_none()
 
     try:
@@ -744,10 +751,7 @@ def warn_on_deprecation(*, flag: str, revision: AnyRevision, revision_str: str)
                     fail_on_missing_current_user_for_my_open_prs=True)
             elif subcommand == f"create-{pr_or_mr}":
                 current_branch = git.get_current_branch()
-                try:
-                    github_or_gitlab_client.sync_before_creating_pull_request(opt_yes=cli_opts.opt_yes)
-                except InteractionStopped:
-                    return
+                github_or_gitlab_client.sync_before_creating_pull_request(opt_yes=cli_opts.opt_yes)
                 github_or_gitlab_client.create_pull_request(
                     head=current_branch,
                     opt_base=cli_opts.opt_base,
@@ -952,8 +956,6 @@ def main() -> None:
     except (MacheteException, UnderlyingGitException) as e:
         print(e, file=sys.stderr)
         sys.exit(ExitCode.MACHETE_EXCEPTION)
-    except InteractionStopped:  # pragma: no cover
-        pass
 
 
 if __name__ == "__main__":

git_machete/client/traverse.py

@@ -7,8 +7,7 @@
                                      SquashMergeDetection)
 from git_machete.client.with_code_hosting import MacheteClientWithCodeHosting
 from git_machete.code_hosting import PullRequest
-from git_machete.exceptions import (InteractionStopped, MacheteException,
-                                    UnexpectedMacheteException)
+from git_machete.exceptions import MacheteException, UnexpectedMacheteException
 from git_machete.git_operations import (GitContext, LocalBranchShortName,
                                         SyncToRemoteStatus)
 from git_machete.utils import (bold, flat_map, fmt, get_pretty_choices,
@@ -350,39 +349,36 @@ def traverse(
 
             if needs_remote_sync:
                 any_action_suggested = True
-                try:
-                    if s == SyncToRemoteStatus.BEHIND_REMOTE:
-                        assert remote is not None
-                        self._handle_behind_state(branch=current_branch, remote=remote, opt_yes=opt_yes)
-                    elif s == SyncToRemoteStatus.AHEAD_OF_REMOTE:
-                        assert remote is not None
-                        self._handle_ahead_state(
-                            current_branch=current_branch,
-                            remote=remote,
-                            is_called_from_traverse=True,
-                            opt_push_tracked=opt_push_tracked,
-                            opt_yes=opt_yes)
-                    elif s == SyncToRemoteStatus.DIVERGED_FROM_AND_OLDER_THAN_REMOTE:
-                        self._handle_diverged_and_older_state(current_branch, opt_yes=opt_yes)
-                    elif s == SyncToRemoteStatus.DIVERGED_FROM_AND_NEWER_THAN_REMOTE:
-                        assert remote is not None
-                        self._handle_diverged_and_newer_state(
-                            current_branch=current_branch,
-                            remote=remote,
-                            opt_push_tracked=opt_push_tracked,
-                            opt_yes=opt_yes)
-                    elif s == SyncToRemoteStatus.UNTRACKED:
-                        self._handle_untracked_state(
-                            branch=current_branch,
-                            is_called_from_traverse=True,
-                            is_called_from_code_hosting=False,
-                            opt_push_untracked=opt_push_untracked,
-                            opt_push_tracked=opt_push_tracked,
-                            opt_yes=opt_yes)
-                    else:
-                        raise UnexpectedMacheteException(f"Unexpected SyncToRemoteStatus: {s}.")
-                except InteractionStopped:
-                    return
+                if s == SyncToRemoteStatus.BEHIND_REMOTE:
+                    assert remote is not None
+                    self._handle_behind_state(branch=current_branch, remote=remote, opt_yes=opt_yes)
+                elif s == SyncToRemoteStatus.AHEAD_OF_REMOTE:
+                    assert remote is not None
+                    self._handle_ahead_state(
+                        current_branch=current_branch,
+                        remote=remote,
+                        is_called_from_traverse=True,
+                        opt_push_tracked=opt_push_tracked,
+                        opt_yes=opt_yes)
+                elif s == SyncToRemoteStatus.DIVERGED_FROM_AND_OLDER_THAN_REMOTE:
+                    self._handle_diverged_and_older_state(current_branch, opt_yes=opt_yes)
+                elif s == SyncToRemoteStatus.DIVERGED_FROM_AND_NEWER_THAN_REMOTE:
+                    assert remote is not None
+                    self._handle_diverged_and_newer_state(
+                        current_branch=current_branch,
+                        remote=remote,
+                        opt_push_tracked=opt_push_tracked,
+                        opt_yes=opt_yes)
+                elif s == SyncToRemoteStatus.UNTRACKED:
+                    self._handle_untracked_state(
+                        branch=current_branch,
+                        is_called_from_traverse=True,
+                        is_called_from_code_hosting=False,
+                        opt_push_untracked=opt_push_untracked,
+                        opt_push_tracked=opt_push_tracked,
+                        opt_yes=opt_yes)
+                else:
+                    raise UnexpectedMacheteException(f"Unexpected SyncToRemoteStatus: {s}.")
 
             if needs_create_pr:
                 any_action_suggested = True