Merge lp:~jelmer/brz/merge-proposal-text into lp:brz

[Jelmer Vernooij]

Add Hoster.merge_proposal_description_format and common function for determining title.

Add Hoster.merge_proposal_description_format and common function for determining title.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/propose/github.py'
--- breezy/plugins/propose/github.py	2020-01-12 18:51:25 +0000
+++ breezy/plugins/propose/github.py	2020-01-15 23:43:43 +0000
@@ -22,6 +22,7 @@
 import os
 
 from ...propose import (
+    determine_title,
     Hoster,
     HosterLoginRequired,
     MergeProposal,
@@ -71,10 +72,6 @@
         return f.read().strip()
 
 
-def determine_title(description):
-    return description.splitlines()[0]
-
-
 class ValidationFailed(errors.BzrError):
 
     _fmt = "GitHub validation failed: %(error)s"
@@ -240,6 +237,7 @@
 
     supports_merge_proposal_labels = True
     supports_merge_proposal_commit_message = False
+    merge_proposal_description_format = 'markdown'
 
     def __repr__(self):
         return "GitHub()"

=== modified file 'breezy/plugins/propose/gitlabs.py'
--- breezy/plugins/propose/gitlabs.py	2020-01-12 13:56:10 +0000
+++ breezy/plugins/propose/gitlabs.py	2020-01-15 23:43:43 +0000
@@ -35,6 +35,7 @@
 from ...transport import get_transport
 
 from ...propose import (
+    determine_title,
     Hoster,
     MergeProposal,
     MergeProposalBuilder,
@@ -189,7 +190,7 @@
         return self._mr['description']
 
     def set_description(self, description):
-        self._update(description=description, title=description.splitlines()[0])
+        self._update(description=description, title=determine_title(description))
 
     def get_commit_message(self):
         return self._mr.get('merge_commit_message')
@@ -270,6 +271,7 @@
 
     supports_merge_proposal_labels = True
     supports_merge_proposal_commit_message = False
+    merge_proposal_description_format = 'markdown'
 
     def __repr__(self):
         return "<GitLab(%r)>" % self.base_url
@@ -548,11 +550,11 @@
         return GitLabMergeProposal(mr)
 
     def delete_project(self, project):
-        path = 'projects/%s' % urlutils.quote(str(project_name), '')
+        path = 'projects/%s' % urlutils.quote(str(project), '')
         response = self._api_request('DELETE', path)
         if response.status == 404:
-            raise NoSuchProject(project_name)
-        if response.status != 200:
+            raise NoSuchProject(project)
+        if response.status != 202:
             raise errors.InvalidHttpResponse(path, response.text)
 
 
@@ -594,7 +596,7 @@
         source_project = self.gl._get_project(self.source_project_name)
         target_project = self.gl._get_project(self.target_project_name)
         # TODO(jelmer): Allow setting title explicitly
-        title = description.splitlines()[0]
+        title = determine_title(description)
         # TODO(jelmer): Allow setting allow_collaboration field
         # TODO(jelmer): Allow setting milestone field
         # TODO(jelmer): Allow setting squash field

=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2020-01-11 16:22:12 +0000
+++ breezy/plugins/propose/launchpad.py	2020-01-15 23:43:43 +0000
@@ -199,6 +199,8 @@
 
     supports_merge_proposal_commit_message = True
 
+    merge_proposal_description_format = 'plain'
+
     def __init__(self, staging=False):
         self._staging = staging
         if staging:

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2020-01-12 13:56:10 +0000
+++ breezy/propose.py	2020-01-15 23:43:43 +0000
@@ -230,6 +230,10 @@
     # rather than https://api.github.com/
     base_url = None
 
+    # The syntax to use for formatting merge proposal descriptions.
+    # Common values: 'plain', 'markdown'
+    merge_proposal_description_format = None
+
     def publish_derived(self, new_branch, base_branch, name, project=None,
                         owner=None, revision_id=None, overwrite=False,
                         allow_lossy=True):
@@ -330,6 +334,11 @@
         raise NotImplementedError(cls.iter_instances)
 
 
+def determine_title(description):
+    """Determine the title for a merge proposal based on full description."""
+    return description.splitlines()[0].split('.')[0]
+
+
 def get_hoster(branch, possible_hosters=None):
     """Find the hoster for a branch.
 

=== modified file 'breezy/tests/test_propose.py'
--- breezy/tests/test_propose.py	2019-10-27 14:11:56 +0000
+++ breezy/tests/test_propose.py	2020-01-15 23:43:43 +0000
@@ -17,6 +17,7 @@
 import os
 
 from ..propose import (
+    determine_title,
     get_proposal_by_url,
     get_hoster,
     Hoster,
@@ -106,3 +107,13 @@
 
         url = urlutils.local_path_to_url(os.path.join(self.test_dir, 'hosted', 'proposal'))
         self.assertIsInstance(get_proposal_by_url(url), MergeProposal)
+
+
+class DetermineTitleTests(tests.TestCase):
+
+    def test_determine_title(self):
+        self.assertEqual('Make some change', determine_title("""\
+Make some change.
+
+And here are some more details.
+"""))