Move interactive shell invocation to a RepoSandbox method

Author: smkent

cookie_python/manage/repo.py

@@ -62,6 +62,10 @@ def run(
         kwargs.setdefault("cwd", self.clone_path)
         return subprocess.run(*popenargs, check=check, **kwargs)
 
+    def shell(self) -> None:
+        print('Run "exit 1" to abort')
+        self.run([os.environ.get("SHELL", "/bin/bash")])
+
     def commit_changes(self, message: str) -> None:
         self.run(["git", "add", "--", "."])
         self.run(
@@ -92,8 +96,7 @@ def lint_test(self) -> None:
         except subprocess.CalledProcessError as e:
             print(e)
             print("Resolve errors and exit shell to continue")
-            print('Run "exit 1" to abort')
-            self.run([os.environ.get("SHELL", "/bin/bash")])
+            self.shell()
 
     def open_pr(self, message: str) -> None:
         if self.dry_run:

cookie_python/manage/update.py

@@ -49,8 +49,7 @@ def update_cruft(repo: RepoSandbox) -> Optional[str]:
             if try_count == 0:
                 print(f">>> Conflicts found: {rej_files}")
                 print("Resolve conflicts and exit shell to continue")
-                print('Run "exit 1" to abort')
-                repo.run([os.environ.get("SHELL", "/bin/bash")])
+                repo.shell()
                 continue
             raise Exception(f"Unresolved conflicts: {rej_files}")