Merge lp:~jelmer/brz/merge-mode into lp:brz/3.3

[Jelmer Vernooij]

Add method and remove_source_branch arguments to MergeProposal.merge()

Add method and remove_source_branch arguments to MergeProposal.merge()

Unmerged revisions

7766. By Jelmer Vernooij on 2022-12-30

Add method and remove_source_branch arguments.

7765. By Jelmer Vernooij on 2022-12-30

Use TemporaryDirectory.

=== modified file 'breezy/forge.py'
--- breezy/forge.py	2022-12-15 14:18:30 +0000
+++ breezy/forge.py	2022-12-30 17:22:49 +0000
@@ -123,6 +123,13 @@
             target_branch=target_branch)
 
 
+MERGE_METHOD_MERGE = "merge"
+MERGE_METHOD_REBASE = "rebase"
+MERGE_METHOD_SQUASH = "squash"
+
+MERGE_METHODS = [MERGE_METHOD_MERGE, MERGE_METHOD_REBASE, MERGE_METHOD_SQUASH]
+
+
 class MergeProposal(object):
     """A merge proposal.
 
@@ -198,7 +205,9 @@
         """
         raise NotImplementedError(self.is_closed)
 
-    def merge(self, commit_message=None, auto=False):
+    def merge(
+            self, commit_message=None, auto=False, method=MERGE_METHOD_MERGE,
+            remove_source_branch: bool = False):
         """Merge this merge proposal."""
         raise NotImplementedError(self.merge)
 

=== modified file 'breezy/plugins/github/forge.py'
--- breezy/plugins/github/forge.py	2022-12-15 14:18:30 +0000
+++ breezy/plugins/github/forge.py	2022-12-30 17:22:49 +0000
@@ -31,6 +31,9 @@
     PrerequisiteBranchUnsupported,
     ReopenFailed,
     UnsupportedForge,
+    MERGE_METHOD_MERGE,
+    MERGE_METHOD_REBASE,
+    MERGE_METHOD_SQUASH,
     )
 
 from ... import (
@@ -221,13 +224,34 @@
     def can_be_merged(self):
         return self._pr['mergeable']
 
-    def merge(self, commit_message=None, auto=False):
+    def merge(self, commit_message=None, auto=False, method=MERGE_METHOD_MERGE,
+              remove_source_branch=False):
+        if self._pr['delete_branch_on_merge'] != remove_source_branch:
+            self._patch(delete_branch_on_merge=remove_source_branch)
         if auto:
+            if commit_message:
+                lines = commit_message.splitlines(True)
+                commit_headline = lines[0]
+                commit_body = ''.join(lines[1:])
+            else:
+                commit_headline = None
+                commit_body = None
+            if method == MERGE_METHOD_MERGE:
+                merge_method = 'MERGE'
+            elif method == MERGE_METHOD_REBASE:
+                merge_method = 'REBASE'
+            elif method == MERGE_METHOD_SQUASH:
+                merge_method = 'SQUASH'
+            else:
+                raise NotImplementedError
+
             graphql_query = """
 mutation ($pullRequestId: ID!) {
   enablePullRequestAutoMerge(input: {
     pullRequestId: $pullRequestId,
-    mergeMethod: MERGE
+    mergeMethod: $mergeMethod
+    commitHeadline: $commitHeadline
+    commitBody: $commitBody
   }) {
     pullRequest {
       autoMergeRequest {
@@ -241,12 +265,22 @@
 }
 """
             self._gh._graphql_request(
-                graphql_query, pullRequestId=self._pr["node_id"])
+                graphql_query, pullRequestId=self._pr["node_id"],
+                mergeMethod=merge_method, commitHeadline=commit_headline,
+                commitBody=commit_body)
         else:
             # https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
             data = {}
             if commit_message:
                 data['commit_message'] = commit_message
+            if method == MERGE_METHOD_MERGE:
+                data['merge_method'] = 'merge'
+            elif method == MERGE_METHOD_REBASE:
+                data['merge_method'] = 'rebase'
+            elif method == MERGE_METHOD_SQUASH:
+                data['merge_method'] = 'squash'
+            else:
+                raise NotImplementedError
             response = self._gh._api_request(
                 'PUT', self._pr['url'] + "/merge", body=json.dumps(data).encode('utf-8'))
             if response.status == 422:

=== modified file 'breezy/plugins/gitlab/forge.py'
--- breezy/plugins/gitlab/forge.py	2022-12-16 01:12:37 +0000
+++ breezy/plugins/gitlab/forge.py	2022-12-30 17:22:49 +0000
@@ -44,6 +44,8 @@
     SourceNotDerivedFromTarget,
     UnsupportedForge,
     ForgeLoginRequired,
+    MERGE_METHOD_MERGE,
+    MERGE_METHOD_SQUASH,
     )
 
 
@@ -353,12 +355,21 @@
     def close(self):
         self._update(state_event='close')
 
-    def merge(self, commit_message=None, auto=False):
+    def merge(self, commit_message=None, auto=False, method=MERGE_METHOD_MERGE,
+              remove_source_branch=False):
+        if method == MERGE_METHOD_MERGE:
+            squash = False
+        elif method == MERGE_METHOD_SQUASH:
+            squash = True
+        else:
+            raise NotImplementedError(self.merge)
         # https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
         ret = self.gl._merge_mr(
             self._mr['project_id'], self._mr['iid'],
             kwargs={"merge_commit_message": commit_message,
-                    "merge_when_pipeline_succeeds": auto})
+                    "merge_when_pipeline_succeeds": auto,
+                    "squash": squash,
+                    "should_remove_source_branch": remove_source_branch})
         self._mr.update(ret)
 
     def can_be_merged(self):

=== modified file 'breezy/plugins/launchpad/forge.py'
--- breezy/plugins/launchpad/forge.py	2022-12-21 12:52:20 +0000
+++ breezy/plugins/launchpad/forge.py	2022-12-30 17:22:49 +0000
@@ -18,7 +18,6 @@
 """Support for Launchpad."""
 
 import re
-import shutil
 import tempfile
 
 from ...forge import (
@@ -30,6 +29,7 @@
     UnsupportedForge,
     TitleUnsupported,
     AutoMergeUnsupported,
+    MERGE_METHOD_MERGE,
     )
 
 from ... import (
@@ -220,9 +220,12 @@
     def get_merged_at(self):
         return self._mp.date_merged
 
-    def merge(self, commit_message=None, auto=False):
+    def merge(self, commit_message=None, auto=False, method=MERGE_METHOD_MERGE,
+              remove_source_branch=False):
         if auto:
             raise AutoMergeUnsupported(self)
+        if method != MERGE_METHOD_MERGE:
+            raise NotImplementedError("merge method %s unsupported" % method)
         target_branch = _mod_branch.Branch.open(
             self.get_target_branch_url())
         source_branch = _mod_branch.Branch.open(
@@ -230,14 +233,16 @@
         # TODO(jelmer): Ideally this would use a memorytree, but merge doesn't
         # support that yet.
         # tree = target_branch.create_memorytree()
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with tempfile.TemporaryDirectory() as tmpdir:
             tree = target_branch.create_checkout(
                 to_location=tmpdir, lightweight=True)
             tree.merge_from_branch(source_branch)
             tree.commit(commit_message or self._mp.commit_message)
-        finally:
-            shutil.rmtree(tmpdir)
+        if remove_source_branch:
+            if self._mp.source_branch:
+                self._mp.source_branch.lp_delete()
+            else:
+                source_branch.controldir.destroy_branch(name=source_branch.name)
 
     def post_comment(self, body):
         self._mp.createComment(content=body)