Merge lp:~jelmer/brz/fix-github into lp:brz/3.1

[Jelmer Vernooij]

Fix name error, lazily load user in GitHub.

Fix name error, lazily load user in GitHub.

[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/204/

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2020-06-18 03:08:00 +0000
+++ breezy/plugins/github/hoster.py	2020-07-11 22:20:20 +0000
@@ -388,7 +388,7 @@
         return self._list_paged(path, {'q': query}, per_page=DEFAULT_PER_PAGE)
 
     def _create_fork(self, path, owner=None):
-        if owner and owner != self._current_user['login']:
+        if owner and owner != self.current_user['login']:
             path += '?organization=%s' % owner
         response = self._api_request('POST', path)
         if response.status != 202:
@@ -402,7 +402,13 @@
     def __init__(self, transport):
         self._token = retrieve_github_token('https', GITHUB_HOST)
         self.transport = transport
-        self._current_user = self._get_user()
+        self._current_user = None
+
+    @property
+    def current_user(self):
+        if self._current_user is None:
+            self._current_user = self._get_user()
+        return self._current_user
 
     def publish_derived(self, local_branch, base_branch, name, project=None,
                         owner=None, revision_id=None, overwrite=False,
@@ -410,7 +416,7 @@
         base_owner, base_project, base_branch_name = parse_github_branch_url(base_branch)
         base_repo = self._get_repo(base_owner, base_project)
         if owner is None:
-            owner = self._current_user['login']
+            owner = self.current_user['login']
         if project is None:
             project = base_repo['name']
         try:
@@ -446,7 +452,7 @@
         base_owner, base_project, base_branch_name = parse_github_branch_url(base_branch)
         base_repo = self._get_repo(base_owner, base_project)
         if owner is None:
-            owner = self._current_user['login']
+            owner = self.current_user['login']
         if project is None:
             project = base_repo['name']
         try:
@@ -521,7 +527,7 @@
             query.append('is:closed')
         elif status == 'merged':
             query.append('is:merged')
-        query.append('author:%s' % self._current_user['login'])
+        query.append('author:%s' % self.current_user['login'])
         for issue in self._search_issues(query=' '.join(query)):
             url = issue['pull_request']['url']
             response = self._api_request('GET', url)
@@ -535,7 +541,7 @@
     def iter_my_forks(self):
         response = self._api_request('GET', '/user/repos')
         if response.status != 200:
-            raise InvalidHttpResponse(url, response.text)
+            raise InvalidHttpResponse(self.transport.user_url, response.text)
         for project in json.loads(response.text):
             if not project['fork']:
                 continue

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2020-06-25 00:06:34 +0000
+++ breezy/plugins/gitlab/hoster.py	2020-07-11 22:20:20 +0000
@@ -558,7 +558,7 @@
                 raise GitLabLoginMissing()
             else:
                 raise GitlabLoginError(response.text)
-        raise UnsupportedHoster(url)
+        raise UnsupportedHoster(self.base_url)
 
     @classmethod
     def probe_from_url(cls, url, possible_transports=None):

=== modified file 'breezy/plugins/launchpad/hoster.py'
--- breezy/plugins/launchpad/hoster.py	2020-06-22 10:25:04 +0000
+++ breezy/plugins/launchpad/hoster.py	2020-07-11 22:20:20 +0000
@@ -230,7 +230,14 @@
             lp_base_url = uris.STAGING_SERVICE_ROOT
         else:
             lp_base_url = uris.LPNET_SERVICE_ROOT
-        self.launchpad = lp_api.connect_launchpad(lp_base_url, version='devel')
+        self._api_base_url = lp_base_url
+        self._launchpad = None
+
+    @property
+    def launchpad(self):
+        if self._launchpad is None:
+            self._launchpad = lp_api.connect_launchpad(self._api_base_url, version='devel')
+        return self._launchpad
 
     @property
     def base_url(self):