assertion-cli 0.5.9__tar.gz → 0.5.10__tar.gz

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.9
+Version: 0.5.10
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/assertion_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.9
+Version: 0.5.10
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/git.py

@@ -49,11 +49,14 @@ def get_head_sha(repo_root: Path) -> str:
 def get_upstream_ref(repo_root: Path) -> str | None:
     """Return the upstream tracking ref (e.g. ``origin/main``).
 
-    Tries HEAD's configured upstream first (``HEAD@{upstream}``). When the
-    branch has no upstream but the branch name itself resolves on the default
-    remote, falls back to ``origin/<branch>``. Returns ``None`` when neither
-    is available (detached HEAD, no remote, branch not pushed).
+    Tries HEAD's configured upstream first, then falls through increasingly
+    general heuristics to find a remote ref to compute a merge-base against:
+    same-named remote branch, closest remote ancestor (via
+    ``git branch -r --merged HEAD`` + ``git merge-base``), then well-known
+    default branch names. Returns ``None`` when none are available.
     """
+
+    # 1. Configured upstream (git branch -u).
     try:
         return run_git_command(
             repo_root, ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"]
@@ -61,6 +64,7 @@ def get_upstream_ref(repo_root: Path) -> str | None:
     except RuntimeError:
         pass
 
+    # 2. Same branch name on remote (has been pushed at least once).
     head_branch = get_head_branch(repo_root)
     if head_branch is not None:
         fallback = f"origin/{head_branch}"
@@ -71,6 +75,50 @@ def get_upstream_ref(repo_root: Path) -> str | None:
         else:
             return fallback
 
+    # 3. Closest remote ancestor — handles branches based on other pushed
+    #    branches (e.g. my-feature on my-feature-base). Uses --merged HEAD
+    #    so only remote branches in HEAD's ancestry are considered; a branch
+    #    whose tip moved forward after we branched off is correctly excluded.
+    try:
+        merged = run_git_command(
+            repo_root,
+            [
+                "branch", "-r", "--merged", "HEAD",
+                "--format=%(refname:short)",
+            ],
+        )
+        ancestors = [r for r in merged.splitlines() if r]
+        if ancestors:
+            return run_git_command(
+                repo_root, ["merge-base", "HEAD", *ancestors]
+            )
+    except RuntimeError:
+        pass
+
+    # 4. Remote's default branch (symbolic ref, usually origin/main).
+    try:
+        run_git_command(repo_root, ["rev-parse", "--verify", "origin/HEAD"])
+    except RuntimeError:
+        pass
+    else:
+        return "origin/HEAD"
+
+    # 5. Conventional default branch name.
+    try:
+        run_git_command(repo_root, ["rev-parse", "--verify", "origin/main"])
+    except RuntimeError:
+        pass
+    else:
+        return "origin/main"
+
+    # 6. Legacy default branch name.
+    try:
+        run_git_command(repo_root, ["rev-parse", "--verify", "origin/master"])
+    except RuntimeError:
+        pass
+    else:
+        return "origin/master"
+
     return None
 
 

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/main.py

@@ -19,6 +19,7 @@ from git import (
     get_merge_base,
     get_uncommitted_diff,
     get_upstream_ref,
+    run_git_command,
 )
 from link import load_link, save_link
 from models import CheckpointResponse, SessionStatus, render_stack_list
@@ -265,9 +266,19 @@ app.add_typer(session_app, name="session")
 def _resolve_diff_base(repo_root: Path) -> str:
     """Compute the merge-base with the upstream tracking branch.
 
+    Fetches from origin first so the merge-base SHA is guaranteed to exist
+    on the remote when the backend checks it out — stale remote tracking
+    refs (from a force-pushed or rebased branch) would otherwise produce a
+    merge-base that's no longer reachable from any remote ref.
+
     Errors out when no upstream can be resolved (detached HEAD, no tracking
     branch, branch not pushed to remote).
     """
+    try:
+        run_git_command(repo_root, ["fetch", "--no-tags", "origin"])
+    except RuntimeError:
+        pass  # non-fatal: offline or unavailable; proceed with stale refs
+
     upstream = get_upstream_ref(repo_root)
     if upstream is None:
         exit_with_error(

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assertion-cli"
-version = "0.5.9"
+version = "0.5.10"
 description = "CLI for the Assertion API"
 readme = "README.md"
 requires-python = ">=3.13"

{assertion_cli-0.5.9 → assertion_cli-0.5.10}/tests/test_git.py

@@ -180,6 +180,187 @@ def test_get_upstream_ref_detached_head(tmp_path: Path) -> None:
     assert ref is None
 
 
+def test_get_upstream_ref_fallback_to_origin_head(tmp_path: Path) -> None:
+    """HEAD on an orphan commit (no shared history with remote refs)
+    returns origin/HEAD."""
+    subprocess.run(["git", "init"], cwd=tmp_path, capture_output=True, check=True)
+    _make_commit(tmp_path)
+    subprocess.run(
+        ["git", "remote", "add", "origin", "http://example.com/repo.git"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "symbolic-ref", "refs/remotes/origin/HEAD", "refs/remotes/origin/somebranch"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "update-ref", "refs/remotes/origin/somebranch", "HEAD"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    # Create an orphan commit so HEAD has no shared history with the
+    # remote refs — this makes step 3 (--merged HEAD) produce nothing.
+    subprocess.run(
+        ["git", "checkout", "--orphan", "orphan-branch"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    (tmp_path / "orphan.txt").write_text("orphan\n")
+    subprocess.run(
+        ["git", "add", "orphan.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "orphan"],
+        cwd=tmp_path, capture_output=True, check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+    ref = get_upstream_ref(tmp_path)
+    assert ref == "origin/HEAD"
+
+
+def test_get_upstream_ref_fallback_to_origin_main(tmp_path: Path) -> None:
+    """HEAD on an orphan commit, no origin/HEAD, but origin/main exists."""
+    subprocess.run(["git", "init"], cwd=tmp_path, capture_output=True, check=True)
+    _make_commit(tmp_path)
+    subprocess.run(
+        ["git", "remote", "add", "origin", "http://example.com/repo.git"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "update-ref", "refs/remotes/origin/main", "HEAD"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "checkout", "--orphan", "orphan-branch"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    (tmp_path / "orphan.txt").write_text("orphan\n")
+    subprocess.run(
+        ["git", "add", "orphan.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "orphan"],
+        cwd=tmp_path, capture_output=True, check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+    ref = get_upstream_ref(tmp_path)
+    assert ref == "origin/main"
+
+
+def test_get_upstream_ref_fallback_to_origin_master(tmp_path: Path) -> None:
+    """HEAD on an orphan commit, no origin/HEAD/main, origin/master exists."""
+    subprocess.run(["git", "init"], cwd=tmp_path, capture_output=True, check=True)
+    _make_commit(tmp_path)
+    subprocess.run(
+        ["git", "remote", "add", "origin", "http://example.com/repo.git"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "update-ref", "refs/remotes/origin/master", "HEAD"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    subprocess.run(
+        ["git", "checkout", "--orphan", "orphan-branch"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    (tmp_path / "orphan.txt").write_text("orphan\n")
+    subprocess.run(
+        ["git", "add", "orphan.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "orphan"],
+        cwd=tmp_path, capture_output=True, check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+    ref = get_upstream_ref(tmp_path)
+    assert ref == "origin/master"
+
+
+def test_get_upstream_ref_fallback_to_merged_ancestors(tmp_path: Path) -> None:
+    """Branch based on a pushed feature branch finds the closest remote
+    ancestor via --merged HEAD + merge-base."""
+    _init_repo_with_commit(tmp_path)
+    base_sha = run_git_command(tmp_path, ["rev-parse", "HEAD"])
+    subprocess.run(
+        ["git", "remote", "add", "origin", "http://example.com/repo.git"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+
+    # Simulate origin/main at the initial commit.
+    subprocess.run(
+        ["git", "update-ref", "refs/remotes/origin/main", base_sha],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+
+    # Simulate a pushed feature branch (origin/my-feature-base) with a
+    # commit on top of main.
+    (tmp_path / "base.txt").write_text("base\n")
+    subprocess.run(
+        ["git", "add", "base.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "base work"],
+        cwd=tmp_path, capture_output=True, check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+    feature_base_sha = run_git_command(tmp_path, ["rev-parse", "HEAD"])
+    subprocess.run(
+        ["git", "update-ref", "refs/remotes/origin/my-feature-base", feature_base_sha],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+
+    # Create a new local branch on top of my-feature-base (simulates a
+    # branch-off that hasn't been pushed). Use a branch name that doesn't
+    # collide with any remote ref so step 2 is skipped.
+    subprocess.run(
+        ["git", "checkout", "-b", "my-feature"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    (tmp_path / "new.txt").write_text("new\n")
+    subprocess.run(
+        ["git", "add", "new.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "new work"],
+        cwd=tmp_path, capture_output=True, check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+
+    ref = get_upstream_ref(tmp_path)
+    assert ref is not None
+    # ref was returned by `git merge-base HEAD ...`, it should be the
+    # SHA of the feature base, not a named ref.
+    assert ref == feature_base_sha
+
+
+def test_get_upstream_ref_no_fallback(tmp_path: Path) -> None:
+    """No upstream, no origin/HEAD, no known default branches returns None."""
+    subprocess.run(["git", "init"], cwd=tmp_path, capture_output=True, check=True)
+    _make_commit(tmp_path)
+    subprocess.run(
+        ["git", "remote", "add", "origin", "http://example.com/repo.git"],
+        cwd=tmp_path, capture_output=True, check=True,
+    )
+    ref = get_upstream_ref(tmp_path)
+    assert ref is None
+
+
+def _make_commit(tmp_path: Path) -> None:
+    """Helper: make an initial commit in a bare init."""
+    subprocess.run(
+        ["git", "commit", "--allow-empty", "-m", "init"],
+        cwd=tmp_path,
+        capture_output=True,
+        check=True,
+        env={
+            "GIT_AUTHOR_NAME": "T",
+            "GIT_AUTHOR_EMAIL": "t@t",
+            "GIT_COMMITTER_NAME": "T",
+            "GIT_COMMITTER_EMAIL": "t@t",
+            "HOME": str(tmp_path),
+            "PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin",
+        },
+    )
+
+
 # --- get_merge_base ---