repoactive 0.2.7__tar.gz → 0.2.8.dev2__tar.gz

{repoactive-0.2.7 → repoactive-0.2.8.dev2}/PKG-INFO

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

{repoactive-0.2.7 → repoactive-0.2.8.dev2}/pyproject.toml

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

{repoactive-0.2.7 → repoactive-0.2.8.dev2}/src/repoactive/platforms/gitlab.py

@@ -11,14 +11,16 @@ from repoactive.platforms.base import MRParams, Platform, PlatformError
 _DRAFT_PREFIX = "Draft: "
 
 # detailed_merge_status / merge_status values that mean GitLab's async
-# mergeability check hasn't finished yet. Setting auto-merge while the check is
-# pending returns 422 "Branch cannot be merged".
+# mergeability check hasn't finished yet. On GitLab without the auto_merge
+# parameter (< 17.11), setting auto-merge while the check is pending returns
+# 422 "Branch cannot be merged".
 _MERGE_CHECK_PENDING = frozenset({"unchecked", "checking", "preparing"})
 
-# A freshly created MR is not immediately ready for auto-merge: GitLab runs the
-# mergeability check and creates the MR pipeline in the background. Poll for
-# that to settle, bounded by this timeout; the next run re-attempts if it never
-# does.
+# Fallback for GitLab without the auto_merge parameter: a freshly created MR is
+# not immediately ready for merge_when_pipeline_succeeds because GitLab runs
+# the mergeability check and creates the MR pipeline in the background. Poll
+# for that to settle, bounded by this timeout; the next run re-attempts if it
+# never does.
 _AUTO_MERGE_TIMEOUT = 60.0
 _AUTO_MERGE_POLL_INTERVAL = 3.0
 
@@ -92,21 +94,39 @@ class GitLabPlatform(Platform):
         return web_url
 
     def _enable_auto_merge(self, mr: ProjectMergeRequest) -> None:
-        """Set merge_when_pipeline_succeeds once the MR is ready, else warn.
-
-        Re-fetches the MR (the list/create payloads omit head_pipeline) and
-        polls until it is ready for auto-merge or the timeout passes. A repo
-        with no CI never grows a pipeline; there the poll times out and the
-        final call merges immediately, the best available behavior.
+        """Enable auto-merge on ``mr``, retrying until it is accepted.
+
+        The merge call sends both auto-merge parameters: on GitLab >= 17.11
+        ``auto_merge`` selects the "merge when checks pass" strategy and older
+        GitLab ignores it and honors the deprecated
+        merge_when_pipeline_succeeds. Right after a push GitLab rejects the
+        call (405/422) while its state is still settling - the mergeability
+        check runs, the MR pipeline gets created and linked - so a rejection
+        is retried until the deadline, waiting in between for the MR to look
+        ready (re-fetched, since list/create payloads omit head_pipeline).
+        That readiness gate keeps the old-GitLab semantics: retrying without a
+        pipeline there would merge immediately and skip CI. A repo with no CI
+        never grows a pipeline; there the wait times out and one final call
+        merges immediately, the best available behavior.
         """
         iid = mr.iid
         deadline = time.monotonic() + _AUTO_MERGE_TIMEOUT
+        final_attempt = False
         while True:
-            mr = self._project.mergerequests.get(iid)
-            if _ready_for_auto_merge(mr) or time.monotonic() >= deadline:
-                break
+            try:
+                mr.merge(merge_when_pipeline_succeeds=True, auto_merge=True)
+                return
+            except GitlabMRClosedError as e:
+                # python-gitlab wraps every merge failure in
+                # GitlabMRClosedError; this is usually the 422/405 "not ready
+                # yet" case, not a closed MR.
+                if final_attempt:
+                    print(f"  warning: could not enable auto-merge ({e})")
+                    return
             time.sleep(_AUTO_MERGE_POLL_INTERVAL)
-        try:
-            mr.merge(merge_when_pipeline_succeeds=True)
-        except GitlabMRClosedError as e:
-            print(f"  warning: could not enable auto-merge ({e})")
+            while True:
+                mr = self._project.mergerequests.get(iid)
+                if _ready_for_auto_merge(mr) or time.monotonic() >= deadline:
+                    break
+                time.sleep(_AUTO_MERGE_POLL_INTERVAL)
+            final_attempt = time.monotonic() >= deadline