labnotes 0.2.4__tar.gz → 0.2.5__tar.gz

{labnotes-0.2.4 → labnotes-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.2.4
+Version: 0.2.5
 Summary: Browse experiment designs, notes, and run data from a folder.
 Project-URL: Repository, https://github.com/thekevinscott/labnotes
 Author-email: Kevin Scott <me@thekevinscott.com>

{labnotes-0.2.4 → labnotes-0.2.5}/src/labnotes/runner/project_snapshot.py

@@ -11,6 +11,8 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from types import FrameType
 
+from labnotes.runner.untracked_diff import untracked_diff
+
 
 @dataclass
 class ProjectSnapshot:
@@ -37,7 +39,7 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
         sha = git(root, "rev-parse", "HEAD").decode("ascii").strip()
         repo_root = Path(git(root, "rev-parse", "--show-toplevel").decode().strip())
         project_prefix = root.resolve().relative_to(repo_root.resolve())
-        diff = git(repo_root, "diff", "HEAD")
+        diff = git(repo_root, "diff", "HEAD") + untracked_diff(repo_root)
     except (OSError, subprocess.SubprocessError):
         logging.warning("Project has no readable Git HEAD; running from the live tree")
         yield ProjectSnapshot(root)

labnotes-0.2.5/src/labnotes/runner/untracked_diff.py

@@ -0,0 +1,39 @@
+import os
+import subprocess
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+
+def untracked_diff(repo_root: Path) -> bytes:
+    """Patch adding every untracked, non-ignored file, as the snapshot copies them."""
+    listing = subprocess.check_output(
+        ["git", "ls-files", "-o", "--exclude-standard", "-z"],
+        cwd=repo_root,
+        stderr=subprocess.DEVNULL,
+    )
+    # A trailing slash marks an untracked nested repository, which git cannot add.
+    paths = [path for path in listing.split(b"\0") if path and not path.endswith(b"/")]
+    if not paths:
+        return b""
+    with TemporaryDirectory(prefix="labnotes-index-") as directory:
+        # A throwaway index keeps the user's real index untouched.
+        env = {**os.environ, "GIT_INDEX_FILE": str(Path(directory) / "index")}
+        subprocess.run(
+            ["git", "add", "--intent-to-add", "--pathspec-from-file=-"]
+            + ["--pathspec-file-nul"],
+            cwd=repo_root,
+            env=env,
+            input=b"\0".join(paths),
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=True,
+        )
+        # Files over 1 MiB show as binary so stray data cannot bloat every patch.
+        return subprocess.run(
+            ["git", "-c", "core.bigFileThreshold=1m", "diff"],
+            cwd=repo_root,
+            env=env,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            check=True,
+        ).stdout