repoactive 0.3.1.dev2__tar.gz → 0.3.1.dev3__tar.gz

{repoactive-0.3.1.dev2 → repoactive-0.3.1.dev3}/PKG-INFO

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

{repoactive-0.3.1.dev2 → repoactive-0.3.1.dev3}/pyproject.toml

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

{repoactive-0.3.1.dev2 → repoactive-0.3.1.dev3}/src/repoactive/jj.py

@@ -286,10 +286,21 @@ class JJ:
         return next((b.change_id for b in self.bookmark_list() if b.name == name), None)
 
     def rebase_revision(self, revision: str, *onto: str) -> None:
-        """Rebase a specific revision onto ``onto`` without touching ``@``."""
+        """Rebase a specific revision onto ``onto`` without touching ``@``.
+
+        Uses ``-r``: only ``revision`` moves. Any existing descendant of
+        ``revision`` is left behind, refilled onto ``revision``'s old
+        parent(s) instead of following it to ``onto`` (jj's own "-r" gap-fill
+        behaviour) — use ``rebase_source`` when descendants must follow.
+        """
         onto_args = [arg for parent in onto for arg in ("--onto", parent)]
         self._run("rebase", "-r", revision, *onto_args)
 
+    def rebase_source(self, revision: str, *onto: str) -> None:
+        """Rebase ``revision`` and all its descendants onto ``onto`` without touching ``@``."""
+        onto_args = [arg for parent in onto for arg in ("--onto", parent)]
+        self._run("rebase", "-s", revision, *onto_args)
+
     def describe_revision(self, revision: str, message: str) -> None:
         """Set the commit message of a specific revision without touching ``@``."""
         self._run("describe", "-r", revision, "--message", message)

{repoactive-0.3.1.dev2 → repoactive-0.3.1.dev3}/src/repoactive/runner.py

@@ -1065,6 +1065,21 @@ def _absorb_results(ctx: RunContext) -> None:
                 repo.get_description(old_change_id)
             ) != _strip_boxquote_and_trailers(message):
                 repo.describe_revision(old_change_id, message)
+            # old_change_id now holds the canonical content (restored above, or
+            # already matching new_change_id). Rebase new_change_id -- and any
+            # of its descendants -- onto it *before* abandoning: a
+            # not-yet-absorbed dependent job in this same run may still be
+            # parented on new_change_id (a stacked phase-1 fresh commit), and
+            # rebase_source's "-s" brings such a descendant along to
+            # old_change_id's content. This is a content no-op for
+            # new_change_id itself (old_change_id's tree already equals it),
+            # so it only redirects where such a descendant lands. Plain "-r"
+            # (rebase_revision) will NOT do: it leaves descendants behind,
+            # refilled onto new_change_id's old parent (canonical_parents) --
+            # exactly the corruption this call prevents. Without this call,
+            # the abandon below has the same "-r"-like gap-fill behaviour,
+            # silently dropping this job's diff from the descendant.
+            repo.rebase_source(new_change_id, old_change_id)
             repo.abandon_revision(new_change_id)
             # No bookmark_set needed: the bookmark follows old_change_id through
             # the rewrites above (jj moves local bookmarks with the commit).