repoactive 0.2.4.dev1__tar.gz → 0.2.4.dev2__tar.gz

{repoactive-0.2.4.dev1 → repoactive-0.2.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: repoactive
-Version: 0.2.4.dev1
+Version: 0.2.4.dev2
 Summary: Script-driven code changes with automated merge requests
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE

{repoactive-0.2.4.dev1 → repoactive-0.2.4.dev2}/pyproject.toml

@@ -10,7 +10,7 @@ only-include = ["src"]
 
 [project]
 name = "repoactive"
-version = "0.2.4.dev1"
+version = "0.2.4.dev2"
 description = "Script-driven code changes with automated merge requests"
 readme = "README.md"
 requires-python = ">=3.11"

{repoactive-0.2.4.dev1 → repoactive-0.2.4.dev2}/src/repoactive/jj.py

@@ -1,6 +1,7 @@
 """Wrapper around the jj (Jujutsu) CLI for managing colocated jj+git repositories."""
 
 import contextlib
+import enum
 import logging
 import shutil
 import subprocess
@@ -15,6 +16,12 @@ from repoactive.constants import JOB_TRAILER_KEY
 
 logger = logging.getLogger(__name__)
 
+
+class Colocation(enum.Enum):
+    COLOCATED = "colocated"
+    PLAIN = "plain"
+
+
 # Prefix for the temporary workspaces repoactive creates for each job. It is not
 # configurable so that stale workspaces (left behind by a killed run) can always
 # be recognised and reclaimed by name (see JJ.forget_stale_workspaces).
@@ -181,9 +188,9 @@ class JJ:
             )
             raise CommandFailedError(program, args, e.stderr) from e
         logger.debug(
-            "%s %s -> %d bytes in %.3fs",
+            "%s %s ... -> %d bytes in %.3fs",
             program,
-            " ".join(args),
+            " ".join(args[:1]),
             len(result.stdout),
             time.monotonic() - start,
         )
@@ -472,7 +479,7 @@ class JJ:
         """Sync the colocated git checkout (HEAD and index) to the jj working copy.
 
         jj only exports git HEAD in the default workspace; workspaces colocated
-        via workspace_add() need this after the working copy moves (new, edit,
+        via _workspace_add() need this after the working copy moves (new, edit,
         rebase). No-op if the workspace is not colocated.
         """
         if not self.is_colocated():
@@ -508,9 +515,11 @@ class JJ:
         if stale:
             self.git_worktree_prune()
 
-    def workspace_add(self, name: str, path: Path) -> None:
+    def _workspace_add(
+        self, name: str, path: Path, colocation: Colocation = Colocation.COLOCATED
+    ) -> None:
         self._run("workspace", "add", "--name", name, str(path))
-        if self.is_colocated():
+        if colocation is Colocation.COLOCATED and self.is_colocated():
             self._colocate_workspace(name, path)
 
     def _colocate_workspace(self, name: str, path: Path) -> None:
@@ -541,7 +550,9 @@ class JJ:
         self._run("workspace", "forget", name)
 
     @contextlib.contextmanager
-    def temp_workspace(self, name: str) -> Generator["JJ"]:
+    def temp_workspace(
+        self, name: str, colocation: Colocation = Colocation.COLOCATED
+    ) -> Generator["JJ"]:
         """Create a workspace named ``name`` in a temp directory, cleaning up on exit.
 
         Adds a jj workspace inside a fresh temp directory and yields a JJ bound
@@ -552,7 +563,7 @@ class JJ:
         tmp_root = Path(tempfile.mkdtemp(prefix="repoactive-workspace-"))
         workspace_path = tmp_root / "workspace"
         logger.debug("adding workspace %s at %s", name, workspace_path)
-        self.workspace_add(name, workspace_path)
+        self._workspace_add(name, workspace_path, colocation)
         try:
             yield JJ(workspace_path)
         finally:
@@ -560,5 +571,6 @@ class JJ:
             with contextlib.suppress(JJError):
                 self.workspace_forget(name)
             shutil.rmtree(tmp_root, ignore_errors=True)
-            with contextlib.suppress(JJError):
-                self.git_worktree_prune()
+            if colocation is Colocation.COLOCATED:
+                with contextlib.suppress(JJError):
+                    self.git_worktree_prune()

{repoactive-0.2.4.dev1 → repoactive-0.2.4.dev2}/src/repoactive/platforms/gitlab.py

@@ -1,7 +1,7 @@
 """GitLab platform implementation using python-gitlab."""
 
 import gitlab
-from gitlab.exceptions import GitlabError
+from gitlab.exceptions import GitlabError, GitlabMRClosedError
 
 from repoactive.platforms.base import MRParams, Platform, PlatformError
 
@@ -50,5 +50,8 @@ class GitLabPlatform(Platform):
                 }
             )
         if params.auto_merge:
-            mr.merge(merge_when_pipeline_succeeds=True)
+            try:
+                mr.merge(merge_when_pipeline_succeeds=True)
+            except GitlabMRClosedError as e:
+                print(f"  warning: could not enable auto-merge ({e})")
         return mr.web_url

{repoactive-0.2.4.dev1 → repoactive-0.2.4.dev2}/src/repoactive/runner.py

@@ -28,7 +28,7 @@ from repoactive.config import (
 )
 from repoactive.constants import JOB_TRAILER_KEY
 from repoactive.graph import CircularDependencyError, detect_dependency_cycle, topological_sort
-from repoactive.jj import JJ, workspace_name
+from repoactive.jj import JJ, Colocation, workspace_name
 from repoactive.jobtree import format_job_forest, print_job_table
 from repoactive.lock import run_lock
 from repoactive.platforms.base import MRParams, Platform
@@ -1030,7 +1030,9 @@ def _absorb_results(
                 )
                 if not content_unchanged:
                     if abs_ws is None:
-                        abs_ws = stack.enter_context(repo.temp_workspace("repoactive-absorb"))
+                        abs_ws = stack.enter_context(
+                            repo.temp_workspace("repoactive-absorb", Colocation.PLAIN)
+                        )
                     abs_ws.restore(source_rev=new_cid, destination_rev=old_cid)
                     repo.describe_revision(old_cid, message)
                 elif _strip_boxquote_and_trailers(