multi-workspace 3.2.16__tar.gz → 3.2.18__tar.gz

{multi_workspace-3.2.16 → multi_workspace-3.2.18}/PKG-INFO

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

{multi_workspace-3.2.16 → multi_workspace-3.2.18}/multi/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.16'
-__version_tuple__ = version_tuple = (3, 2, 16)
+__version__ = version = '3.2.18'
+__version_tuple__ = version_tuple = (3, 2, 18)
 
 __commit_id__ = commit_id = None

{multi_workspace-3.2.16 → multi_workspace-3.2.18}/multi/app_api.py

@@ -126,6 +126,21 @@ def _subrepo_payloads(repo_path: Path) -> list[SubRepoPayload] | None:
     ]
 
 
+def get_project_subrepos(repo_path: str | Path) -> list[SubRepoPayload]:
+    """Public multi.json sub-repo listing for library consumers ([] when not a workspace)."""
+    return _subrepo_payloads(Path(repo_path)) or []
+
+
+def list_project_repo_names(repo_path: str | Path) -> list[str]:
+    """Names of repos declared in repo_path's own multi.json ([] when absent/invalid).
+
+    Only reads a multi.json directly inside repo_path — never searches parent
+    directories — so callers can safely probe arbitrary directories.
+    """
+    subrepos = _load_subrepos(Path(repo_path))
+    return [repo.name for repo in subrepos] if subrepos else []
+
+
 def _describe_git_head(repo_path: Path) -> str | None:
     if not repo_path.exists():
         return None
@@ -212,7 +227,13 @@ def _get_git_status_internal(repo_path: Path, ignore_untracked: bool) -> RepoSta
     if ignore_untracked:
         status_args.append("--untracked-files=no")
 
-    porcelain = _run_git(status_args, cwd=repo_path, timeout=10).stdout
+    try:
+        porcelain = _run_git(status_args, cwd=repo_path, timeout=10).stdout
+    except (OSError, subprocess.SubprocessError):
+        # A directory with a .git entry that git itself rejects (corrupt or
+        # locked repo) is neither clean nor dirty; report it as unknown
+        # instead of surfacing an exception to status callers.
+        return "unknown"
     if porcelain.strip():
         return "dirty"
 

{multi_workspace-3.2.16 → multi_workspace-3.2.18}/multi/worktree.py

@@ -11,7 +11,6 @@ from multi.cli_helpers import common_command_wrapper
 from multi.errors import GitError
 from multi.git_helpers import (
     check_all_on_same_branch,
-    check_all_repos_are_clean,
     check_branch_existence,
     expected_branch_for_repo,
     repo_uses_fixed_branch,
@@ -93,14 +92,23 @@ def _resolve_relative_path(entry: str) -> Path:
     return relative_path
 
 
+def _worktrees_dir(root_dir: Path) -> Path:
+    """Return the sibling directory that holds all worktrees for a workspace.
+
+    For a workspace at ``<parent>/my-workspace``, worktrees live under
+    ``<parent>/my-workspace-worktrees/``.
+    """
+    return root_dir.parent / f"{root_dir.name}-worktrees"
+
+
 def _destination_for_name(root_dir: Path, name: str) -> Path:
     name_path = Path(name)
     if name_path.is_absolute() or len(name_path.parts) != 1 or name in {"", ".", ".."}:
         raise GitError(
-            "Worktree NAME must be a single sibling directory name. "
+            "Worktree NAME must be a single directory name. "
             "Use --branch for branch names that contain path separators."
         )
-    return root_dir.parent / name
+    return _worktrees_dir(root_dir) / name
 
 
 def _repo_for_path(paths: Paths, relative_path: Path) -> tuple[Path, Path]:
@@ -197,7 +205,9 @@ def _checkout_subrepos(
             try:
                 _run_git(repo.path, ["fetch", str(source_repo.path), base_ref])
                 _run_git(repo.path, ["checkout", "-b", repo_branch_name, "FETCH_HEAD"])
-                logger.info(f"✅ Switched to branch '{repo_branch_name}' in {repo.path}")
+                logger.info(
+                    f"✅ Switched to branch '{repo_branch_name}' in {repo.path}"
+                )
                 continue
             except GitError as exc:
                 logger.warning(
@@ -234,7 +244,8 @@ def add_worktree(
     if destination.exists():
         raise GitError(f"Worktree destination already exists: {destination}")
 
-    check_all_repos_are_clean(paths=paths, raise_error=True)
+    # No clean-working-tree requirement: worktree creation branches from a
+    # commit (HEAD or --base-ref) and never mutates the source working trees.
     all_on_same_branch = check_all_on_same_branch(paths=paths, raise_error=False)
     if not all_on_same_branch:
         logger.warning(
@@ -242,8 +253,12 @@ def add_worktree(
             "already exist for all repos, this command will fix the situation."
         )
 
+    destination.parent.mkdir(parents=True, exist_ok=True)
     _create_root_worktree(paths.root_dir, destination, branch_name, base_ref)
-    sync(root_dir=destination, install_set=install_set)
+    # Skip branch matching during the initial sync: the worktree branch is
+    # created in each sub-repo right after, so warning about it being missing
+    # here would only be confusing.
+    sync(root_dir=destination, ensure_on_same_branch=False, install_set=install_set)
 
     destination_paths = Paths(destination, install_set=install_set)
     _checkout_subrepos(
@@ -259,7 +274,11 @@ def add_worktree(
 
 @click.group(name="worktree")
 def worktree_cmd() -> None:
-    """Manage sibling git worktrees for a multi workspace."""
+    """Manage git worktrees for a multi workspace.
+
+    Worktrees live in a sibling directory named after the workspace with
+    '-worktrees' appended (e.g. my-workspace-worktrees/).
+    """
 
 
 @click.command(name="add")
@@ -288,9 +307,12 @@ def worktree_add_cmd(
     install_set: str | None = None,
     base_ref: str = "HEAD",
 ) -> None:
-    """Create a sibling worktree.
+    """Create an isolated worktree of the whole workspace.
+
+    The worktree is created at <parent>/<workspace-dirname>-worktrees/NAME
+    (the -worktrees directory is created if missing).
 
-    NAME: Directory name for the sibling worktree. Used as the branch name when
+    NAME: Directory name for the worktree. Used as the branch name when
     --branch is omitted.
     """
     add_worktree(