Merge lp:~jelmer/brz/land into lp:brz

[Jelmer Vernooij]

Add a 'brz land' subcommand.

Add a 'brz land' subcommand.

This allows merging existing merge proposals on Launchpad, GitHub and GitLab.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/329/

=== modified file 'breezy/plugins/propose/__init__.py'
--- breezy/plugins/propose/__init__.py	2019-01-02 19:21:51 +0000
+++ breezy/plugins/propose/__init__.py	2019-06-03 23:27:22 +0000
@@ -21,6 +21,7 @@
 from ...commands import plugin_cmds
 
 plugin_cmds.register_lazy("cmd_propose_merge", ["propose"], __name__ + ".cmds")
+plugin_cmds.register_lazy("cmd_land_merge_proposal", ["land"], __name__ + ".cmds")
 plugin_cmds.register_lazy("cmd_publish_derived", ['publish'], __name__ + ".cmds")
 plugin_cmds.register_lazy("cmd_find_merge_proposal", ['find-proposal'], __name__ + ".cmds")
 plugin_cmds.register_lazy("cmd_github_login", ["gh-login"], __name__ + ".cmds")
 
=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2019-04-27 15:53:53 +0000
+++ breezy/plugins/propose/cmds.py	2019-06-03 23:27:22 +0000
@@ -340,3 +340,16 @@
             for instance in hoster_cls.iter_instances():
                 for mp in instance.iter_my_proposals(status=status):
                     self.outf.write('%s\n' % mp.url)
+
+
+class cmd_land_merge_proposal(Command):
+    __doc__ = """Land a merge proposal."""
+
+    takes_args = ['url']
+    takes_options = [
+        Option('message', help='Commit message to use.', type=str)]
+
+    def run(self, url, message=None):
+        from .propose import get_proposal_by_url
+        proposal = get_proposal_by_url(url)
+        proposal.merge(commit_message=message)
 
=== modified file 'breezy/plugins/propose/github.py'
--- breezy/plugins/propose/github.py	2019-04-27 16:03:23 +0000
+++ breezy/plugins/propose/github.py	2019-06-03 23:27:22 +0000
@@ -135,6 +135,10 @@
     def close(self):
         self._pr.edit(state='closed')
 
+    def merge(self, commit_message=None):
+        # https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
+        self._pr.merge(commit_message=commit_message)
+
 
 def parse_github_url(url):
     (scheme, user, password, host, port, path) = urlutils.parse_url(
@@ -321,6 +325,10 @@
         for issue in self.gh.search_issues(query=' '.join(query)):
             yield GitHubMergeProposal(issue.as_pull_request())
 
+    @convert_github_error
+    def get_proposal_by_url(self, url):
+        raise UnsupportedHoster(url)
+
 
 class GitHubMergeProposalBuilder(MergeProposalBuilder):
 
 
=== modified file 'breezy/plugins/propose/gitlabs.py'
--- breezy/plugins/propose/gitlabs.py	2019-04-27 16:03:23 +0000
+++ breezy/plugins/propose/gitlabs.py	2019-06-03 23:27:22 +0000
@@ -54,6 +54,16 @@
         self.url = url
 
 
+class NotMergeRequestUrl(errors.BzrError):
+
+    _fmt = "Not a merge proposal URL: %(url)s"
+
+    def __init__(self, host, url):
+        errors.BzrError.__init__(self)
+        self.host = host
+        self.url = url
+
+
 class DifferentGitLabInstances(errors.BzrError):
 
     _fmt = ("Can't create merge proposals across GitLab instances: "
@@ -129,6 +139,20 @@
     return host, path, branch.name
 
 
+def parse_gitlab_merge_request_url(url):
+    (scheme, user, password, host, port, path) = urlutils.parse_url(
+        url)
+    if scheme not in ('git+ssh', 'https', 'http'):
+        raise NotGitLabUrl(url)
+    if not host:
+        raise NotGitLabUrl(url)
+    path = path.strip('/')
+    parts = path.split('/')
+    if parts[-2] != 'merge_requests':
+        raise NotMergeRequestUrl(host, url)
+    return host, '/'.join(parts[:-2]), int(parts[-1])
+
+
 class GitLabMergeProposal(MergeProposal):
 
     def __init__(self, mr):
@@ -167,6 +191,10 @@
         self._mr.state_event = 'close'
         self._mr.save()
 
+    def merge(self, commit_message=None):
+        # https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
+        self._mr.merge(merge_commit_message=commit_message)
+
 
 def gitlab_url_to_bzr_url(url, name):
     if not PY3:
@@ -334,6 +362,22 @@
                 owner=self.gl.user.username, state=state):
             yield GitLabMergeProposal(mp)
 
+    def get_proposal_by_url(self, url):
+        try:
+            (host, project, merge_id) = parse_gitlab_merge_request_url(url)
+        except NotGitLabUrl:
+            raise UnsupportedHoster(url)
+        except NotMergeRequestUrl as e:
+            if self.gl.url == ('https://%s' % e.host):
+                raise
+            else:
+                raise UnsupportedHoster(url)
+        if self.gl.url != ('https://%s' % host):
+            raise UnsupportedHoster(url)
+        project = self.gl.projects.get(project)
+        mr = project.mergerequests.get(merge_id)
+        return GitLabMergeProposal(mr)
+
 
 class GitlabMergeProposalBuilder(MergeProposalBuilder):
 
 
=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2019-06-03 22:38:47 +0000
+++ breezy/plugins/propose/launchpad.py	2019-06-03 23:27:22 +0000
@@ -20,6 +20,8 @@
 from __future__ import absolute_import
 
 import re
+import shutil
+import tempfile
 
 from .propose import (
     Hoster,
@@ -152,6 +154,23 @@
     def close(self):
         self._mp.setStatus(status='Rejected')
 
+    def merge(self, commit_message=None):
+        target_branch = _mod_branch.Branch.open(
+            self.get_target_branch_url())
+        source_branch = _mod_branch.Branch.open(
+            self.get_source_branch_url())
+        # TODO(jelmer): Ideally this would use a memorytree, but merge doesn't
+        # support that yet.
+        # tree = target_branch.create_memorytree()
+        tmpdir = tempfile.mkdtemp()
+        try:
+            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)
+
 
 class Launchpad(Hoster):
     """The Launchpad hosting service."""
@@ -400,6 +419,23 @@
         for mp in self.launchpad.me.getMergeProposals(status=statuses):
             yield LaunchpadMergeProposal(mp)
 
+    def get_proposal_by_url(self, url):
+        # Launchpad doesn't have a way to find a merge proposal by URL.
+        (scheme, user, password, host, port, path) = urlutils.parse_url(
+            url)
+        LAUNCHPAD_CODE_DOMAINS = [
+            ('code.%s' % domain) for domain in lp_api.LAUNCHPAD_DOMAINS.values()]
+        if host not in LAUNCHPAD_CODE_DOMAINS:
+            raise UnsupportedHoster(url)
+        # TODO(jelmer): Check if this is a launchpad URL. Otherwise, raise
+        # UnsupportedHoster
+        # See https://api.launchpad.net/devel/#branch_merge_proposal
+        # the syntax is:
+        # https://api.launchpad.net/devel/~<author.name>/<project.name>/<branch.name>/+merge/<id>
+        api_url = str(self.launchpad._root_uri) + path
+        mp = self.launchpad.load(api_url)
+        return LaunchpadMergeProposal(mp)
+
 
 class LaunchpadBazaarMergeProposalBuilder(MergeProposalBuilder):
 
 
=== modified file 'breezy/plugins/propose/propose.py'
--- breezy/plugins/propose/propose.py	2019-04-27 16:03:23 +0000
+++ breezy/plugins/propose/propose.py	2019-06-03 23:27:22 +0000
@@ -135,6 +135,10 @@
         """Check whether this merge proposal has been merged."""
         raise NotImplementedError(self.is_merged)
 
+    def merge(self, commit_message=None):
+        """Merge this merge proposal."""
+        raise NotImplementedError(self.merge)
+
 
 class MergeProposalBuilder(object):
     """Merge proposal creator.
@@ -225,7 +229,7 @@
         raise NotImplementedError(self.get_proposer)
 
     def iter_proposals(self, source_branch, target_branch, status='open'):
-        """Get a merge proposal for a specified branch tuple.
+        """Get the merge proposals for a specified branch tuple.
 
         :param source_branch: Source branch
         :param target_branch: Target branch
@@ -234,6 +238,15 @@
         """
         raise NotImplementedError(self.iter_proposals)
 
+    def get_proposal_by_url(self, url):
+        """Retrieve a branch proposal by URL.
+
+        :param url: Merge proposal URL.
+        :return: MergeProposal object
+        :raise UnsupportedHoster: Hoster does not support this URL
+        """
+        raise NotImplementedError(self.get_proposal_by_url)
+
     def hosts(self, branch):
         """Return true if this hoster hosts given branch."""
         raise NotImplementedError(self.hosts)
@@ -289,6 +302,16 @@
     raise UnsupportedHoster(branch)
 
 
+def get_proposal_by_url(url):
+    for name, hoster_cls in hosters.items():
+        for instance in hoster_cls.iter_instances():
+            try:
+                return instance.get_proposal_by_url(url)
+            except UnsupportedHoster:
+                pass
+    raise UnsupportedHoster(url)
+
+
 hosters = registry.Registry()
 hosters.register_lazy(
     "launchpad", "breezy.plugins.propose.launchpad",
 
=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-06-03 22:38:47 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-06-03 23:27:22 +0000
@@ -21,6 +21,9 @@
 
 .. New commands, options, etc that users may wish to try out.
 
+ * A new ``brz land`` command can merge merge proposals on Launchpad,
+   GitHub and GitLab sites. (Jelmer Vernooij, #1816213)
+
  * The 'patch' command is now bundled with brz.
    Imported from bzrtools by Aaron Bentley. (Jelmer Vernooij)