Merge lp:~jelmer/brz/gitlab-create-project-1 into lp:brz/3.1

[Jelmer Vernooij]

Fix GitLab.create_project.

Fix GitLab.create_project.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2021-03-24 16:30:14 +0000
+++ breezy/git/remote.py	2021-03-27 16:42:43 +0000
@@ -511,7 +511,7 @@
             raise AlreadyBranchError(self.user_url)
         ref_chain, unused_sha = self.get_refs_container().follow(
             self._get_selected_ref(name))
-        if ref_chain and ref_chain[0] == b'HEAD':
+        if ref_chain and ref_chain[0] == b'HEAD' and len(ref_chain) > 1:
             refname = ref_chain[1]
         repo = self.open_repository()
         return RemoteGitBranch(self, repo, refname)

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2021-03-27 10:42:29 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-03-27 16:42:43 +0000
@@ -432,8 +432,24 @@
         _unexpected_status(path, response)
 
     def create_project(self, project_name):
-        fields = {'name': project_name}
+        if project_name.endswith('.git'):
+            project_name = project_name[:-4]
+        if '/' in project_name:
+            namespace, path = project_name.rsplit('/', 1)
+        else:
+            namespace = None
+            path = project_name
+        fields = {
+            'path': path,
+            'name': path.replace('-', '_'),
+            'namespace_path': namespace,
+            }
         response = self._api_request('POST', 'projects', fields=fields)
+        if response.status == 400:
+            ret = json.loads(response.data)
+            if ret.get("message", {}).get("path") == ["has already been taken"]:
+                raise errors.AlreadyControlDirError(project_name)
+            raise
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         if response.status not in (200, 201):