Merge lp:~jelmer/brz/hoster-metadata into lp:brz/3.1

[Jelmer Vernooij]

Add current user, profile url and name metadata to Hoster.

Add current user, profile url and name metadata to Hoster.

[Jelmer Vernooij (jelmer)]

review: Approve

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/241/

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/242/

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2020-07-15 21:51:27 +0000
+++ breezy/plugins/github/hoster.py	2020-07-24 17:49:00 +0000
@@ -127,6 +127,8 @@
     def __repr__(self):
         return "<%s at %r>" % (type(self).__name__, self.url)
 
+    name = 'GitHub'
+
     @property
     def url(self):
         return self._pr['html_url']
@@ -563,6 +565,12 @@
             return json.loads(response.text)
         raise UnexpectedHttpStatus(path, response.status)
 
+    def get_current_user(self):
+        return self.current_user['login']
+
+    def get_user_url(self, username):
+        return urlutils.join(self.base_url, username)
+
 
 class GitHubMergeProposalBuilder(MergeProposalBuilder):
 

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2020-07-22 22:17:48 +0000
+++ breezy/plugins/gitlab/hoster.py	2020-07-24 17:49:00 +0000
@@ -395,9 +395,12 @@
             project = self._get_project(project['path_with_namespace'])
         return project
 
-    def _get_logged_in_username(self):
+    def get_current_user(self):
         return self._current_user['username']
 
+    def get_user_url(self, username):
+        return urlutils.join(self.base_url, username)
+
     def _list_paged(self, path, parameters=None, per_page=None):
         if parameters is None:
             parameters = {}
@@ -497,7 +500,7 @@
                         allow_lossy=True, tag_selector=None):
         (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
         if owner is None:
-            owner = self._get_logged_in_username()
+            owner = self.get_current_user()
         if project is None:
             project = self._get_project(base_project)['path']
         try:
@@ -523,7 +526,7 @@
     def get_derived_branch(self, base_branch, name, project=None, owner=None):
         (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
         if owner is None:
-            owner = self._get_logged_in_username()
+            owner = self.get_current_user()
         if project is None:
             project = self._get_project(base_project)['path']
         try:
@@ -599,11 +602,11 @@
     def iter_my_proposals(self, status='open'):
         state = mp_status_to_status(status)
         for mp in self._list_merge_requests(
-                owner=self._get_logged_in_username(), state=state):
+                owner=self.get_current_user(), state=state):
             yield GitLabMergeProposal(self, mp)
 
     def iter_my_forks(self):
-        for project in self._list_projects(owner=self._get_logged_in_username()):
+        for project in self._list_projects(owner=self.get_current_user()):
             base_project = project.get('forked_from_project')
             if not base_project:
                 continue

=== modified file 'breezy/plugins/launchpad/hoster.py'
--- breezy/plugins/launchpad/hoster.py	2020-07-23 01:22:40 +0000
+++ breezy/plugins/launchpad/hoster.py	2020-07-24 17:49:00 +0000
@@ -229,6 +229,12 @@
         self._launchpad = None
 
     @property
+    def name(self):
+        if self._api_base_url == uris.LPNET_SERVICE_ROOT:
+            return 'Launchpad'
+        return 'Launchpad at %s' % self.base_url
+
+    @property
     def launchpad(self):
         if self._launchpad is None:
             self._launchpad = lp_api.connect_launchpad(self._api_base_url, version='devel')
@@ -241,6 +247,12 @@
     def __repr__(self):
         return "Launchpad(service_root=%s)" % self._api_base_url
 
+    def get_current_user(self):
+        return self.launchpad.me.name
+
+    def get_user_url(self, username):
+        return self.launchpad.people[username].web_link
+
     def hosts(self, branch):
         # TODO(jelmer): staging vs non-staging?
         return plausible_launchpad_url(branch.user_url)

=== modified file 'breezy/plugins/propose/__init__.py'
--- breezy/plugins/propose/__init__.py	2020-06-01 21:28:34 +0000
+++ breezy/plugins/propose/__init__.py	2020-07-24 17:49:00 +0000
@@ -28,6 +28,7 @@
 plugin_cmds.register_lazy(
     "cmd_my_merge_proposals", ["my-proposals"],
     __name__ + ".cmds")
+plugin_cmds.register_lazy("cmd_hosters", [], __name__ + ".cmds")
 
 
 def test_suite():

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-06-21 02:15:25 +0000
+++ breezy/plugins/propose/cmds.py	2020-07-24 17:49:00 +0000
@@ -270,21 +270,20 @@
             closed='Closed merge proposals')]
 
     def run(self, status='open', verbose=False):
-        for name, hoster_cls in _mod_propose.hosters.items():
-            for instance in hoster_cls.iter_instances():
-                for mp in instance.iter_my_proposals(status=status):
-                    self.outf.write('%s\n' % mp.url)
-                    if verbose:
-                        self.outf.write(
-                            '(Merging %s into %s)\n' %
-                            (mp.get_source_branch_url(),
-                             mp.get_target_branch_url()))
-                        description = mp.get_description()
-                        if description:
-                            self.outf.writelines(
-                                ['\t%s\n' % l
-                                 for l in description.splitlines()])
-                        self.outf.write('\n')
+        for instance in _mod_propose.iter_hoster_instances():
+            for mp in instance.iter_my_proposals(status=status):
+                self.outf.write('%s\n' % mp.url)
+                if verbose:
+                    self.outf.write(
+                        '(Merging %s into %s)\n' %
+                        (mp.get_source_branch_url(),
+                         mp.get_target_branch_url()))
+                    description = mp.get_description()
+                    if description:
+                        self.outf.writelines(
+                            ['\t%s\n' % l
+                             for l in description.splitlines()])
+                    self.outf.write('\n')
 
 
 class cmd_land_merge_proposal(Command):
@@ -297,3 +296,17 @@
     def run(self, url, message=None):
         proposal = _mod_propose.get_proposal_by_url(url)
         proposal.merge(commit_message=message)
+
+
+class cmd_hosters(Command):
+    __doc__ = """List all known hosting sites and user details."""
+
+    hidden = True
+
+    def run(self):
+        for instance in _mod_propose.iter_hoster_instances():
+            current_user = instance.get_current_user()
+            self.outf.write(
+                gettext('%s (%s) - user: %s (%s)\n') % (
+                    instance.name, instance.base_url,
+                    current_user, instance.get_user_url(current_user)))

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2020-06-18 03:08:00 +0000
+++ breezy/propose.py	2020-07-24 17:49:00 +0000
@@ -240,6 +240,11 @@
     # proposals?
     supports_merge_proposal_labels = None
 
+    @property
+    def name(self):
+        """Name of this instance."""
+        return "%s at %s" % (type(self).__name__, self.base_url)
+
     # Does this hoster support suggesting a commit message in the
     # merge proposal?
     supports_merge_proposal_commit_message = None
@@ -266,7 +271,7 @@
         :raise HosterLoginRequired: Action requires a hoster login, but none is
             known.
         """
-        raise NotImplementedError(self.publish)
+        raise NotImplementedError(self.publish_derived)
 
     def get_derived_branch(self, base_branch, name, project=None, owner=None):
         """Get a derived branch ('a fork').
@@ -354,6 +359,17 @@
         """
         raise NotImplementedError(cls.iter_instances)
 
+    def get_current_user(self):
+        """Retrieve the name of the currently logged in user.
+
+        :return: Username or None if not logged in
+        """
+        raise NotImplementedError(self.get_current_user)
+
+    def get_user_url(self, user):
+        """Rerieve the web URL for a user."""
+        raise NotImplementedError(self.get_user_url)
+
 
 def determine_title(description):
     """Determine the title for a merge proposal based on full description."""
@@ -384,6 +400,16 @@
     raise UnsupportedHoster(branch)
 
 
+def iter_hoster_instances():
+    """Iterate over all known hoster instances.
+
+    :return: Iterator over Hoster instances
+    """
+    for name, hoster_cls in hosters.items():
+        for instance in hoster_cls.iter_instances():
+            yield instance
+
+
 def get_proposal_by_url(url):
     """Get the proposal object associated with a URL.
 
@@ -391,12 +417,11 @@
     :raise UnsupportedHoster: if there is no hoster that supports the URL
     :return: A `MergeProposal` object
     """
-    for name, hoster_cls in hosters.items():
-        for instance in hoster_cls.iter_instances():
-            try:
-                return instance.get_proposal_by_url(url)
-            except UnsupportedHoster:
-                pass
+    for instance in iter_hoster_instances():
+        try:
+            return instance.get_proposal_by_url(url)
+        except UnsupportedHoster:
+            pass
     raise UnsupportedHoster(url)