gitgrip 2.0.0a2__tar.gz → 2.0.0a4__tar.gz

{gitgrip-2.0.0a2 → gitgrip-2.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitgrip
-Version: 2.0.0a2
+Version: 2.0.0a4
 Summary: Workspace layer for multi-repo work: workspaces, isolated lanes, and one grouped review per slice
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -19,13 +19,22 @@ Requires-Dist: ruff>=0.4; extra == "dev"
 
 ## Install
 
+```bash
+uv tool install --pre gitgrip    # the PyPI package is "gitgrip"; the command is "gr2"
+gr2 --version
+```
+
+Without uv, a venv and pip do the same:
+
 ```bash
 python3 -m venv ~/gr2-venv && source ~/gr2-venv/bin/activate
-pip install --pre gitgrip        # the PyPI package is "gitgrip"; the command is "gr2"
+pip install --pre gitgrip
 gr2 --version
 ```
 
-`--pre` is required while 2.x is an alpha — without it pip installs 1.5.1, which is gr1. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
+`--pre` is required while every gr2 release is an alpha: 1.5.0 and 1.5.1 were pre-alpha builds and are yanked, so without `--pre` there is nothing to install.
+
+Already installed 1.5.0 or 1.5.1? The install commands above leave it in place, because an installed version already satisfies them. Upgrade explicitly: `uv tool upgrade --prerelease allow gitgrip`, or `pip install --pre -U gitgrip`. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
 
 The Rust `gr` (gr1, 1.x) installs with `brew install synapt-dev/tap/gitgrip` or `cargo install gitgrip`. The two do not collide; you can have both installed.
 

{gitgrip-2.0.0a2 → gitgrip-2.0.0a4}/README.md

@@ -4,13 +4,22 @@
 
 ## Install
 
+```bash
+uv tool install --pre gitgrip    # the PyPI package is "gitgrip"; the command is "gr2"
+gr2 --version
+```
+
+Without uv, a venv and pip do the same:
+
 ```bash
 python3 -m venv ~/gr2-venv && source ~/gr2-venv/bin/activate
-pip install --pre gitgrip        # the PyPI package is "gitgrip"; the command is "gr2"
+pip install --pre gitgrip
 gr2 --version
 ```
 
-`--pre` is required while 2.x is an alpha — without it pip installs 1.5.1, which is gr1. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
+`--pre` is required while every gr2 release is an alpha: 1.5.0 and 1.5.1 were pre-alpha builds and are yanked, so without `--pre` there is nothing to install.
+
+Already installed 1.5.0 or 1.5.1? The install commands above leave it in place, because an installed version already satisfies them. Upgrade explicitly: `uv tool upgrade --prerelease allow gitgrip`, or `pip install --pre -U gitgrip`. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
 
 The Rust `gr` (gr1, 1.x) installs with `brew install synapt-dev/tap/gitgrip` or `cargo install gitgrip`. The two do not collide; you can have both installed.
 

{gitgrip-2.0.0a2 → gitgrip-2.0.0a4}/gitgrip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitgrip
-Version: 2.0.0a2
+Version: 2.0.0a4
 Summary: Workspace layer for multi-repo work: workspaces, isolated lanes, and one grouped review per slice
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -19,13 +19,22 @@ Requires-Dist: ruff>=0.4; extra == "dev"
 
 ## Install
 
+```bash
+uv tool install --pre gitgrip    # the PyPI package is "gitgrip"; the command is "gr2"
+gr2 --version
+```
+
+Without uv, a venv and pip do the same:
+
 ```bash
 python3 -m venv ~/gr2-venv && source ~/gr2-venv/bin/activate
-pip install --pre gitgrip        # the PyPI package is "gitgrip"; the command is "gr2"
+pip install --pre gitgrip
 gr2 --version
 ```
 
-`--pre` is required while 2.x is an alpha — without it pip installs 1.5.1, which is gr1. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
+`--pre` is required while every gr2 release is an alpha: 1.5.0 and 1.5.1 were pre-alpha builds and are yanked, so without `--pre` there is nothing to install.
+
+Already installed 1.5.0 or 1.5.1? The install commands above leave it in place, because an installed version already satisfies them. Upgrade explicitly: `uv tool upgrade --prerelease allow gitgrip`, or `pip install --pre -U gitgrip`. To run unreleased development code instead, install from a checkout: `pip install -e gr2/` from the repository root.
 
 The Rust `gr` (gr1, 1.x) installs with `brew install synapt-dev/tap/gitgrip` or `cargo install gitgrip`. The two do not collide; you can have both installed.
 

{gitgrip-2.0.0a2 → gitgrip-2.0.0a4}/gitgrip.egg-info/SOURCES.txt

@@ -55,12 +55,14 @@ python_cli/channel_bridge.py
 python_cli/clone_exec.py
 python_cli/commit.py
 python_cli/config.py
+python_cli/consent.py
 python_cli/env_exec.py
 python_cli/events.py
 python_cli/execops.py
 python_cli/failures.py
 python_cli/file_exec.py
 python_cli/git_review.py
+python_cli/gitinclude.py
 python_cli/gitops.py
 python_cli/grip.py
 python_cli/grip_cli.py
@@ -84,6 +86,7 @@ python_cli/spec_apply.py
 python_cli/staging_cleanup.py
 python_cli/syncops.py
 python_cli/target.py
+python_cli/workspace_guidance.py
 python_cli/workspace_snapshot.py
 tests/test_add.py
 tests/test_agent_manifest_overlay_source.py
@@ -91,6 +94,8 @@ tests/test_app_event_outcomes.py
 tests/test_apply_convergence.py
 tests/test_branch.py
 tests/test_channel_bridge.py
+tests/test_cli_adapter_error_boundary.py
+tests/test_cli_shape_witnesses.py
 tests/test_clone_materialization.py
 tests/test_commit.py
 tests/test_config_base_path_guard.py
@@ -107,8 +112,11 @@ tests/test_exec_apostrophe_and_oserror.py
 tests/test_exec_single_string_and_materialize_plan.py
 tests/test_execops.py
 tests/test_failure_event_outcome.py
+tests/test_first_five_minutes.py
 tests/test_foreground_launch_runtime.py
 tests/test_git_review.py
+tests/test_gitinclude_compiler.py
+tests/test_gr1_first_run_guidance.py
 tests/test_gr2_packaging.py
 tests/test_gr2_review_receipt.py
 tests/test_grip_cli.py
@@ -117,8 +125,10 @@ tests/test_grip_object_model.py
 tests/test_grip_snapshot.py
 tests/test_hook_events.py
 tests/test_hook_hardening.py
+tests/test_hooks_consent.py
 tests/test_jsonl_store.py
 tests/test_lane_create_fork_base_cli.py
+tests/test_lane_create_refuses_own_branch.py
 tests/test_lane_lease_show_json.py
 tests/test_lane_lifecycle_safety.py
 tests/test_lane_repo_paths_and_all_skipped.py
@@ -132,6 +142,7 @@ tests/test_merge_evidence.py
 tests/test_merge_parent_verification.py
 tests/test_migration.py
 tests/test_migration_overlay_compatibility.py
+tests/test_migration_unadopted_notice.py
 tests/test_no_bare_python_cli_imports.py
 tests/test_null_current_lane_refusal.py
 tests/test_open_gr_enter.py
@@ -191,9 +202,11 @@ tests/test_rmtree_or_refuse.py
 tests/test_single_repo_cwd_refusal.py
 tests/test_snapshot_id_prefix_resolution.py
 tests/test_spec_apply_event_outcomes.py
+tests/test_spec_declaration_ref_pin.py
 tests/test_sprint21_sync_platform.py
 tests/test_staging_cleanup.py
 tests/test_store_verb_rename.py
+tests/test_submodule_member_predicate.py
 tests/test_sync_event_outcomes.py
 tests/test_sync_fast_forward.py
 tests/test_sync_fetch.py
@@ -214,4 +227,5 @@ tests/test_workspace_edit_lease_cap.py
 tests/test_workspace_identity_boundary.py
 tests/test_workspace_init_from_topology.py
 tests/test_workspace_init_local_repos.py
+tests/test_workspace_root_defaults.py
 tests/test_workspace_snapshot.py

{gitgrip-2.0.0a2 → gitgrip-2.0.0a4}/prototypes/lane_workspace_prototype.py

@@ -923,6 +923,97 @@ def _validate_bound_worktree(bind_path: Path, workspace_root: Path) -> tuple[str
     return head, branch
 
 
+#: How long the origin may take to report its default branch before the answer is
+#: "cannot tell". Generous for a symref read, and short enough that an origin which
+#: accepts and never replies cannot block `lane create` with no output. Without it,
+#: an offline laptop or a blackholed origin hangs the verb where it used to create a
+#: lane without any network call at all.
+_LS_REMOTE_TIMEOUT_SECONDS = 5.0
+
+
+def _origin_default_branch(repo_path: Path, url: str | None = None) -> str | None:
+    """The repo's integration branch, or None when it cannot be determined.
+
+    A clone records it as `origin/HEAD`. That symref is ABSENT in a clone made
+    before the remote had any refs — which is the normal state of a repo cloned
+    empty and pushed later, and it is exactly the state in which a lane created on
+    the default branch looks harmless. So when the local record is missing, ask the
+    origin itself (`ls-remote --symref`), which is the same remote the lane is about
+    to clone from anyway. A remote that cannot be reached gives None: "cannot tell"
+    is never allowed to become a refusal. Unreachable includes UNANSWERED — the call
+    is bounded, and an expiry is None on the same channel as any other git failure
+    rather than an exception the caller has to remember to catch separately.
+    """
+    proc = gitops.git(repo_path, "rev-parse", "--abbrev-ref", "origin/HEAD")
+    if proc.returncode == 0:
+        ref = proc.stdout.strip()
+        if ref.startswith("origin/"):
+            return ref.split("/", 1)[1]
+    if not url:
+        return None
+    remote = gitops.git(
+        repo_path, "ls-remote", "--symref", url, "HEAD", timeout=_LS_REMOTE_TIMEOUT_SECONDS
+    )
+    if remote.returncode != 0:
+        # A git that never returned is the same answer as a git that refused:
+        # "cannot tell". The bound above is what makes that reachable at all — an
+        # origin that accepts and says nothing used to block the verb outright.
+        return None
+    for line in remote.stdout.splitlines():
+        if line.startswith("ref:") and line.rstrip().endswith("HEAD"):
+            ref = line.split()[1]
+            # Strip the PREFIX, never split on every slash: a default branch whose
+            # name contains one (`release/1.x`) came back as its last segment, so the
+            # guard compared the requested branch against a string the origin never
+            # reported and the no-isolation lane was created in silence.
+            if not ref.startswith("refs/heads/"):
+                return None
+            return ref.removeprefix("refs/heads/")
+    return None
+
+
+def _lane_branch_refusal(workspace_root: Path, spec: dict, repo: str, branch: str) -> str | None:
+    """The one sentence that refuses a lane branch with no isolation, or None.
+
+    A lane is the isolation primitive. A lane whose branch IS the repository's own
+    branch has no isolation at all: work committed there and pushed with `gr2 push`
+    lands on the branch the lane was supposed to be forked from, and the first
+    refusal arrived at `pr create` — after the remote had already been written
+    (measured on the released 2.0.0a2: `lane create --branch main`, push exit 0
+    "Pushed main", then `pr create` exit 1 "head branch main is the same as base
+    branch main"). Nothing refused at the point the choice was made.
+
+    The comparison is against what is CHECKED OUT here and what the origin says its
+    default is. A repo with no local checkout, or one whose origin cannot be
+    reached, is skipped rather than refused: this guard may not invent a conflict it
+    cannot see.
+    """
+    entry = next((row for row in spec.get("repos", []) if row.get("name") == repo), None)
+    if entry is None:
+        return None
+    rel = entry.get("path")
+    if not rel:
+        return None
+    checkout = workspace_root / str(rel)
+    if not gitops.is_git_repo(checkout):
+        return None
+    matched: str | None = None
+    if branch == gitops.current_branch(checkout):
+        matched = f"the branch checked out at {rel}"
+    else:
+        default = _origin_default_branch(checkout, str(entry.get("url") or "") or None)
+        if default and branch == default:
+            matched = f"the repo's integration branch ({default})"
+    if matched is None:
+        return None
+    return (
+        f"lane branch '{branch}' for repo '{repo}' is {matched}: a lane forked from the branch it will "
+        f"land on has no isolation, and a push would go straight to '{branch}'. Pass a lane branch that is "
+        f"neither the repo's checked-out nor its integration branch (e.g. feat/<name>), or use --bind to "
+        f"label an existing worktree."
+    )
+
+
 def create_lane(args: argparse.Namespace) -> int:
     workspace_root = args.workspace_root.resolve()
     validate_lane_path_component(args.owner_unit, "owner_unit")
@@ -963,6 +1054,14 @@ def create_lane(args: argparse.Namespace) -> int:
         branch_map = {repos[0]: branch}
     else:
         branch_map = parse_branch_arg(args.branch, repos)
+        # A materialized lane's branch may not be the repo's own branch: the lane
+        # would have no isolation and its push would land on the integration
+        # branch. Refused HERE, where the choice is made, rather than at the first
+        # `pr create` after the remote had been written.
+        for _repo in repos:
+            refusal = _lane_branch_refusal(workspace_root, spec, _repo, branch_map[_repo])
+            if refusal:
+                raise SystemExit(refusal)
 
     # Fork base: record what the caller supplies, do not derive.
     # Each entry names a repo IN the lane and carries a 40-hex integration-branch tip.