Replace GitPython with lightweight Git wrapper

pyproject.toml

@@ -10,7 +10,6 @@ authors = [
 requires-python = ">=3.10"
 
 dependencies = [
-  "gitpython>=3.1.52",
   "pyyaml>=6.0.3",
   "httpx[socks]>=0.28.1",
   "packaging>=26.2",

src/composekit/generate.py

@@ -265,9 +265,9 @@ def main(args: argparse.Namespace) -> None:
 
     if args.commit:
         repo = open_repo(reset=False)
-        repo.git.add(".")
-        staged_count = len(repo.index.diff(repo.head.commit))
+        repo.add(".")
+        staged_count = repo.staged_count()
         if staged_count > 0:
-            repo.index.commit(
+            repo.commit(
                 f"chore(composes): update {staged_count} compose file(s)"
             )

src/composekit/sort.py

@@ -9,9 +9,8 @@
 
 try:
     import yaml
-    from git import Repo
 
-    from composekit.utils import iter_container_files, open_repo
+    from composekit.utils import Repository, iter_container_files, open_repo
 except ImportError as err:
     raise RuntimeError(
         "ERROR: Missing required packages. See the README."
@@ -20,7 +19,7 @@
 
 async def process_file(
     path: Path,
-    repo: Repo | None,
+    repo: Repository | None,
     git_lock: asyncio.Lock,
 ) -> None:
     with open(path) as file:
@@ -41,8 +40,8 @@ async def process_file(
                 yaml.dump_all(sorted_containers, file, sort_keys=False)
 
             if repo is not None:
-                repo.index.add(path)
-                repo.index.commit(f"chore({path.stem}): sort keys")
+                repo.add(path)
+                repo.commit(f"chore({path.stem}): sort keys")
 
 
 def main(args: argparse.Namespace) -> None:

src/composekit/update.py

@@ -11,12 +11,16 @@
 try:
     import httpx
     import yaml
-    from git import Repo
     from packaging.version import InvalidVersion, Version
 
     from composekit.container import Container, load_containers
     from composekit.utils import Config as _Config
-    from composekit.utils import iter_container_files, list_tags, open_repo
+    from composekit.utils import (
+        Repository,
+        iter_container_files,
+        list_tags,
+        open_repo,
+    )
 except ImportError as err:
     raise RuntimeError(
         "ERROR: Missing required packages. See the README."
@@ -202,7 +206,7 @@ async def process_file(
     path: Path,
     client: httpx.AsyncClient,
     config: Config,
-    repo: Repo | None,
+    repo: Repository | None,
     git_lock: asyncio.Lock,
 ) -> None:
     with open(path) as file:
@@ -224,8 +228,8 @@ async def process_file(
                 )
 
             if repo is not None:
-                repo.index.add(path)
-                repo.index.commit(
+                repo.add(path)
+                repo.commit(
                     f"chore({path.stem}): update {image} to {newest_version}"
                 )
 

src/composekit/utils/__init__.py

@@ -1,6 +1,12 @@
 from .config import Config
 from .file import iter_container_files
-from .git import open_repo
+from .git import Repository, open_repo
 from .oci_api import list_tags
 
-__all__ = ("Config", "iter_container_files", "list_tags", "open_repo")
+__all__ = (
+    "Config",
+    "Repository",
+    "iter_container_files",
+    "list_tags",
+    "open_repo",
+)

src/composekit/utils/git.py

@@ -1,15 +1,46 @@
-try:
-    from git import Repo
-except ImportError as err:
-    raise RuntimeError(
-        "ERROR: Missing required packages. See the README."
-    ) from err
+import shutil
+import subprocess
+from dataclasses import dataclass
+from pathlib import Path
 
+_git = shutil.which("git")
+if _git is None:
+    raise RuntimeError("ERROR: Git is required but was not found in PATH.")
 
-def open_repo(reset: bool = True) -> Repo:
-    repo = Repo(".", search_parent_directories=True)
+GIT: str = _git
+
+
+@dataclass(frozen=True)
+class Repository:
+    root: Path
+
+    def _run(self, *args: str) -> str:
+        result = subprocess.check_output(  # noqa: S603
+            [GIT, "-C", self.root, *args], text=True
+        )
+        return result
+
+    def add(self, path: str | Path) -> None:
+        self._run("add", "--", str(path))
+
+    def commit(self, message: str) -> None:
+        self._run("commit", "-m", message)
+
+    def reset(self) -> None:
+        self._run("reset", "--hard", "HEAD")
+
+    def staged_count(self) -> int:
+        output = self._run("diff", "--cached", "--name-only", "-z")
+        return len([path for path in output.split("\0") if path])
+
+
+def open_repo(reset: bool = True) -> Repository:
+    result = subprocess.check_output(  # noqa: S603
+        [GIT, "rev-parse", "--show-toplevel"],
+        text=True,
+    )
+    repo = Repository(Path(result.strip()))
     if reset:
-        # Discard any changes
-        repo.index.reset(working_tree=True)
+        repo.reset()
 
     return repo