multi-workspace 3.2.9__tar.gz → 3.2.10__tar.gz

{multi_workspace-3.2.9 → multi_workspace-3.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-workspace
-Version: 3.2.9
+Version: 3.2.10
 Summary: Multi
 Project-URL: Repository, https://github.com/gabemontague/multi
 Project-URL: Issues, https://github.com/gabemontague/multi/issues

{multi_workspace-3.2.9 → multi_workspace-3.2.10}/multi/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.9'
-__version_tuple__ = version_tuple = (3, 2, 9)
+__version__ = version = '3.2.10'
+__version_tuple__ = version_tuple = (3, 2, 10)
 
 __commit_id__ = commit_id = None

{multi_workspace-3.2.9 → multi_workspace-3.2.10}/multi/branch.py

@@ -14,9 +14,10 @@ logger = logging.getLogger(__name__)
 def report_branches(paths: Paths) -> bool:
     """Log the current branch of the root repo and each sub-repo.
 
-    Read-only: works with dirty working trees, mismatched branches, and
-    detached HEADs (for example in worktrees created by `multi worktree add`).
-    Returns True when every repo is on its expected branch.
+    Read-only: works with dirty working trees, mismatched branches, detached
+    HEADs (for example in worktrees created by `multi worktree add`), and
+    sub-repos that have not been synced yet (reported as missing).
+    Returns True when every repo is present and on its expected branch.
     """
     root_branch = describe_head(paths.root_dir)
     logger.info(f"{paths.root_dir.name} (root): {root_branch}")
@@ -27,7 +28,14 @@ def report_branches(paths: Paths) -> bool:
 
     all_match = True
     for repo in load_repos(paths):
-        branch = describe_head(repo.path)
+        try:
+            branch = describe_head(repo.path)
+        except GitError:
+            # Missing or uninitialized sub-repo: report it and keep going so
+            # the rest of the workspace is still listed.
+            all_match = False
+            logger.warning(f"{repo.name}: (missing — run `multi sync`)")
+            continue
         expected_branch = repo.fixed_branch or root_branch
         if branch == expected_branch:
             logger.info(f"{repo.name}: {branch}")
@@ -52,6 +60,7 @@ def branch_cmd() -> None:
     paths = Paths(Path.cwd())
     if not report_branches(paths):
         raise GitError(
-            "Repositories are not all on their expected branches. "
-            "Use `multi set-branch` (with clean working trees) to fix."
+            "Repositories are missing or not on their expected branches. "
+            "Run `multi sync` to clone missing repos, or `multi set-branch` "
+            "(with clean working trees) to fix branch mismatches."
         )

{multi_workspace-3.2.9 → multi_workspace-3.2.10}/multi/git_helpers.py

@@ -28,12 +28,12 @@ def _open_repo_for_branch_lookup(repo_path: Path) -> git.Repo:
     try:
         return git.Repo(repo_path)
     except (InvalidGitRepositoryError, NoSuchPathError) as e:
-        msg = (
-            f"Could not determine current branch for {repo_path}: not a git repository. "
-            "Initialize it with `git init -b main` or run `multi sync` from the workspace root."
-        )
-        logger.error(msg)
-        raise GitError(msg) from e
+        # No logging here: callers (or the CLI error wrapper) report the
+        # error exactly once.
+        raise GitError(
+            f"Could not determine current branch for {repo_path.name}: not a git "
+            "repository. Run `multi sync` from the workspace root."
+        ) from e
 
 
 def get_current_branch(repo_path: Path) -> str: