Modify git.clone action to checkout branch after cloning

examples/clone_and_open.py

@@ -22,7 +22,7 @@ def setup(lab: str, zid: str):
     directory = actions.git.clone(
         f"git@nw-syd-gitlab.cseunsw.tech:COMP2511/{
             term}/students/{zid}/{lab}.git",
-        # branch="marking",
+        branch="marking",
     )
     return {
         "directory": directory,

markten/__utils.py

@@ -14,7 +14,7 @@ def show_banner():
 class TextCollector:
     """
     Collects text when called. When stringified, it produces the output, joined
-    by newlines.
+    by newlines. With leading and trailing whitespace stripped.
     """
 
     def __init__(self) -> None:
@@ -24,4 +24,4 @@ def __call__(self, line: str) -> Any:
         self.__output.append(line)
 
     def __str__(self) -> str:
-        return '\n'.join(self.__output)
+        return '\n'.join(self.__output).strip()

markten/actions/__async_process.py

@@ -22,6 +22,7 @@ async def read_stream(
 async def run_process(
     cmd: tuple[str, ...],
     stdin: str = '',
+    cwd: str | None = None,
     *,
     on_stdout: Callable[[str], None] | None = None,
     on_stderr: Callable[[str], None] | None = None,
@@ -32,6 +33,7 @@ async def run_process(
     """
     process = await asyncio.create_subprocess_exec(
         *cmd,
+        cwd=cwd,
         stdin=asyncio.subprocess.PIPE,
         stdout=asyncio.subprocess.PIPE,
         stderr=asyncio.subprocess.PIPE,

markten/actions/git.py

@@ -21,8 +21,8 @@ class clone(MarkTenAction):
     """
 
     def __init__(self, repo_url: str, /, branch: str | None = None) -> None:
-        self.repo = repo_url
-        self.branch = branch
+        self.repo = repo_url.strip()
+        self.branch = branch.strip() if branch else None
 
     def get_name(self) -> str:
         return "git clone"
@@ -41,13 +41,7 @@ async def run(self, task) -> Path:
             task.fail("mktemp failed")
             raise RuntimeError("mktemp failed")
 
-        # Perform the git clone
-        if self.branch:
-            branch_args = ["-b", self.branch, "--single-branch"]
-        else:
-            branch_args = []
-
-        program = ("git", "clone", *branch_args, self.repo, str(clone_path))
+        program = ("git", "clone", self.repo, str(clone_path))
         task.running(' '.join(program))
 
         clone = await run_process(
@@ -58,6 +52,22 @@ async def run(self, task) -> Path:
             task.fail(f"git clone exited with error code: {clone}")
             raise Exception("Task failed")
 
+        if self.branch:
+            program = (
+                "git",
+                "checkout",
+                "-b",
+                self.branch,
+                f"origin/{self.branch}",
+            )
+            task.running(' '.join(program))
+            task.log(' '.join(program))
+            clone = await run_process(
+                program,
+                cwd=str(clone_path),
+                on_stderr=task.log,
+            )
+
         task.succeed(f"Cloned {self.repo} to {clone_path}")
         return Path(str(clone_path))