2024-12-27T23:28:11Z

Author: wrmsr

omdev/git/subtrees.py

@@ -15,7 +15,7 @@ class GitSubtreeCloner:
 
     # _: dc.KW_ONLY
 
-    repo_subtrees: ta.Sequence[str]
+    repo_subtrees: ta.Optional[ta.Sequence[str]] = None
 
     branch: ta.Optional[str] = None
     rev: ta.Optional[str] = None
@@ -61,7 +61,7 @@ def build_commands(self) -> ta.Iterator[Command]:
                 'sparse-checkout',
                 'set',
                 '--no-cone',
-                *self.repo_subtrees,
+                *(self.repo_subtrees or []),
             ),
             cwd=rd,
         )
@@ -84,7 +84,7 @@ def git_clone_subtree(
         repo_dir: str,
         branch: ta.Optional[str] = None,
         rev: ta.Optional[str] = None,
-        repo_subtrees: ta.Sequence[str],
+        repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
 ) -> None:
     for cmd in GitSubtreeCloner(
         base_dir=base_dir,

omdev/git/tests/test_subtree.py

@@ -0,0 +1,29 @@
+import tempfile
+
+from ..subtrees import git_clone_subtree
+
+
+def test_subtree():
+    td = tempfile.mkdtemp()
+    print(td)
+
+    git_clone_subtree(
+        base_dir=td,
+        repo_url='https://github.com/wrmsr/flaskthing',
+        repo_dir='flaskthing',
+        rev='e9de238fc8cb73f7e0cc245139c0a45b33294fe3',
+        repo_subtrees=[],
+    )
+
+    #
+
+    td = tempfile.mkdtemp()
+    print(td)
+
+    git_clone_subtree(
+        base_dir=td,
+        repo_url='https://github.com/wrmsr/flaskthing',
+        repo_dir='flaskthing',
+        rev='e9de238fc8cb73f7e0cc245139c0a45b33294fe3',
+        repo_subtrees=['README.md'],
+    )

ominfra/manage/deploy/git.py

@@ -139,7 +139,7 @@ def get_repo_dir(
 
     #
 
-    async def shallow_clone_subtrees(
+    async def shallow_clone(
             self,
             spec: DeployGitSpec,
             home: DeployHome,
@@ -159,7 +159,7 @@ async def shallow_clone_subtrees(
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,
                     rev=spec.rev,
-                    repo_subtrees=check.not_none(spec.subtrees),
+                    repo_subtrees=spec.subtrees,
             ).build_commands():
                 await asyncio_subprocesses.check_call(
                     *cmd.cmd,
@@ -183,8 +183,8 @@ async def checkout(
             home: DeployHome,
             dst_dir: str,
     ) -> None:
-        if spec.shallow and spec.subtrees:
-            await self.shallow_clone_subtrees(
+        if spec.shallow:
+            await self.shallow_clone(
                 spec,
                 home,
                 dst_dir,

ominfra/manage/deploy/specs.py

@@ -52,6 +52,7 @@ class DeployGitSpec:
     rev: DeployRev
 
     subtrees: ta.Optional[ta.Sequence[str]] = None
+
     shallow: bool = False
 
     def __post_init__(self) -> None:

ominfra/scripts/manage.py

@@ -8339,7 +8339,7 @@ class GitSubtreeCloner:
 
     # _: dc.KW_ONLY
 
-    repo_subtrees: ta.Sequence[str]
+    repo_subtrees: ta.Optional[ta.Sequence[str]] = None
 
     branch: ta.Optional[str] = None
     rev: ta.Optional[str] = None
@@ -8385,7 +8385,7 @@ def build_commands(self) -> ta.Iterator[Command]:
                 'sparse-checkout',
                 'set',
                 '--no-cone',
-                *self.repo_subtrees,
+                *(self.repo_subtrees or []),
             ),
             cwd=rd,
         )
@@ -8408,7 +8408,7 @@ def git_clone_subtree(
         repo_dir: str,
         branch: ta.Optional[str] = None,
         rev: ta.Optional[str] = None,
-        repo_subtrees: ta.Sequence[str],
+        repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
 ) -> None:
     for cmd in GitSubtreeCloner(
         base_dir=base_dir,
@@ -8741,6 +8741,7 @@ class DeployGitSpec:
     rev: DeployRev
 
     subtrees: ta.Optional[ta.Sequence[str]] = None
+
     shallow: bool = False
 
     def __post_init__(self) -> None:
@@ -11439,7 +11440,7 @@ def get_repo_dir(
 
     #
 
-    async def shallow_clone_subtrees(
+    async def shallow_clone(
             self,
             spec: DeployGitSpec,
             home: DeployHome,
@@ -11459,7 +11460,7 @@ async def shallow_clone_subtrees(
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,
                     rev=spec.rev,
-                    repo_subtrees=check.not_none(spec.subtrees),
+                    repo_subtrees=spec.subtrees,
             ).build_commands():
                 await asyncio_subprocesses.check_call(
                     *cmd.cmd,
@@ -11483,8 +11484,8 @@ async def checkout(
             home: DeployHome,
             dst_dir: str,
     ) -> None:
-        if spec.shallow and spec.subtrees:
-            await self.shallow_clone_subtrees(
+        if spec.shallow:
+            await self.shallow_clone(
                 spec,
                 home,
                 dst_dir,