refactor message formatting when there is GitCommandError

orchestra/__init__.py

@@ -1,6 +1,8 @@
 from enum import IntEnum
 import sys
 
+from git import GitCommandError
+
 
 class ErrorCodes(IntEnum):
     CONFIG_ERR = 1
@@ -29,3 +31,7 @@ def format_exc(exc: Exception, notes: str = "") -> str:
     if trailer:
         err += f"\n\n[bold]{trailer}"
     return err
+
+
+def format_git_cmd_err(exc: GitCommandError) -> str:
+    return f"Git command: {exc.command!r} failed with {exc.status=}\n{exc.stderr}"

orchestra/publish.py

@@ -8,7 +8,7 @@
 from rich.console import Console
 from rich.prompt import Prompt
 
-from orchestra import ErrorCodes
+from orchestra import ErrorCodes, format_git_cmd_err
 from orchestra.config import CONF
 from orchestra.release import remote_name
 
@@ -22,8 +22,7 @@ def git_error_handler(res: PushInfoList, err: ErrorCodes, msg: str):
         res.raise_if_error()
     except GitCommandError as exc:
         console.print(f"pushing {msg} failed!")
-        console.print(f"Git command: {exc.command!r} failed with {exc.status=}")
-        console.print(exc.stderr)
+        console.print(format_git_cmd_err(exc))
         err.exit()
     else:
         console.print(f"pushed {msg}")