fluidattacks_core_git 12.0.0__tar.gz → 12.1.0__tar.gz

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/.gitignore

@@ -1,3 +1,5 @@
+dist-*/
+/.cargo-cache
 target/
 .direnv/
 .venv/

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fluidattacks_core_git
-Version: 12.0.0
+Version: 12.1.0
 Summary: Fluid Attacks Core Git Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/fluidattacks_core/git/download_repo.py

@@ -46,13 +46,7 @@ def remove_symlinks_in_directory(directory: str) -> None:
                 Path(file_path).unlink(missing_ok=True)
 
 
-def _reset_repo_sync(repo_path: str) -> bool:
-    try:
-        Path.cwd()
-    except OSError:
-        LOGGER.exception("Failed to get the working directory: %s", repo_path)
-        os.chdir(repo_path)
-
+def _mark_safe_directory(repo_path: str) -> None:
     try:
         Git().execute(
             [
@@ -67,6 +61,16 @@ def _reset_repo_sync(repo_path: str) -> bool:
     except GitError:
         LOGGER.exception("Failed to add safe directory %s", repo_path)
 
+
+def _reset_repo_sync(repo_path: str) -> bool:
+    try:
+        Path.cwd()
+    except OSError:
+        LOGGER.exception("Failed to get the working directory: %s", repo_path)
+        os.chdir(repo_path)
+
+    _mark_safe_directory(repo_path)
+
     try:
         repo = Repo(repo_path)
         repo.git.reset("--hard", "HEAD")
@@ -114,7 +118,16 @@ async def download_repo_from_s3(
     git_ignore: list[str] | None = None,
     *,
     download_buffer_size: int = DEFAULT_DOWNLOAD_BUFFER_SIZE,
+    checkout: bool = True,
 ) -> bool:
+    """Download the repository archived in s3 at `download_url`.
+
+    The archive holds only `.git`, so the working tree is restored with a
+    `git reset --hard`. Pass `checkout=False` to keep just the history: peak
+    disk stays at the size of the archive plus `.git`, which is what a
+    consumer that walks commits needs. `git_ignore` prunes working-tree files
+    and has no effect on a history-only download.
+    """
     await anyio.Path(destination_path.parent).mkdir(parents=True, exist_ok=True)
     with tempfile.TemporaryDirectory(prefix="fluidattacks_", ignore_cleanup_errors=True) as tmpdir:
         tmp_path = Path(tmpdir)
@@ -139,6 +152,13 @@ async def download_repo_from_s3(
             )
             return False
 
+    if not checkout:
+        # Nothing was extracted but `.git`, so there is no working tree to
+        # reset or prune. Callers still read the repository through git, which
+        # refuses a directory it considers foreign.
+        await anyio.to_thread.run_sync(_mark_safe_directory, str(destination_path))
+        return True
+
     if not await reset_repo(str(destination_path)):
         shutil.rmtree(destination_path, ignore_errors=True)
         return False

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks_core_git"
-version = "12.0.0"
+version = "12.1.0"
 description = "Fluid Attacks Core Git Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }
@@ -32,6 +32,7 @@ dev = [
   "deptry>=0.23.1",
   "import-linter==2.11",
   "mypy==1.19.1",
+  "pytest-asyncio>=1.1.0",
   "pytest-cov>=7.0.0",
   "pytest==9.0.3",
   "ruff==0.15.0",

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/tests/test_git.py

@@ -1,3 +1,5 @@
+import shutil
+import tarfile
 import tempfile
 from pathlib import Path
 
@@ -6,7 +8,7 @@ from git.repo import Repo
 from pathspec import PathSpec
 from pathspec import util as pathspec_util
 
-from fluidattacks_core.git import rebase
+from fluidattacks_core.git import download_repo, download_repo_from_s3, rebase
 from fluidattacks_core.git.delete_files import delete_out_of_scope_files
 from fluidattacks_core.git.download_repo import remove_symlinks_in_directory
 
@@ -171,3 +173,76 @@ def test_rebase_preserves_ascii_renamed_path() -> None:
         assert result.path == renamed
         assert result.line == 1
         assert result.rev == rev_b
+
+
+def _archive_git_dir(repo_path: Path, archive_path: Path, name: str) -> None:
+    # Mimics `_create_tar_archive`: the archive uploaded to s3 carries `.git`
+    # and no tracked file.
+    with tarfile.open(archive_path, "w:gz") as tar_handler:
+        tar_handler.add(str(repo_path / ".git"), arcname=f"{name}/.git", recursive=True)
+
+
+def _committed_repo(path: Path, tracked: str) -> str:
+    repo = _init_repo(path)
+    (path / tracked).write_text("content\n", encoding="utf-8")
+    repo.index.add([tracked])
+    revision = repo.index.commit("add tracked file").hexsha
+    repo.close()
+    return revision
+
+
+@pytest.fixture
+def s3_archive(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> str:
+    # `git config --global` writes to $HOME, so keep it inside the test.
+    monkeypatch.setenv("HOME", str(tmp_path / "home"))
+    (tmp_path / "home").mkdir()
+
+    source = tmp_path / "source"
+    source.mkdir()
+    revision = _committed_repo(source, "tracked.txt")
+    archive = tmp_path / "repo.tar.gz"
+    _archive_git_dir(source, archive, "source")
+    shutil.rmtree(source)
+
+    async def _fake_download(
+        *,
+        url: str,  # noqa: ARG001
+        destination_path: str,
+        download_buffer_size: int,  # noqa: ARG001
+    ) -> bool:
+        shutil.copyfile(archive, destination_path)
+        return True
+
+    monkeypatch.setattr(download_repo, "download_file", _fake_download)
+    return revision
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("s3_archive")
+async def test_download_repo_from_s3_restores_working_tree(tmp_path: Path) -> None:
+    destination = tmp_path / "groups" / "group" / "root"
+
+    assert await download_repo_from_s3("https://s3/repo.tar.gz", destination)
+
+    assert (destination / "tracked.txt").is_file()
+
+
+@pytest.mark.asyncio
+async def test_download_repo_from_s3_without_checkout_keeps_only_history(
+    tmp_path: Path,
+    s3_archive: str,
+) -> None:
+    destination = tmp_path / "groups" / "group" / "root"
+
+    assert await download_repo_from_s3("https://s3/repo.tar.gz", destination, checkout=False)
+
+    # The point of the flag: the history is complete and readable, and not one
+    # byte of the working tree was written.
+    repo = Repo(destination)
+    assert repo.head.commit.hexsha == s3_archive
+    repo.close()
+    assert not (destination / "tracked.txt").exists()
+    assert [entry.name for entry in destination.iterdir()] == [".git"]

{fluidattacks_core_git-12.0.0 → fluidattacks_core_git-12.1.0}/uv.lock

@@ -432,7 +432,7 @@ wheels = [
 
 [[package]]
 name = "fluidattacks-core-git"
-version = "12.0.0"
+version = "12.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "aiofiles" },
@@ -454,6 +454,7 @@ dev = [
     { name = "import-linter" },
     { name = "mypy" },
     { name = "pytest" },
+    { name = "pytest-asyncio" },
     { name = "pytest-cov" },
     { name = "ruff" },
     { name = "types-aiofiles" },
@@ -480,6 +481,7 @@ dev = [
     { name = "import-linter", specifier = "==2.11" },
     { name = "mypy", specifier = "==1.19.1" },
     { name = "pytest", specifier = "==9.0.3" },
+    { name = "pytest-asyncio", specifier = ">=1.1.0" },
     { name = "pytest-cov", specifier = ">=7.0.0" },
     { name = "ruff", specifier = "==0.15.0" },
     { name = "types-aiofiles", specifier = "==24.1.0.20240626" },
@@ -1331,6 +1333,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
 ]
 
+[[package]]
+name = "pytest-asyncio"
+version = "1.4.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pytest" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/43/7c/d36d04db312ecf4298932ef77e6e4a9e8ad017906e24e34f0b0c361a2473/pytest_asyncio-1.4.0.tar.gz", hash = "sha256:c6c0d2259945122819f171a32ecea2c349ead889ee28176caaf492143424be42", size = 58514, upload-time = "2026-05-26T09:56:04.083Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" },
+]
+
 [[package]]
 name = "pytest-cov"
 version = "7.1.0"