multi-workspace 3.2.3__tar.gz → 3.2.5__tar.gz

{multi_workspace-3.2.3 → multi_workspace-3.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-workspace
-Version: 3.2.3
+Version: 3.2.5
 Summary: Multi
 Project-URL: Repository, https://github.com/gabemontague/multi
 Project-URL: Issues, https://github.com/gabemontague/multi/issues
@@ -108,12 +108,15 @@ To grant or remove GitHub collaborator access across every GitHub repo in a work
 ```bash
 multi collaborator add octocat --permission maintain --yes
 multi collaborator add --yes
+multi collaborator accept --yes
 multi collaborator remove octocat --yes
 multi collaborator recent-users
 ```
 
 When the workspace root repository has a GitHub `origin`, `multi collaborator` applies the change there too.
 
+The invited collaborator can run `multi collaborator accept --yes` with their own `gh` authentication to accept pending invitations for the workspace repos.
+
 Recent collaborator usernames are saved under `~/.multi`, and `multi collaborator add` can prompt from that list when no username is supplied.
 
 If one repo fails, `multi collaborator` continues through the rest of the workspace and reports the failures at the end.

{multi_workspace-3.2.3 → multi_workspace-3.2.5}/README.md

@@ -81,12 +81,15 @@ To grant or remove GitHub collaborator access across every GitHub repo in a work
 ```bash
 multi collaborator add octocat --permission maintain --yes
 multi collaborator add --yes
+multi collaborator accept --yes
 multi collaborator remove octocat --yes
 multi collaborator recent-users
 ```
 
 When the workspace root repository has a GitHub `origin`, `multi collaborator` applies the change there too.
 
+The invited collaborator can run `multi collaborator accept --yes` with their own `gh` authentication to accept pending invitations for the workspace repos.
+
 Recent collaborator usernames are saved under `~/.multi`, and `multi collaborator add` can prompt from that list when no username is supplied.
 
 If one repo fails, `multi collaborator` continues through the rest of the workspace and reports the failures at the end.

{multi_workspace-3.2.3 → multi_workspace-3.2.5}/multi/_version.py

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

{multi_workspace-3.2.3 → multi_workspace-3.2.5}/multi/collaborator.py

@@ -135,11 +135,17 @@ def _run_gh_api(
     method: str,
     endpoint: str,
     fields: dict[str, str] | None = None,
+    paginate: bool = False,
+    slurp: bool = False,
 ) -> subprocess.CompletedProcess[str]:
     cmd = [gh_path, "api", "--method", method, endpoint]
     if fields:
         for key, value in fields.items():
             cmd.extend(["-f", f"{key}={value}"])
+    if paginate:
+        cmd.append("--paginate")
+    if slurp:
+        cmd.append("--slurp")
 
     try:
         return subprocess.run(
@@ -155,6 +161,57 @@ def _run_gh_api(
         raise click.ClickException(message) from exc
 
 
+def _load_pending_repository_invitations(gh_path: str) -> list[dict[str, object]]:
+    result = _run_gh_api(
+        gh_path,
+        method="GET",
+        endpoint="user/repository_invitations?per_page=100",
+        paginate=True,
+        slurp=True,
+    )
+
+    try:
+        invitations = json.loads(result.stdout or "[]")
+    except json.JSONDecodeError as exc:
+        raise click.ClickException(
+            "GitHub returned invalid repository invitation data."
+        ) from exc
+
+    if not isinstance(invitations, list):
+        raise click.ClickException(
+            "GitHub returned invalid repository invitation data."
+        )
+
+    if all(isinstance(page, list) for page in invitations):
+        return [
+            invitation
+            for page in invitations
+            for invitation in page
+            if isinstance(invitation, dict)
+        ]
+
+    return [invitation for invitation in invitations if isinstance(invitation, dict)]
+
+
+def _get_invitation_id(invitation: dict[str, object]) -> int | None:
+    invitation_id = invitation.get("id")
+    if isinstance(invitation_id, int):
+        return invitation_id
+    return None
+
+
+def _get_invitation_repo_slug(invitation: dict[str, object]) -> str | None:
+    repository = invitation.get("repository")
+    if not isinstance(repository, dict):
+        return None
+
+    full_name = repository.get("full_name")
+    if isinstance(full_name, str) and full_name:
+        return full_name
+
+    return None
+
+
 def _load_workspace_github_repo_slug(paths: Paths) -> str | None:
     try:
         repo = git.Repo(paths.root_dir)
@@ -246,6 +303,70 @@ def _confirm_across_repos(
         raise click.ClickException("Operation cancelled.")
 
 
+def _confirm_accept_invitations(
+    *,
+    invitations: list[tuple[str, int]],
+    yes: bool,
+) -> None:
+    if yes:
+        return
+
+    repo_list = "\n".join(f"- {slug}" for slug, _ in invitations)
+    confirmed = click.confirm(
+        f"Accept repository invitations for these repos?\n{repo_list}",
+        default=False,
+    )
+    if not confirmed:
+        raise click.ClickException("Operation cancelled.")
+
+
+def _accept_collaborator_invitations(*, yes: bool) -> None:
+    paths = Paths(Path.cwd())
+    gh_path = _ensure_gh_available()
+    repo_targets = _load_github_repo_targets(paths)
+    target_slugs = {slug.lower() for _, slug in repo_targets}
+    invitations: list[tuple[str, int]] = []
+    failures: list[tuple[str, str]] = []
+
+    for invitation in _load_pending_repository_invitations(gh_path):
+        slug = _get_invitation_repo_slug(invitation)
+        invitation_id = _get_invitation_id(invitation)
+        if slug is None or invitation_id is None:
+            continue
+        if slug.lower() not in target_slugs:
+            continue
+        invitations.append((slug, invitation_id))
+
+    if not invitations:
+        click.echo("No pending repository invitations found for this workspace.")
+        return
+
+    _confirm_accept_invitations(invitations=invitations, yes=yes)
+
+    for slug, invitation_id in invitations:
+        try:
+            logger.info(f"Accepting repository invitation for {slug}")
+            _run_gh_api(
+                gh_path,
+                method="PATCH",
+                endpoint=f"user/repository_invitations/{invitation_id}",
+            )
+        except click.ClickException as exc:
+            message = exc.message or str(exc)
+            logger.error(
+                f"Failed accepting repository invitation for {slug}: {message}"
+            )
+            failures.append((slug, message))
+
+    if failures:
+        failure_lines = "\n".join(f"- {slug}: {message}" for slug, message in failures)
+        raise click.ClickException(
+            f"Finished accepting repository invitations with failures:\n{failure_lines}"
+        )
+
+    logger.info("✅ Accepted repository invitations for all workspace repos")
+
+
 def _manage_collaborator(
     *,
     action: str,
@@ -335,6 +456,17 @@ def collaborator_add_cmd(username: str | None, permission: str, yes: bool) -> No
     )
 
 
+@click.command(name="accept")
+@click.option(
+    "--yes",
+    is_flag=True,
+    help="Skip the confirmation prompt.",
+)
+def collaborator_accept_cmd(yes: bool) -> None:
+    """Accept pending collaborator invitations for this workspace."""
+    _accept_collaborator_invitations(yes=yes)
+
+
 @click.command(name="remove")
 @click.argument("username")
 @click.option(
@@ -365,5 +497,6 @@ def collaborator_recent_users_cmd() -> None:
 
 
 collaborator_cmd.add_command(common_command_wrapper(collaborator_add_cmd))
+collaborator_cmd.add_command(common_command_wrapper(collaborator_accept_cmd))
 collaborator_cmd.add_command(common_command_wrapper(collaborator_remove_cmd))
 collaborator_cmd.add_command(common_command_wrapper(collaborator_recent_users_cmd))

{multi_workspace-3.2.3 → multi_workspace-3.2.5}/multi/worktree.py

@@ -39,7 +39,12 @@ def _run_git(repo_path: Path, args: list[str]) -> None:
         ) from e
 
 
-def _create_root_worktree(root_dir: Path, destination: Path, branch_name: str) -> None:
+def _create_root_worktree(
+    root_dir: Path,
+    destination: Path,
+    branch_name: str,
+    base_ref: str,
+) -> None:
     exists_locally, exists_remotely = check_branch_existence(root_dir, branch_name)
 
     if exists_locally:
@@ -54,7 +59,7 @@ def _create_root_worktree(root_dir: Path, destination: Path, branch_name: str) -
             f"origin/{branch_name}",
         ]
     else:
-        args = ["worktree", "add", "-b", branch_name, str(destination), "HEAD"]
+        args = ["worktree", "add", "-b", branch_name, str(destination), base_ref]
 
     _run_git(root_dir, args)
     logger.info(f"Created worktree at {destination}")
@@ -164,12 +169,42 @@ def _transfer_configured_paths(source_paths: Paths, destination_paths: Paths) ->
 
 
 def _checkout_subrepos(
-    repos: Iterable[Repository],
+    source_repos: Iterable[Repository],
+    destination_repos: Iterable[Repository],
     branch_name: str,
     allow_create: bool,
+    base_ref: str,
 ) -> None:
-    for repo in repos:
+    source_by_name = {repo.name: repo for repo in source_repos}
+    for repo in destination_repos:
         repo_branch_name = repo.fixed_branch or branch_name
+        if repo.fixed_branch:
+            create_and_switch_branch(
+                repo.path,
+                repo_branch_name,
+                allow_create=allow_create,
+            )
+            continue
+        source_repo = source_by_name.get(repo.name)
+        if (
+            source_repo is not None
+            and base_ref != "HEAD"
+            and not check_branch_existence(repo.path, repo_branch_name)[0]
+        ):
+            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}")
+                continue
+            except GitError as exc:
+                logger.warning(
+                    "⚠️  Base ref %s was not available for %s; creating %s from "
+                    "the current checkout instead. %s",
+                    base_ref,
+                    repo.name,
+                    repo_branch_name,
+                    exc,
+                )
         create_and_switch_branch(
             repo.path,
             repo_branch_name,
@@ -177,8 +212,14 @@ def _checkout_subrepos(
         )
 
 
-def add_worktree(root_dir: Path, name: str, branch_name: str | None = None) -> Path:
-    paths = Paths(root_dir)
+def add_worktree(
+    root_dir: Path,
+    name: str,
+    branch_name: str | None = None,
+    install_set: str | None = None,
+    base_ref: str = "HEAD",
+) -> Path:
+    paths = Paths(root_dir, install_set=install_set)
     if paths.settings.is_monorepo():
         raise click.UsageError(
             "The 'multi worktree add' command is not available in monorepo mode. "
@@ -198,14 +239,16 @@ def add_worktree(root_dir: Path, name: str, branch_name: str | None = None) -> P
             "already exist for all repos, this command will fix the situation."
         )
 
-    _create_root_worktree(paths.root_dir, destination, branch_name)
-    sync(root_dir=destination)
+    _create_root_worktree(paths.root_dir, destination, branch_name, base_ref)
+    sync(root_dir=destination, install_set=install_set)
 
-    destination_paths = Paths(destination)
+    destination_paths = Paths(destination, install_set=install_set)
     _checkout_subrepos(
+        load_repos(paths),
         load_repos(destination_paths),
         branch_name,
         allow_create=all_on_same_branch,
+        base_ref=base_ref,
     )
     _transfer_configured_paths(paths, destination_paths)
     return destination
@@ -223,13 +266,37 @@ def worktree_cmd() -> None:
     "branch_name",
     help="Branch name for the worktree. Defaults to NAME.",
 )
-def worktree_add_cmd(name: str, branch_name: str | None = None) -> None:
+@click.option(
+    "--install-set",
+    "--set",
+    "install_set",
+    metavar="NAME",
+    help="Only sync repositories included in the named install set.",
+)
+@click.option(
+    "--base-ref",
+    default="HEAD",
+    show_default=True,
+    help="Base ref for newly created root and sub-repo branches.",
+)
+def worktree_add_cmd(
+    name: str,
+    branch_name: str | None = None,
+    install_set: str | None = None,
+    base_ref: str = "HEAD",
+) -> None:
     """Create a sibling worktree.
 
     NAME: Directory name for the sibling worktree. Used as the branch name when
     --branch is omitted.
     """
-    add_worktree(Path.cwd(), name=name, branch_name=branch_name)
+    add_worktree(
+        Path.cwd(),
+        name=name,
+        branch_name=branch_name,
+        install_set=install_set,
+        base_ref=base_ref,
+    )
 
 
 worktree_cmd.add_command(common_command_wrapper(worktree_add_cmd))