Merge lp:~jelmer/brz/hoster-supported-but into lp:brz/3.1

[Jelmer Vernooij]

Support probing for GitLab URLs.

Support probing for GitLab URLs.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2021-03-27 16:32:17 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-03-28 18:36:21 +0000
@@ -45,6 +45,7 @@
     PrerequisiteBranchUnsupported,
     SourceNotDerivedFromTarget,
     UnsupportedHoster,
+    HosterLoginRequired,
     )
 
 
@@ -109,9 +110,9 @@
         self.target_host = target_host
 
 
-class GitLabLoginMissing(errors.BzrError):
+class GitLabLoginMissing(HosterLoginRequired):
 
-    _fmt = ("Please log into GitLab")
+    _fmt = ("Please log into GitLab instance at %(hoster)s")
 
 
 class GitlabLoginError(errors.BzrError):
@@ -693,7 +694,12 @@
         return self.base_hostname == host
 
     def check(self):
-        response = self._api_request('GET', 'user')
+        try:
+            response = self._api_request('GET', 'user')
+        except errors.UnexpectedHttpStatus as e:
+            if e.code == 401:
+                raise GitLabLoginMissing()
+            raise
         if response.status == 200:
             self._current_user = json.loads(response.data)
             return
@@ -715,7 +721,17 @@
         credentials = get_credentials_by_url(transport.base)
         if credentials is not None:
             return cls(transport, credentials.get('private_token'))
-        raise UnsupportedHoster(url)
+        try:
+            resp = transport.request(
+                'GET', 'https://%s/api/v4/projects/%s' % (host, urlutils.quote(str(project), '')))
+        except errors.UnexpectedHttpStatus as e:
+            raise UnsupportedHoster(url)
+        else:
+            if not resp.getheader('X-Gitlab-Feature-Category'):
+                raise UnsupportedHoster(url)
+            if resp.status in (200, 401):
+                raise GitLabLoginMissing()
+            raise UnsupportedHoster(url)
 
     @classmethod
     def iter_instances(cls):