labnotes 0.2.1__tar.gz → 0.2.3__tar.gz

{labnotes-0.2.1 → labnotes-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.2.1
+Version: 0.2.3
 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.1 → labnotes-0.2.3}/src/labnotes/runner/project_snapshot.py

@@ -35,19 +35,21 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
 
     try:
         sha = git(root, "rev-parse", "HEAD").decode("ascii").strip()
-        diff = git(root, "diff", "HEAD")
+        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")
     except (OSError, subprocess.SubprocessError):
         logging.warning("Project has no readable Git HEAD; running from the live tree")
         yield ProjectSnapshot(root)
         return
     files = filter(
-        None, git(root, "ls-files", "-co", "--exclude-standard", "-z").split(b"\0")
+        None, git(repo_root, "ls-files", "-co", "--exclude-standard", "-z").split(b"\0")
     )
     ignored = filter(
         None,
-        git(root, "ls-files", "-oi", "--exclude-standard", "--directory", "-z").split(
-            b"\0"
-        ),
+        git(
+            repo_root, "ls-files", "-oi", "--exclude-standard", "--directory", "-z"
+        ).split(b"\0"),
     )
     with TemporaryDirectory(prefix="labnotes-") as directory:
         snapshot = Path(directory)
@@ -73,14 +75,14 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
                     "--quiet",
                     "--shared",
                     "--no-checkout",
-                    str(root),
+                    str(repo_root),
                     str(snapshot),
                 ],
                 check=True,
             )
             for raw in files:
                 relative = Path(raw.decode())
-                source = root / relative
+                source = repo_root / relative
                 if not source.exists() and not source.is_symlink():
                     continue
                 target = snapshot / relative
@@ -89,6 +91,33 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
                     target.symlink_to(
                         os.readlink(source), target_is_directory=source.is_dir()
                     )
+                elif source.is_dir() and (source / ".git").is_file():
+                    subprocess.run(
+                        [
+                            "git",
+                            "clone",
+                            "--quiet",
+                            "--shared",
+                            "--no-checkout",
+                            str(source),
+                            str(target),
+                        ],
+                        check=True,
+                    )
+                    shutil.copytree(
+                        source,
+                        target,
+                        symlinks=True,
+                        dirs_exist_ok=True,
+                        ignore=shutil.ignore_patterns(".git"),
+                    )
+                    submodule_sha = (
+                        git(source, "rev-parse", "HEAD").decode("ascii").strip()
+                    )
+                    subprocess.run(
+                        ["git", "-C", str(target), "reset", "--quiet", submodule_sha],
+                        check=True,
+                    )
                 elif source.is_dir():
                     shutil.copytree(source, target, symlinks=True)
                 else:
@@ -100,7 +129,7 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
                     continue
                 if any((snapshot / parent).is_symlink() for parent in relative.parents):
                     continue
-                source = root / relative
+                source = repo_root / relative
                 if source.is_dir() and (source / "pyvenv.cfg").exists():
                     skipped.add(relative)
                     continue
@@ -115,4 +144,4 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
         finally:
             for number, handler in previous.items():
                 signal.signal(number, handler)
-        yield ProjectSnapshot(snapshot, sha, diff)
+        yield ProjectSnapshot(snapshot / project_prefix, sha, diff)