Merge lp:~jelmer/brz/set-target-branch into lp:brz

[Jelmer Vernooij]

Add MergeProposal.set_target_branch().

Add MergeProposal.set_target_branch().

[Jelmer Vernooij (jelmer)]

review: Approve

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz/job/brz-land/1024/

=== modified file 'breezy/forge.py'
--- breezy/forge.py	2022-07-12 09:23:34 +0000
+++ breezy/forge.py	2022-07-17 01:53:37 +0000
@@ -149,6 +149,10 @@
         """Return the target branch."""
         raise NotImplementedError(self.get_target_branch_url)
 
+    def set_target_branch_name(self):
+        """Set the target branch name."""
+        raise NotImplementedError(self.set_target_branch_name)
+
     def get_source_project(self):
         raise NotImplementedError(self.get_source_project)
 

=== modified file 'breezy/plugins/github/forge.py'
--- breezy/plugins/github/forge.py	2022-07-12 10:20:12 +0000
+++ breezy/plugins/github/forge.py	2022-07-17 01:53:37 +0000
@@ -147,6 +147,9 @@
     def get_target_branch_url(self):
         return self._branch_from_part(self._pr['base'])
 
+    def set_target_branch_name(self, name):
+        self._patch(base=name)
+
     def get_source_project(self):
         return self._pr['head']['repo']['full_name']
 
@@ -162,7 +165,7 @@
     def set_commit_message(self, message):
         raise errors.UnsupportedOperation(self.set_commit_message, self)
 
-    def _patch(self, data):
+    def _patch(self, **data):
         response = self._gh._api_request(
             'PATCH', self._pr['url'], body=json.dumps(data).encode('utf-8'))
         if response.status == 422:
@@ -173,10 +176,9 @@
         self._pr = json.loads(response.text)
 
     def set_description(self, description):
-        self._patch({
-            'body': description,
-            'title': determine_title(description),
-            })
+        self._patch(
+            body=description,
+            title=determine_title(description))
 
     def is_merged(self):
         return bool(self._pr.get('merged_at'))
@@ -186,12 +188,12 @@
 
     def reopen(self):
         try:
-            self._patch({'state': 'open'})
+            self._patch(state='open')
         except ValidationFailed as e:
             raise ReopenFailed(e.error['errors'][0]['message'])
 
     def close(self):
-        self._patch({'state': 'closed'})
+        self._patch(state='closed')
 
     def can_be_merged(self):
         return self._pr['mergeable']

=== modified file 'breezy/plugins/gitlab/forge.py'
--- breezy/plugins/gitlab/forge.py	2022-07-12 10:20:12 +0000
+++ breezy/plugins/gitlab/forge.py	2022-07-17 01:53:37 +0000
@@ -291,6 +291,9 @@
         return self._branch_url_from_project(
             self._mr['target_project_id'], self._mr['target_branch'])
 
+    def set_target_branch_name(self, name):
+        self._update(branch=name)
+
     def _get_project_name(self, project_id):
         source_project = self.gl._get_project(project_id)
         return source_project['path_with_namespace']
@@ -728,6 +731,9 @@
                 'GET', 'https://%s/api/v4/projects/%s' % (host, urlutils.quote(str(project), '')))
         except errors.UnexpectedHttpStatus as e:
             raise UnsupportedForge(url)
+        except errors.RedirectRequested:
+            # GitLab doesn't send redirects for these URLs
+            raise UnsupportedForge(url)
         else:
             if not resp.getheader('X-Gitlab-Feature-Category'):
                 raise UnsupportedForge(url)

=== modified file 'breezy/plugins/launchpad/forge.py'
--- breezy/plugins/launchpad/forge.py	2022-07-12 10:20:12 +0000
+++ breezy/plugins/launchpad/forge.py	2022-07-17 01:53:37 +0000
@@ -142,6 +142,10 @@
                 self._mp.target_git_repository.git_identity,
                 ref=self._mp.target_git_path.encode('utf-8'))
 
+    def set_target_branch_name(self, name):
+        # The launchpad API doesn't support changing branch names today.
+        raise NotImplementedError(self.set_target_branch_name)
+
     @property
     def url(self):
         return lp_api.canonical_url(self._mp)

=== modified file 'breezy/transport/http/urllib.py'
--- breezy/transport/http/urllib.py	2022-07-16 13:44:07 +0000
+++ breezy/transport/http/urllib.py	2022-07-17 01:53:37 +0000
@@ -167,7 +167,7 @@
     """
 
     # Some responses have bodies in which we have no interest
-    _body_ignored_responses = [301, 302, 303, 307, 308, 403, 404, 501]
+    _body_ignored_responses = [301, 302, 303, 307, 308, 404, 501]
 
     # in finish() below, we may have to discard several MB in the worst
     # case. To avoid buffering that much, we read and discard by chunks