bmsdna-devtools 0.48.0__tar.gz → 0.49.0__tar.gz

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/.gitignore

@@ -219,3 +219,5 @@ __marimo__/
 
 # CodeGraph local index
 .codegraph/
+.worktrees/
+.claude/worktrees/

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bmsdna-devtools
-Version: 0.48.0
+Version: 0.49.0
 Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
 Requires-Python: >=3.14
 Requires-Dist: azure-identity>=1.19.0
@@ -645,6 +645,8 @@ Creates `.worktrees/<name>` branched from `--base`. It first fetches `origin/<ba
 a local base that is ahead of or has diverged from the remote is kept as is. Then it initializes submodules
 (unless `--no-submodules`), and copies an env file into the new worktree as
 `.env` (auto-detects `.local_env` then `.env` if `--env-file` isn't given).
+It also adds `.worktrees/` and `.claude/worktrees/` to the repo root's `.gitignore` if Git
+doesn't already ignore them, and reminds you to commit the change.
 
 ## `bdt find-repo`
 

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/README.md

@@ -627,6 +627,8 @@ Creates `.worktrees/<name>` branched from `--base`. It first fetches `origin/<ba
 a local base that is ahead of or has diverged from the remote is kept as is. Then it initializes submodules
 (unless `--no-submodules`), and copies an env file into the new worktree as
 `.env` (auto-detects `.local_env` then `.env` if `--env-file` isn't given).
+It also adds `.worktrees/` and `.claude/worktrees/` to the repo root's `.gitignore` if Git
+doesn't already ignore them, and reminds you to commit the change.
 
 ## `bdt find-repo`
 

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/bmsdna/devtools/worktree.py

@@ -96,6 +96,26 @@ def _start_point(root: Path, base: str) -> tuple[str, bool]:
     return base, False
 
 
+def _ensure_worktree_gitignore(root: Path) -> None:
+    missing = [
+        entry
+        for entry in (".worktrees/", ".claude/worktrees/")
+        if not _git_ok(["check-ignore", "-q", entry], root)
+    ]
+    if not missing:
+        return
+    gitignore = root / ".gitignore"
+    if gitignore.is_symlink():
+        print(f"warning: {gitignore} is a symlink; not touching it. Add {' and '.join(missing)} to your ignore rules yourself.", file=sys.stderr)
+        return
+    content = gitignore.read_text() if gitignore.exists() else ""
+    with gitignore.open("a") as f:
+        if content and not content.endswith("\n"):
+            f.write("\n")
+        f.write("\n".join(missing) + "\n")
+    print(f"Updated {gitignore} to ignore worktree directories; please commit it.")
+
+
 def create(
     name: str,
     base: str = "dev",
@@ -112,6 +132,7 @@ def create(
     start, remote_start = _start_point(root, base)
     # --no-track: the new branch must not push to / compare against origin/<base>
     _run(["git", "worktree", "add", *(["--no-track"] if remote_start else []), str(path), "-b", name, start], cwd=root)
+    _ensure_worktree_gitignore(root)
 
     if submodules and (root / ".gitmodules").exists():
         _run(["git", "submodule", "update", "--init"], cwd=path)

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/pyproject.toml

@@ -10,7 +10,7 @@ packages = ["bmsdna"]
 
 [project]
 name = "bmsdna-devtools"
-version = "0.48.0"
+version = "0.49.0"
 description = "Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects"
 readme = "README.md"
 requires-python = ">=3.14"  # pgdevkit>=0.7.1 requires 3.14; was >=3.11 before adding it as a dependency

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/tests/test_worktree_clean.py

@@ -48,6 +48,67 @@ def add_submodule(repo, sub_repo, sub_path="vendor/sub"):
 # --- create (`bdt worktree`) -------------------------------------------------
 
 
+def test_create_creates_gitignore_when_absent(tmp_path, capsys) -> None:
+    repo = init_repo(tmp_path / "repo")
+
+    create("my-feature", base="main", submodules=False, root=repo)
+
+    assert (repo / ".gitignore").read_text() == ".worktrees/\n.claude/worktrees/\n"
+    for entry in (".worktrees/", ".claude/worktrees/"):
+        assert (
+            _git(["check-ignore", "-q", entry], cwd=repo, check=False).returncode == 0
+        )
+    out = capsys.readouterr().out
+    assert f"Updated {repo / '.gitignore'}" in out
+    assert "please commit it" in out
+
+
+@pytest.mark.parametrize(
+    "existing, missing",
+    [(".worktrees/", ".claude/worktrees/"), (".claude/worktrees/", ".worktrees/")],
+)
+@pytest.mark.parametrize("ending", ["", "\n"])
+def test_create_appends_only_missing_gitignore_entry(
+    tmp_path, existing, missing, ending
+) -> None:
+    repo = init_repo(tmp_path / "repo")
+    (repo / ".gitignore").write_text(existing + ending)
+
+    create("my-feature", base="main", submodules=False, root=repo)
+
+    assert (repo / ".gitignore").read_text() == f"{existing}\n{missing}\n"
+
+
+def test_create_gitignore_is_idempotent(tmp_path, capsys) -> None:
+    repo = init_repo(tmp_path / "repo")
+    create("first-feature", base="main", submodules=False, root=repo)
+    gitignore = repo / ".gitignore"
+    content = gitignore.read_bytes()
+    modified = gitignore.stat().st_mtime_ns
+    capsys.readouterr()
+
+    create("second-feature", base="main", submodules=False, root=repo)
+
+    assert gitignore.read_bytes() == content
+    assert gitignore.stat().st_mtime_ns == modified
+    assert "Updated" not in capsys.readouterr().out
+
+
+@pytest.mark.parametrize(
+    "patterns", ["/.worktrees/\n/.claude/worktrees/\n", ".worktrees\n.claude/\n"]
+)
+def test_create_does_not_duplicate_equivalent_gitignore_patterns(
+    tmp_path, capsys, patterns
+) -> None:
+    repo = init_repo(tmp_path / "repo")
+    (repo / ".gitignore").write_text(patterns)
+
+    create("my-feature", base="main", submodules=False, root=repo)
+
+    assert (repo / ".gitignore").read_text() == patterns
+    assert "Updated" not in capsys.readouterr().out
+
+
 def test_create_hints_plain_bdt_pull_when_base_is_not_main_or_master(tmp_path, capsys) -> None:
     repo = init_repo(tmp_path / "repo")
     _git(["branch", "dev"], cwd=repo)
@@ -782,3 +843,15 @@ def test_clean_current_worktree_removes_a_worktree_containing_a_submodule(tmp_pa
     clean_current_worktree(path, confirm=True, keep_db=True, pg_host="localhost", pg_port=54322, pg_user="tester")
 
     assert not path.exists()
+
+
+def test_create_does_not_follow_gitignore_symlink(tmp_path, capsys) -> None:
+    repo = init_repo(tmp_path / "repo")
+    target = tmp_path / "shared-ignore"
+    target.write_text("*.log\n")
+    (repo / ".gitignore").symlink_to(target)
+
+    create("my-feature", base="main", submodules=False, root=repo)
+
+    assert target.read_text() == "*.log\n"
+    assert "symlink" in capsys.readouterr().err

{bmsdna_devtools-0.48.0 → bmsdna_devtools-0.49.0}/uv.lock

@@ -51,7 +51,7 @@ wheels = [
 
 [[package]]
 name = "bmsdna-devtools"
-version = "0.48.0"
+version = "0.49.0"
 source = { editable = "." }
 dependencies = [
     { name = "azure-identity" },