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

[Jelmer Vernooij]

Several small improvements to merge proposal commands.

Several small improvements to merge proposal commands.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-08-27 23:59:30 +0000
+++ breezy/plugins/propose/cmds.py	2020-08-30 17:24:02 +0000
@@ -146,7 +146,7 @@
         RegistryOption(
             'hoster',
             help='Use the hoster.',
-            lazy_registry=('breezy.plugins.propose.propose', 'hosters')),
+            lazy_registry=('breezy.propose', 'hosters')),
         ListOption('reviewers', short_name='R', type=text_type,
                    help='Requested reviewers.'),
         Option('name', help='Name of the new remote branch.', type=str),
@@ -258,6 +258,7 @@
 
     hidden = True
 
+    takes_args = ['base-url?']
     takes_options = [
         'verbose',
         RegistryOption.from_kwargs(
@@ -269,18 +270,32 @@
             all='All merge proposals',
             open='Open merge proposals',
             merged='Merged merge proposals',
-            closed='Closed merge proposals')]
-
-    def run(self, status='open', verbose=False):
-        for instance in _mod_propose.iter_hoster_instances():
+            closed='Closed merge proposals'),
+        RegistryOption(
+            'hoster',
+            help='Use the hoster.',
+            lazy_registry=('breezy.propose', 'hosters')),
+        ]
+
+    def run(self, status='open', verbose=False, hoster=None, base_url=None):
+
+        for instance in _mod_propose.iter_hoster_instances(hoster=hoster):
+            if base_url is not None and instance.base_url != base_url:
+                continue
             try:
                 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()))
+                        source_branch_url = mp.get_source_branch_url()
+                        if source_branch_url:
+                            self.outf.write(
+                                '(Merging %s into %s)\n' %
+                                (source_branch_url,
+                                 mp.get_target_branch_url()))
+                        else:
+                            self.outf.write(
+                                '(Merging into %s)\n' %
+                                mp.get_target_branch_url())
                         description = mp.get_description()
                         if description:
                             self.outf.writelines(
@@ -312,10 +327,17 @@
         for instance in _mod_propose.iter_hoster_instances():
             current_user = instance.get_current_user()
             if current_user is not None:
-                self.outf.write(
-                    gettext('%s (%s) - user: %s (%s)\n') % (
-                        instance.name, instance.base_url,
-                        current_user, instance.get_user_url(current_user)))
+                current_user_url = instance.get_user_url(current_user)
+                if current_user_url is not None:
+                    self.outf.write(
+                        gettext('%s (%s) - user: %s (%s)\n') % (
+                            instance.name, instance.base_url,
+                            current_user, current_user_url))
+                else:
+                    self.outf.write(
+                        gettext('%s (%s) - user: %s\n') % (
+                            instance.name, instance.base_url,
+                            current_user))
             else:
                 self.outf.write(
                     gettext('%s (%s) - not logged in\n') % (

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2020-08-02 03:22:34 +0000
+++ breezy/propose.py	2020-08-30 17:24:02 +0000
@@ -412,12 +412,16 @@
     raise UnsupportedHoster(branch)
 
 
-def iter_hoster_instances():
+def iter_hoster_instances(hoster=None):
     """Iterate over all known hoster instances.
 
     :return: Iterator over Hoster instances
     """
-    for name, hoster_cls in hosters.items():
+    if hoster is None:
+        hoster_clses = [hoster_cls for name, hoster_cls in hosters.items()]
+    else:
+        hoster_clses = [hoster]
+    for hoster_cls in hoster_clses:
         for instance in hoster_cls.iter_instances():
             yield instance