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

[Jelmer Vernooij]

Fix support for owner in GitLab proposals.

Fix support for owner in GitLab proposals.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/237/

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2020-07-20 03:21:15 +0000
+++ breezy/plugins/gitlab/hoster.py	2020-07-22 22:28:18 +0000
@@ -369,9 +369,12 @@
             return json.loads(response.data)
         raise errors.UnexpectedHttpStatus(path, response.status)
 
-    def _fork_project(self, project_name, timeout=50, interval=5):
+    def _fork_project(self, project_name, timeout=50, interval=5, owner=None):
         path = 'projects/%s/fork' % urlutils.quote(str(project_name), '')
-        response = self._api_request('POST', path)
+        fields = {}
+        if owner is not None:
+            fields['namespace'] = owner
+        response = self._api_request('POST', path, fields=fields)
         if response.status == 404:
             raise ForkingDisabled(project_name)
         if response.status == 409:
@@ -500,7 +503,7 @@
         try:
             target_project = self._get_project('%s/%s' % (owner, project))
         except NoSuchProject:
-            target_project = self._fork_project(base_project)
+            target_project = self._fork_project(base_project, owner=owner)
         remote_repo_url = git_url_to_bzr_url(target_project['ssh_url_to_repo'])
         remote_dir = controldir.ControlDir.open(remote_repo_url)
         try: