Move temp_repo fixture to vcs/git

Author: mikhainin

tests/conftest.py

@@ -12,7 +12,6 @@
 from typing import Any
 from typing import Iterator
 
-import dulwich.repo
 import httpretty
 import keyring
 import pytest
@@ -45,7 +44,6 @@
 from tests.helpers import mock_clone
 from tests.helpers import switch_working_directory
 from tests.helpers import with_working_directory
-from tests.vcs.git.git_fixture import TempRepoFixture
 
 
 if TYPE_CHECKING:
@@ -584,49 +582,3 @@ def project_context(project: str | Path, in_place: bool = False) -> Iterator[Pat
             yield path
 
     return project_context
-
-
-@pytest.fixture()
-def temp_repo(tmp_path: Path) -> TempRepoFixture:
-    """Temporary repository with 2 commits"""
-    repo = dulwich.repo.Repo.init(str(tmp_path))
-
-    # init commit
-    (tmp_path / "foo").write_text("foo", encoding="utf-8")
-    repo.stage(["foo"])
-
-    init_commit = repo.do_commit(
-        committer=b"User <user@example.com>",
-        author=b"User <user@example.com>",
-        message=b"init",
-        no_verify=True,
-    )
-
-    # one commit which is not "head"
-    (tmp_path / "bar").write_text("bar", encoding="utf-8")
-    repo.stage(["bar"])
-    middle_commit = repo.do_commit(
-        committer=b"User <user@example.com>",
-        author=b"User <user@example.com>",
-        message=b"extra",
-        no_verify=True,
-    )
-
-    # extra commit
-    (tmp_path / "third").write_text("third file", encoding="utf-8")
-    repo.stage(["third"])
-
-    head_commit = repo.do_commit(
-        committer=b"User <user@example.com>",
-        author=b"User <user@example.com>",
-        message=b"extra",
-        no_verify=True,
-    )
-
-    return TempRepoFixture(
-        path=tmp_path,
-        repo=repo,
-        init_commit=init_commit.decode(),
-        middle_commit=middle_commit.decode(),
-        head_commit=head_commit.decode(),
-    )

tests/vcs/git/conftest.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import dulwich.repo
+import pytest
+
+from tests.vcs.git.git_fixture import TempRepoFixture
+
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+@pytest.fixture()
+def temp_repo(tmp_path: Path) -> TempRepoFixture:
+    """Temporary repository with 2 commits"""
+    repo = dulwich.repo.Repo.init(str(tmp_path))
+
+    # init commit
+    (tmp_path / "foo").write_text("foo", encoding="utf-8")
+    repo.stage(["foo"])
+
+    init_commit = repo.do_commit(
+        committer=b"User <user@example.com>",
+        author=b"User <user@example.com>",
+        message=b"init",
+        no_verify=True,
+    )
+
+    # one commit which is not "head"
+    (tmp_path / "bar").write_text("bar", encoding="utf-8")
+    repo.stage(["bar"])
+    middle_commit = repo.do_commit(
+        committer=b"User <user@example.com>",
+        author=b"User <user@example.com>",
+        message=b"extra",
+        no_verify=True,
+    )
+
+    # extra commit
+    (tmp_path / "third").write_text("third file", encoding="utf-8")
+    repo.stage(["third"])
+
+    head_commit = repo.do_commit(
+        committer=b"User <user@example.com>",
+        author=b"User <user@example.com>",
+        message=b"extra",
+        no_verify=True,
+    )
+
+    return TempRepoFixture(
+        path=tmp_path,
+        repo=repo,
+        init_commit=init_commit.decode(),
+        middle_commit=middle_commit.decode(),
+        head_commit=head_commit.decode(),
+    )