Skip to content

Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.

feat(git): open repositories through a Repo that closes without gc.collect (#4212)

Raghav Chamadiya25bfd42ee180
diff --git a/packages/cli/src/repowise/cli/_helpers/git.py b/packages/cli/src/repowise/cli/_helpers/git.py
index 553961ab3..3af920fa1 100644
--- a/packages/cli/src/repowise/cli/_helpers/git.py
+++ b/packages/cli/src/repowise/cli/_helpers/git.py
@@ -49,9 +49,9 @@ def head_commit_ts(repo_path: Path) -> float | None:
the same units the gate reads it back in.
"""
try:
- import git
+ from repowise.core.git_repo import Repo
- repo = git.Repo(repo_path, search_parent_directories=True)
+ repo = Repo(repo_path, search_parent_directories=True)
try:
return float(repo.head.commit.committed_date)
finally:
diff --git a/packages/cli/src/repowise/cli/commands/doctor_cmd/_checks/core.py b/packages/cli/src/repowise/cli/commands/doctor_cmd/_checks/core.py
index 53274c855..2bf31250e 100644
--- a/packages/cli/src/repowise/cli/commands/doctor_cmd/_checks/core.py
+++ b/packages/cli/src/repowise/cli/commands/doctor_cmd/_checks/core.py
@@ -117,9 +117,9 @@ def _events_config_check(repo_path: _DoctorPath) -> DoctorCheck | None:
def _git_check(repo_path: _DoctorPath) -> DoctorCheck:
try:
- import git as gitpython
+ from repowise.core.git_repo import Repo
- gitpython.Repo(repo_path, search_parent_directories=True)
+ Repo(repo_path, search_parent_directories=True).close()
return _check("Git repository", True, str(repo_path))
except Exception:
return _check("Git repository", False, "Not a git repo")
diff --git a/packages/core/src/repowise/core/changes/store.py b/packages/core/src/repowise/core/changes/store.py
index 5399a664f..c17100dea 100644
--- a/packages/core/src/repowise/core/changes/store.py
+++ b/packages/core/src/repowise/core/changes/store.py
@@ -88,12 +88,11 @@ def change_row(
def _read_changes(
repo_path: Path, limit: int, since: str | None, taken: dict[str, str]
) -> list[ReconstructedChange] | None:
- import git as gitpython
-
from repowise.core.forges import detect_forge
+ from repowise.core.git_repo import Repo
from repowise.core.ingestion.git_indexer.indexer import GitIndexer
- repo = gitpython.Repo(repo_path, search_parent_directories=True)
+ repo = Repo(repo_path, search_parent_directories=True)
try:
# A partial clone would fetch blobs for --numstat: never from here.
if GitIndexer._partial_clone_filter(repo) is not None:
diff --git a/packages/core/src/repowise/core/git_repo.py b/packages/core/src/repowise/core/git_repo.py
new file mode 100644
index 000000000..0f77306e8
--- /dev/null
+++ b/packages/core/src/repowise/core/git_repo.py
@@ -0,0 +1,24 @@
+"""GitPython's ``Repo`` without the Windows ``gc.collect()`` on close."""
+
+from __future__ import annotations
+
+import contextlib
+
+import git
+import gitdb.util
+
+
+class Repo(git.Repo):
+ """A ``git.Repo`` whose ``close()`` (and so ``__del__``) skips garbage collection.
+
+ GitPython's close runs two full ``gc.collect()`` passes on Windows so a
+ caller can delete the checkout. Nothing here deletes one, and with a parsed
+ graph on the heap each pass costs about a second.
+ """
+
+ def close(self) -> None:
+ if self.git:
+ with contextlib.suppress(Exception):
+ self.git.clear_cache()
+ with contextlib.suppress(Exception):
+ gitdb.util.mman.collect()
diff --git a/packages/core/src/repowise/core/ingestion/change_detector.py b/packages/core/src/repowise/core/ingestion/change_detector.py
index b6732b587..0b10497ab 100644
--- a/packages/core/src/repowise/core/ingestion/change_detector.py
+++ b/packages/core/src/repowise/core/ingestion/change_detector.py
@@ -502,9 +502,9 @@ class ChangeDetector:
if self._repo is not None:
return self._repo
try:
- import git as gitpython
+ from repowise.core.git_repo import Repo
- self._repo = gitpython.Repo(self.repo_path, search_parent_directories=True)
+ self._repo = Repo(self.repo_path, search_parent_directories=True)
return self._repo
except Exception as exc:
log.info(
@@ -599,9 +599,9 @@ def has_working_tree_changes(repo_path: Path) -> bool:
False on a non-git directory or a repo with no commits yet.
"""
try:
- import git
+ from repowise.core.git_repo import Repo
- repo = git.Repo(repo_path, search_parent_directories=True)
+ repo = Repo(repo_path, search_parent_directories=True)
except Exception:
return False
try:
diff --git a/packages/core/src/repowise/core/ingestion/git_indexer/indexer.py b/packages/core/src/repowise/core/ingestion/git_indexer/indexer.py
index b29af7e06..46afc0fd8 100644
--- a/packages/core/src/repowise/core/ingestion/git_indexer/indexer.py
+++ b/packages/core/src/repowise/core/ingestion/git_indexer/indexer.py
@@ -130,22 +130,6 @@ def _available_memory_bytes() -> int | None:
return None
-def _release_repo(repo: Any) -> None:
- """Release *repo*'s git subprocesses and pack maps, like ``Repo.close()``.
-
- ``Repo.close()`` also runs two full ``gc.collect()`` passes on Windows so a
- caller can delete the checkout. Nothing here deletes it, and by the end of
- the git stage the heap holds the whole parsed graph, so each pass costs
- seconds: one close per worker thread put ~18 s on PowerToys' critical path.
- """
- import gitdb.util
-
- with contextlib.suppress(Exception):
- repo.git.clear_cache()
- with contextlib.suppress(Exception):
- gitdb.util.mman.collect()
-
-
def git_worker_count(
pending: int,
*,
@@ -457,7 +441,7 @@ class GitIndexer:
indexable_files, code_results, sample, self.commit_limit, workers
),
)
- _release_repo(repo)
+ repo.close()
logger.info(
"Git indexing complete",
@@ -695,7 +679,7 @@ class GitIndexer:
if owner_task is not None:
owner_task.remove_done_callback(_cleanup_executor)
_cleanup_executor()
- _release_repo(repo)
+ repo.close()
return results
def _wants_idle_refresh(
@@ -1109,7 +1093,7 @@ class GitIndexer:
with timed(timings, "git.repo_totals"):
totals = capture_repo_totals(repo)
finally:
- _release_repo(repo)
+ repo.close()
return fix_walk, prior_defects, totals
def _build_fix_events(self, walk: FixWalk) -> tuple[list[dict], bool]:
@@ -1262,9 +1246,9 @@ class GitIndexer:
def get_thread_repo() -> Any:
repo = getattr(tls, "repo", None)
if repo is None:
- import git as gitpython
+ from repowise.core.git_repo import Repo
- repo = gitpython.Repo(self.repo_path, search_parent_directories=True)
+ repo = Repo(self.repo_path, search_parent_directories=True)
tls.repo = repo
with lock:
created.append(repo)
@@ -1274,15 +1258,15 @@ class GitIndexer:
with lock:
repos, created[:] = list(created), []
for repo in repos:
- _release_repo(repo)
+ repo.close()
return get_thread_repo, close_all
def _get_repo(self) -> Any | None:
try:
- import git as gitpython
+ from repowise.core.git_repo import Repo
- return gitpython.Repo(self.repo_path, search_parent_directories=True)
+ return Repo(self.repo_path, search_parent_directories=True)
except Exception as exc:
logger.warning(
"Git unavailable or not a repository",
diff --git a/packages/core/src/repowise/core/policy/interim_evidence.py b/packages/core/src/repowise/core/policy/interim_evidence.py
index 09d4ddd71..67e72a53b 100644
--- a/packages/core/src/repowise/core/policy/interim_evidence.py
+++ b/packages/core/src/repowise/core/policy/interim_evidence.py
@@ -174,9 +174,9 @@ def _labelled_commits(root: Path, base: str, head: str) -> list[dict[str, Any]]
if len(records) > MAX_COMMITS:
return None
try:
- import git
+ from repowise.core.git_repo import Repo
- repo = git.Repo(root)
+ repo = Repo(root)
except Exception:
repo = None
classifier = classifier_from_repo_config(root)
diff --git a/tests/unit/core/test_git_repo.py b/tests/unit/core/test_git_repo.py
new file mode 100644
index 000000000..b3f91a152
--- /dev/null
+++ b/tests/unit/core/test_git_repo.py
@@ -0,0 +1,38 @@
+"""``repowise.core.git_repo.Repo`` releases git without forcing garbage collection."""
+
+from __future__ import annotations
+
+import gc
+
+import git
+import pytest
+
+from repowise.core.git_repo import Repo
+
+
+def repo_path(tmp_path):
+ repo = git.Repo.init(tmp_path)
+ (tmp_path / "a.txt").write_text("a\n", encoding="utf-8")
+ repo.index.add(["a.txt"])
+ repo.index.commit("init")
+ repo.close()
+ return tmp_path
+
+
+def test_close_and_del_never_collect(repo_path, monkeypatch) -> None:
+ calls: list[int] = []
+ monkeypatch.setattr(gc, "collect", lambda *a, **k: calls.append(1) or 0)
+ repo = Repo(repo_path)
+ repo.git.version()
+ repo.close()
+ repo.__del__()
+ assert calls == []
+
+
+def test_close_stops_persistent_git_processes(repo_path) -> None:
+ repo = Repo(repo_path)
+ repo.git.get_object_header("HEAD")
+ assert repo.git.cat_file_header is not None
+ repo.close()
+ assert repo.git.cat_file_header is None