Merge lp:~jelmer/brz/proposal-conflict into lp:brz/3.1

[Jelmer Vernooij]

Handle 409s better for gitlab merge proposals.

Handle 409s better for gitlab.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2021-03-16 15:18:26 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-03-21 14:25:38 +0000
@@ -84,7 +84,8 @@
     _fmt = "GitLab can not process request: %(error)s."
 
     def __init__(self, error):
-        errors.BzrError.__init__(self, error=error)
+        errors.BzrError.__init__(self)
+        self.error = error
 
 
 class DifferentGitLabInstances(errors.BzrError):
@@ -115,7 +116,8 @@
     _fmt = "Conflict during operation: %(reason)s"
 
     def __init__(self, reason):
-        errors.BzrError(self, reason=reason)
+        errors.BzrError(self)
+        self.reason = reason
 
 
 class ForkingDisabled(errors.BzrError):
@@ -231,7 +233,13 @@
         self._mr = mr
 
     def _update(self, **kwargs):
-        self.gl._update_merge_request(self._mr['project_id'], self._mr['iid'], kwargs)
+        try:
+            self.gl._update_merge_request(
+                self._mr['project_id'], self._mr['iid'], kwargs)
+        except GitLabConflict as e:
+            self.gl._handle_merge_request_conflict(
+                e.reason, self.get_source_branch_url(),
+                self._mr['target_project_id'])
 
     def __repr__(self):
         return "<%s at %r>" % (type(self).__name__, self._mr['web_url'])
@@ -449,6 +457,18 @@
             project = self._get_project(project['path_with_namespace'])
         return project
 
+    def _handle_merge_request_conflict(self, reason, source_url, target_project):
+        m = re.fullmatch(
+            r'Another open merge request already exists for '
+            r'this source branch: \!([0-9]+)',
+            reason['message'][0])
+        if m:
+            merge_id = int(m.group(1))
+            mr = self._get_merge_request(target_project, merge_id)
+            raise MergeProposalExists(
+                source_url, GitLabMergeProposal(self, mr))
+        raise MergeRequestConflict(reason)
+
     def get_current_user(self):
         return self._current_user['username']
 
@@ -508,6 +528,8 @@
         response = self._api_request('PUT', path, fields=mr)
         if response.status == 200:
             return json.loads(response.data)
+        if response.status == 409:
+            raise GitLabConflict(json.loads(response.data).get('message'))
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         _unexpected_status(path, response)
@@ -542,7 +564,7 @@
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         if response.status == 409:
-            raise MergeRequestConflict(json.loads(response.data))
+            raise GitLabConflict(json.loads(response.data).get('message'))
         if response.status == 422:
             data = json.loads(response.data)
             raise GitLabUnprocessable(data['error'])
@@ -780,18 +802,10 @@
                 kwargs['assignee_ids'].append(user['id'])
         try:
             merge_request = self.gl._create_mergerequest(**kwargs)
-        except MergeRequestConflict as e:
-            m = re.fullmatch(
-                r'Another open merge request already exists for '
-                r'this source branch: \!([0-9]+)',
-                e.reason['message'][0])
-            if m:
-                merge_id = int(m.group(1))
-                mr = self.gl._get_merge_request(
-                    target_project['path_with_namespace'], merge_id)
-                raise MergeProposalExists(
-                    self.source_branch.user_url, GitLabMergeProposal(self.gl, mr))
-            raise Exception('conflict: %r' % e.reason)
+        except GitLabConflict as e:
+            self.gl._handle_merge_request_conflict(
+                e.reason, self.source_branch.user_url,
+                target_project['path_with_namespace'])
         except GitLabUnprocessable as e:
             if e.error == [
                     "Source project is not a fork of the target project"]: