Merge lp:~jelmer/brz/forge into lp:brz

[Jelmer Vernooij]

s/Hoster/Forge/

s/Hoster/Forge/

[Jelmer Vernooij (jelmer)]

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/960/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/961/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/962/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/965/

=== modified file 'breezy/plugins/github/__init__.py'
--- breezy/plugins/github/__init__.py	2020-06-01 14:06:02 +0000
+++ breezy/plugins/github/__init__.py	2022-07-08 09:31:18 +0000
@@ -24,8 +24,8 @@
 plugin_cmds.register_lazy("cmd_github_login", ["gh-login"], __name__ + ".cmds")
 
 
-from ...propose import hosters
-hosters.register_lazy("github", __name__ + '.hoster', "GitHub")
+from ...propose import forges
+forges.register_lazy("github", __name__ + '.forge', "GitHub")
 
 
 def test_suite():

=== renamed file 'breezy/plugins/github/hoster.py' => 'breezy/plugins/github/forge.py'
--- breezy/plugins/github/hoster.py	2021-08-19 16:05:04 +0000
+++ breezy/plugins/github/forge.py	2022-07-08 09:31:18 +0000
@@ -21,15 +21,15 @@
 
 from ...propose import (
     determine_title,
-    Hoster,
-    HosterLoginRequired,
+    Forge,
+    ForgeLoginRequired,
     MergeProposal,
     MergeProposalBuilder,
     MergeProposalExists,
     NoSuchProject,
     PrerequisiteBranchUnsupported,
     ReopenFailed,
-    UnsupportedHoster,
+    UnsupportedForge,
     )
 
 from ... import (
@@ -91,7 +91,7 @@
         self.url = url
 
 
-class GitHubLoginRequired(HosterLoginRequired):
+class GitHubLoginRequired(ForgeLoginRequired):
 
     _fmt = "Action requires GitHub login."
 
@@ -259,7 +259,7 @@
     return url.split('{')[0]
 
 
-class GitHub(Hoster):
+class GitHub(Forge):
 
     name = 'github'
 
@@ -534,7 +534,7 @@
         try:
             parse_github_url(url)
         except NotGitHubUrl:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         transport = get_transport(
             API_GITHUB_URL, possible_transports=possible_transports)
         return cls(transport)
@@ -565,7 +565,7 @@
             yield GitHubMergeProposal(self, json.loads(response.text))
 
     def get_proposal_by_url(self, url):
-        raise UnsupportedHoster(url)
+        raise UnsupportedForge(url)
 
     def iter_my_forks(self, owner=None):
         if owner:

=== modified file 'breezy/plugins/gitlab/__init__.py'
--- breezy/plugins/gitlab/__init__.py	2020-06-01 13:58:16 +0000
+++ breezy/plugins/gitlab/__init__.py	2022-07-08 09:31:18 +0000
@@ -24,8 +24,8 @@
 plugin_cmds.register_lazy("cmd_gitlab_login", ["gl-login"], __name__ + ".cmds")
 
 
-from ...propose import hosters
-hosters.register_lazy("gitlab", __name__ + '.hoster', "GitLab")
+from ...propose import forges
+forges.register_lazy("gitlab", __name__ + '.forge', "GitLab")
 
 
 def test_suite():

=== modified file 'breezy/plugins/gitlab/cmds.py'
--- breezy/plugins/gitlab/cmds.py	2021-10-23 21:51:23 +0000
+++ breezy/plugins/gitlab/cmds.py	2022-07-08 09:31:18 +0000
@@ -58,7 +58,7 @@
 
     def run(self, url, private_token=None, name=None, no_check=False):
         from breezy import ui
-        from .hoster import store_gitlab_token
+        from .forge import store_gitlab_token
         if name is None:
             try:
                 name = urlutils.parse_url(url)[3].split('.')[-2]
@@ -71,6 +71,6 @@
             private_token = ui.ui_factory.get_password(u'Private token')
         if not no_check:
             from breezy.transport import get_transport
-            from .hoster import GitLab
+            from .forge import GitLab
             GitLab(get_transport(url), private_token=private_token)
         store_gitlab_token(name=name, url=url, private_token=private_token)

=== renamed file 'breezy/plugins/gitlab/hoster.py' => 'breezy/plugins/gitlab/forge.py'
--- breezy/plugins/gitlab/hoster.py	2022-03-09 20:58:17 +0000
+++ breezy/plugins/gitlab/forge.py	2022-07-08 09:31:18 +0000
@@ -34,15 +34,15 @@
 
 from ...propose import (
     determine_title,
-    Hoster,
+    Forge,
     MergeProposal,
     MergeProposalBuilder,
     MergeProposalExists,
     NoSuchProject,
     PrerequisiteBranchUnsupported,
     SourceNotDerivedFromTarget,
-    UnsupportedHoster,
-    HosterLoginRequired,
+    UnsupportedForge,
+    ForgeLoginRequired,
     )
 
 
@@ -107,9 +107,9 @@
         self.target_host = target_host
 
 
-class GitLabLoginMissing(HosterLoginRequired):
+class GitLabLoginMissing(ForgeLoginRequired):
 
-    _fmt = ("Please log into GitLab instance at %(hoster)s")
+    _fmt = ("Please log into GitLab instance at %(forge)s")
 
 
 class GitlabLoginError(errors.BzrError):
@@ -354,8 +354,8 @@
     return git_url_to_bzr_url(url, branch=name)
 
 
-class GitLab(Hoster):
-    """GitLab hoster implementation."""
+class GitLab(Forge):
+    """GitLab forge implementation."""
 
     supports_merge_proposal_labels = True
     supports_merge_proposal_commit_message = False
@@ -708,14 +708,14 @@
                 raise GitLabLoginMissing(self.base_url)
             else:
                 raise GitlabLoginError(response.text)
-        raise UnsupportedHoster(self.base_url)
+        raise UnsupportedForge(self.base_url)
 
     @classmethod
     def probe_from_url(cls, url, possible_transports=None):
         try:
             (host, project) = parse_gitlab_url(url)
         except NotGitLabUrl:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         transport = get_transport(
             'https://%s' % host, possible_transports=possible_transports)
         credentials = get_credentials_by_url(transport.base)
@@ -727,13 +727,13 @@
             resp = transport.request(
                 'GET', 'https://%s/api/v4/projects/%s' % (host, urlutils.quote(str(project), '')))
         except errors.UnexpectedHttpStatus as e:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         else:
             if not resp.getheader('X-Gitlab-Feature-Category'):
-                raise UnsupportedHoster(url)
+                raise UnsupportedForge(url)
             if resp.status in (200, 401):
                 raise GitLabLoginMissing('https://%s/' % host)
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
 
     @classmethod
     def iter_instances(cls):
@@ -764,14 +764,14 @@
         try:
             (host, project, merge_id) = parse_gitlab_merge_request_url(url)
         except NotGitLabUrl:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         except NotMergeRequestUrl as e:
             if self.base_hostname == e.host:
                 raise
             else:
-                raise UnsupportedHoster(url)
+                raise UnsupportedForge(url)
         if self.base_hostname != host:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         project = self._get_project(project)
         mr = self._get_merge_request(project['path_with_namespace'], merge_id)
         return GitLabMergeProposal(self, mr)

=== modified file 'breezy/plugins/gitlab/tests/__init__.py'
--- breezy/plugins/gitlab/tests/__init__.py	2020-06-01 13:58:16 +0000
+++ breezy/plugins/gitlab/tests/__init__.py	2022-07-08 09:31:18 +0000
@@ -19,8 +19,8 @@
 
 def test_suite():
     result = TestSuite()
-    from . import test_hoster
+    from . import test_forge
 
     loader = TestLoader()
-    result.addTests(loader.loadTestsFromModule(test_hoster))
+    result.addTests(loader.loadTestsFromModule(test_forge))
     return result

=== renamed file 'breezy/plugins/gitlab/tests/test_hoster.py' => 'breezy/plugins/gitlab/tests/test_forge.py'
--- breezy/plugins/gitlab/tests/test_hoster.py	2020-06-01 13:58:16 +0000
+++ breezy/plugins/gitlab/tests/test_forge.py	2022-07-08 09:31:18 +0000
@@ -16,7 +16,7 @@
 
 from breezy.tests import TestCase
 
-from breezy.plugins.gitlab.hoster import (
+from breezy.plugins.gitlab.forge import (
     parse_gitlab_merge_request_url,
     NotMergeRequestUrl,
     NotGitLabUrl,

=== modified file 'breezy/plugins/launchpad/__init__.py'
--- breezy/plugins/launchpad/__init__.py	2020-06-01 21:57:00 +0000
+++ breezy/plugins/launchpad/__init__.py	2022-07-08 09:31:18 +0000
@@ -124,5 +124,5 @@
                         'Using Bazaar with Launchpad.net')
 
 
-from ...propose import hosters
-hosters.register_lazy("launchpad", __name__ + '.hoster', "Launchpad")
+from ...propose import forges
+forges.register_lazy("launchpad", __name__ + '.forge', "Launchpad")

=== renamed file 'breezy/plugins/launchpad/hoster.py' => 'breezy/plugins/launchpad/forge.py'
--- breezy/plugins/launchpad/hoster.py	2021-09-28 12:08:32 +0000
+++ breezy/plugins/launchpad/forge.py	2022-07-08 09:31:18 +0000
@@ -22,12 +22,12 @@
 import tempfile
 
 from ...propose import (
-    Hoster,
+    Forge,
     LabelsUnsupported,
     MergeProposal,
     MergeProposalBuilder,
     MergeProposalExists,
-    UnsupportedHoster,
+    UnsupportedForge,
     )
 
 from ... import (
@@ -208,7 +208,7 @@
         self._mp.createComment(content=body)
 
 
-class Launchpad(Hoster):
+class Launchpad(Forge):
     """The Launchpad hosting service."""
 
     name = 'launchpad'
@@ -259,7 +259,7 @@
     def probe_from_url(cls, url, possible_transports=None):
         if plausible_launchpad_url(url):
             return Launchpad(uris.LPNET_SERVICE_ROOT)
-        raise UnsupportedHoster(url)
+        raise UnsupportedForge(url)
 
     def _get_lp_git_ref_from_branch(self, branch):
         url, params = urlutils.split_segment_parameters(branch.user_url)
@@ -503,9 +503,9 @@
         LAUNCHPAD_CODE_DOMAINS = [
             ('code.%s' % domain) for domain in lp_uris.LAUNCHPAD_DOMAINS.values()]
         if host not in LAUNCHPAD_CODE_DOMAINS:
-            raise UnsupportedHoster(url)
+            raise UnsupportedForge(url)
         # TODO(jelmer): Check if this is a launchpad URL. Otherwise, raise
-        # UnsupportedHoster
+        # UnsupportedForge
         # See https://api.launchpad.net/devel/#branch_merge_proposal
         # the syntax is:
         # https://api.launchpad.net/devel/~<author.name>/<project.name>/<branch.name>/+merge/<id>

=== modified file 'breezy/plugins/propose/__init__.py'
--- breezy/plugins/propose/__init__.py	2020-07-28 02:11:05 +0000
+++ breezy/plugins/propose/__init__.py	2022-07-08 09:31:18 +0000
@@ -26,7 +26,7 @@
 plugin_cmds.register_lazy(
     "cmd_my_merge_proposals", ["my-proposals"],
     __name__ + ".cmds")
-plugin_cmds.register_lazy("cmd_hosters", [], __name__ + ".cmds")
+plugin_cmds.register_lazy("cmd_forges", [], __name__ + ".cmds")
 
 
 def test_suite():

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2022-02-28 22:48:07 +0000
+++ breezy/plugins/propose/cmds.py	2022-07-08 09:31:18 +0000
@@ -89,8 +89,8 @@
         _check_already_merged(local_branch, submit_branch)
         if name is None:
             name = branch_name(local_branch)
-        hoster = _mod_propose.get_hoster(submit_branch)
-        remote_branch, public_url = hoster.publish_derived(
+        forge = _mod_propose.get_forge(submit_branch)
+        remote_branch, public_url = forge.publish_derived(
             local_branch, submit_branch, name=name, project=project,
             owner=owner, allow_lossy=not no_allow_lossy,
             overwrite=overwrite)
@@ -141,9 +141,9 @@
     takes_options = [
         'directory',
         RegistryOption(
-            'hoster',
-            help='Use the hoster.',
-            lazy_registry=('breezy.propose', 'hosters')),
+            'forge',
+            help='Use the forge.',
+            lazy_registry=('breezy.propose', 'forges')),
         ListOption('reviewers', short_name='R', type=str,
                    help='Requested reviewers.'),
         Option('name', help='Name of the new remote branch.', type=str),
@@ -167,7 +167,7 @@
 
     aliases = ['propose']
 
-    def run(self, submit_branch=None, directory='.', hoster=None,
+    def run(self, submit_branch=None, directory='.', forge=None,
             reviewers=None, name=None, no_allow_lossy=False, description=None,
             labels=None, prerequisite=None, commit_message=None, wip=False,
             allow_collaboration=False, allow_empty=False, overwrite=False):
@@ -183,13 +183,13 @@
         target = _mod_branch.Branch.open(submit_branch)
         if not allow_empty:
             _check_already_merged(branch, target)
-        if hoster is None:
-            hoster = _mod_propose.get_hoster(target)
+        if forge is None:
+            forge = _mod_propose.get_forge(target)
         else:
-            hoster = hoster.probe(target)
+            forge = forge.probe(target)
         if name is None:
             name = branch_name(branch)
-        remote_branch, public_branch_url = hoster.publish_derived(
+        remote_branch, public_branch_url = forge.publish_derived(
             branch, target, name=name, allow_lossy=not no_allow_lossy,
             overwrite=overwrite)
         branch.set_push_location(remote_branch.user_url)
@@ -199,7 +199,7 @@
             prerequisite_branch = _mod_branch.Branch.open(prerequisite)
         else:
             prerequisite_branch = None
-        proposal_builder = hoster.get_proposer(remote_branch, target)
+        proposal_builder = forge.get_proposer(remote_branch, target)
         if description is None:
             body = proposal_builder.get_initial_body()
             info = proposal_builder.get_infotext()
@@ -243,8 +243,8 @@
                 gettext("No target location specified or remembered"))
         else:
             target = _mod_branch.Branch.open(submit_branch)
-        hoster = _mod_propose.get_hoster(branch)
-        for mp in hoster.iter_proposals(branch, target):
+        forge = _mod_propose.get_forge(branch)
+        for mp in forge.iter_proposals(branch, target):
             self.outf.write(gettext('Merge proposal: %s\n') % mp.url)
 
 
@@ -269,14 +269,14 @@
             merged='Merged merge proposals',
             closed='Closed merge proposals'),
         RegistryOption(
-            'hoster',
-            help='Use the hoster.',
-            lazy_registry=('breezy.propose', 'hosters')),
+            'forge',
+            help='Use the forge.',
+            lazy_registry=('breezy.propose', 'forges')),
         ]
 
-    def run(self, status='open', verbose=False, hoster=None, base_url=None):
+    def run(self, status='open', verbose=False, forge=None, base_url=None):
 
-        for instance in _mod_propose.iter_hoster_instances(hoster=hoster):
+        for instance in _mod_propose.iter_forge_instances(forge=forge):
             if base_url is not None and instance.base_url != base_url:
                 continue
             try:
@@ -299,7 +299,7 @@
                                 ['\t%s\n' % l
                                  for l in description.splitlines()])
                         self.outf.write('\n')
-            except _mod_propose.HosterLoginRequired as e:
+            except _mod_propose.ForgeLoginRequired as e:
                 warning('Skipping %s, login required.', instance)
 
 
@@ -315,13 +315,13 @@
         proposal.merge(commit_message=message)
 
 
-class cmd_hosters(Command):
+class cmd_forges(Command):
     __doc__ = """List all known hosting sites and user details."""
 
     hidden = True
 
     def run(self):
-        for instance in _mod_propose.iter_hoster_instances():
+        for instance in _mod_propose.iter_forge_instances():
             current_user = instance.get_current_user()
             if current_user is not None:
                 current_user_url = instance.get_user_url(current_user)

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2021-08-29 19:06:53 +0000
+++ breezy/propose.py	2022-07-08 09:31:18 +0000
@@ -45,9 +45,9 @@
         self.existing_proposal = existing_proposal
 
 
-class UnsupportedHoster(errors.BzrError):
+class UnsupportedForge(errors.BzrError):
 
-    _fmt = "No supported hoster for %(branch)s."
+    _fmt = "No supported forge for %(branch)s."
 
     def __init__(self, branch):
         errors.BzrError.__init__(self)
@@ -73,31 +73,31 @@
 
 
 class LabelsUnsupported(errors.BzrError):
-    """Labels not supported by this hoster."""
-
-    _fmt = "Labels are not supported by %(hoster)r."
-
-    def __init__(self, hoster):
+    """Labels not supported by this forge."""
+
+    _fmt = "Labels are not supported by %(forge)r."
+
+    def __init__(self, forge):
         errors.BzrError.__init__(self)
-        self.hoster = hoster
+        self.forge = forge
 
 
 class PrerequisiteBranchUnsupported(errors.BzrError):
-    """Prerequisite branch not supported by this hoster."""
-
-    def __init__(self, hoster):
-        errors.BzrError.__init__(self)
-        self.hoster = hoster
-
-
-class HosterLoginRequired(errors.BzrError):
-    """Action requires hoster login credentials."""
-
-    _fmt = "Action requires credentials for hosting site %(hoster)r."""
-
-    def __init__(self, hoster):
-        errors.BzrError.__init__(self)
-        self.hoster = hoster
+    """Prerequisite branch not supported by this forge."""
+
+    def __init__(self, forge):
+        errors.BzrError.__init__(self)
+        self.forge = forge
+
+
+class ForgeLoginRequired(errors.BzrError):
+    """Action requires forge login credentials."""
+
+    _fmt = "Action requires credentials for hosting site %(forge)r."""
+
+    def __init__(self, forge):
+        errors.BzrError.__init__(self)
+        self.forge = forge
 
 
 class SourceNotDerivedFromTarget(errors.BzrError):
@@ -249,11 +249,11 @@
         raise NotImplementedError(self.create_proposal)
 
 
-class Hoster(object):
+class Forge(object):
     """A hosting site manager.
     """
 
-    # Does this hoster support arbitrary labels being attached to merge
+    # Does this forge support arbitrary labels being attached to merge
     # proposals?
     supports_merge_proposal_labels = None
 
@@ -262,7 +262,7 @@
         """Name of this instance."""
         return "%s at %s" % (type(self).__name__, self.base_url)
 
-    # Does this hoster support suggesting a commit message in the
+    # Does this forge support suggesting a commit message in the
     # merge proposal?
     supports_merge_proposal_commit_message = None
 
@@ -274,7 +274,7 @@
     # Common values: 'plain', 'markdown'
     merge_proposal_description_format = None
 
-    # Does this hoster support the allow_collaboration flag?
+    # Does this forge support the allow_collaboration flag?
     supports_allow_collaboration = False
 
     def publish_derived(self, new_branch, base_branch, name, project=None,
@@ -285,7 +285,7 @@
         :param base_branch: branch to derive the new branch from
         :param new_branch: branch to publish
         :return: resulting branch, public URL
-        :raise HosterLoginRequired: Action requires a hoster login, but none is
+        :raise ForgeLoginRequired: Action requires a forge login, but none is
             known.
         """
         raise NotImplementedError(self.publish_derived)
@@ -302,7 +302,7 @@
     def get_proposer(self, source_branch, target_branch):
         """Get a merge proposal creator.
 
-        :note: source_branch does not have to be hosted by the hoster.
+        :note: source_branch does not have to be hosted by the forge.
 
         :param source_branch: Source branch
         :param target_branch: Target branch
@@ -325,24 +325,24 @@
 
         :param url: Merge proposal URL.
         :return: MergeProposal object
-        :raise UnsupportedHoster: Hoster does not support this URL
+        :raise UnsupportedForge: Forge does not support this URL
         """
         raise NotImplementedError(self.get_proposal_by_url)
 
     def hosts(self, branch):
-        """Return true if this hoster hosts given branch."""
+        """Return true if this forge hosts given branch."""
         raise NotImplementedError(self.hosts)
 
     @classmethod
     def probe_from_branch(cls, branch):
-        """Create a Hoster object if this hoster knows about a branch."""
+        """Create a Forge object if this forge knows about a branch."""
         url = urlutils.strip_segment_parameters(branch.user_url)
         return cls.probe_from_url(
             url, possible_transports=[branch.control_transport])
 
     @classmethod
-    def probe_from_url(cls, url, possible_hosters=None):
-        """Create a Hoster object if this hoster knows about a URL."""
+    def probe_from_url(cls, url, possible_forges=None):
+        """Create a Forge object if this forge knows about a URL."""
         raise NotImplementedError(cls.probe_from_url)
 
     def iter_my_proposals(self, status='open', author=None):
@@ -352,7 +352,7 @@
             (one of: 'open', 'closed', 'merged', 'all')
         :param author: Name of author to query (defaults to current user)
         :return: Iterator over MergeProposal objects
-        :raise HosterLoginRequired: Action requires a hoster login, but none is
+        :raise ForgeLoginRequired: Action requires a forge login, but none is
             known.
         """
         raise NotImplementedError(self.iter_my_proposals)
@@ -374,7 +374,7 @@
     def iter_instances(cls):
         """Iterate instances.
 
-        :return: Hoster instances
+        :return: Forge instances
         """
         raise NotImplementedError(cls.iter_instances)
 
@@ -405,41 +405,41 @@
         return firstline[:i]
 
 
-def get_hoster(branch, possible_hosters=None):
-    """Find the hoster for a branch.
+def get_forge(branch, possible_forges=None):
+    """Find the forge for a branch.
 
-    :param branch: Branch to find hoster for
-    :param possible_hosters: Optional list of hosters to reuse
-    :raise UnsupportedHoster: if there is no hoster that supports `branch`
-    :return: A `Hoster` object
+    :param branch: Branch to find forge for
+    :param possible_forges: Optional list of forges to reuse
+    :raise UnsupportedForge: if there is no forge that supports `branch`
+    :return: A `Forge` object
     """
-    if possible_hosters:
-        for hoster in possible_hosters:
-            if hoster.hosts(branch):
-                return hoster
-    for name, hoster_cls in hosters.items():
+    if possible_forges:
+        for forge in possible_forges:
+            if forge.hosts(branch):
+                return forge
+    for name, forge_cls in forges.items():
         try:
-            hoster = hoster_cls.probe_from_branch(branch)
-        except UnsupportedHoster:
+            forge = forge_cls.probe_from_branch(branch)
+        except UnsupportedForge:
             pass
         else:
-            if possible_hosters is not None:
-                possible_hosters.append(hoster)
-            return hoster
-    raise UnsupportedHoster(branch)
-
-
-def iter_hoster_instances(hoster=None):
-    """Iterate over all known hoster instances.
-
-    :return: Iterator over Hoster instances
+            if possible_forges is not None:
+                possible_forges.append(forge)
+            return forge
+    raise UnsupportedForge(branch)
+
+
+def iter_forge_instances(forge=None):
+    """Iterate over all known forge instances.
+
+    :return: Iterator over Forge instances
     """
-    if hoster is None:
-        hoster_clses = [hoster_cls for name, hoster_cls in hosters.items()]
+    if forge is None:
+        forge_clses = [forge_cls for name, forge_cls in forges.items()]
     else:
-        hoster_clses = [hoster]
-    for hoster_cls in hoster_clses:
-        for instance in hoster_cls.iter_instances():
+        forge_clses = [forge]
+    for forge_cls in forge_clses:
+        for instance in forge_cls.iter_instances():
             yield instance
 
 
@@ -447,15 +447,15 @@
     """Get the proposal object associated with a URL.
 
     :param url: URL of the proposal
-    :raise UnsupportedHoster: if there is no hoster that supports the URL
+    :raise UnsupportedForge: if there is no forge that supports the URL
     :return: A `MergeProposal` object
     """
-    for instance in iter_hoster_instances():
+    for instance in iter_forge_instances():
         try:
             return instance.get_proposal_by_url(url)
-        except UnsupportedHoster:
+        except UnsupportedForge:
             pass
-    raise UnsupportedHoster(url)
-
-
-hosters = registry.Registry()
+    raise UnsupportedForge(url)
+
+
+forges = registry.Registry()

=== modified file 'breezy/tests/test_propose.py'
--- breezy/tests/test_propose.py	2021-03-27 10:37:44 +0000
+++ breezy/tests/test_propose.py	2022-07-08 09:31:18 +0000
@@ -19,10 +19,10 @@
 from ..propose import (
     determine_title,
     get_proposal_by_url,
-    get_hoster,
-    Hoster,
+    get_forge,
+    Forge,
     MergeProposal,
-    UnsupportedHoster,
+    UnsupportedForge,
     )
 from .. import (
     propose as _mod_propose,
@@ -39,7 +39,7 @@
     """Sample merge proposal."""
 
 
-class SampleHoster(Hoster):
+class SampleForge(Forge):
 
     _locations = []
 
@@ -52,7 +52,7 @@
         for b in cls._locations:
             if url.startswith(b):
                 return cls()
-        raise UnsupportedHoster(url)
+        raise UnsupportedForge(url)
 
     def hosts(self, branch):
         for b in self._locations:
@@ -68,42 +68,42 @@
         for b in self._locations:
             if url.startswith(b):
                 return MergeProposal()
-        raise UnsupportedHoster(url)
-
-
-class SampleHosterTestCase(tests.TestCaseWithTransport):
+        raise UnsupportedForge(url)
+
+
+class SampleForgeTestCase(tests.TestCaseWithTransport):
 
     def setUp(self):
-        super(SampleHosterTestCase, self).setUp()
-        self._old_hosters = _mod_propose.hosters
-        _mod_propose.hosters = registry.Registry()
-        self.hoster = SampleHoster()
+        super(SampleForgeTestCase, self).setUp()
+        self._old_forges = _mod_propose.forges
+        _mod_propose.forges = registry.Registry()
+        self.forge = SampleForge()
         os.mkdir('hosted')
-        SampleHoster._add_location(
+        SampleForge._add_location(
             urlutils.local_path_to_url(os.path.join(self.test_dir, 'hosted')))
-        _mod_propose.hosters.register('sample', self.hoster)
+        _mod_propose.forges.register('sample', self.forge)
 
     def tearDown(self):
-        super(SampleHosterTestCase, self).tearDown()
-        _mod_propose.hosters = self._old_hosters
-        SampleHoster._locations = []
-
-
-class TestGetHosterTests(SampleHosterTestCase):
-
-    def test_get_hoster(self):
+        super(SampleForgeTestCase, self).tearDown()
+        _mod_propose.forges = self._old_forges
+        SampleForge._locations = []
+
+
+class TestGetForgeTests(SampleForgeTestCase):
+
+    def test_get_forge(self):
         tree = self.make_branch_and_tree('hosted/branch')
-        self.assertIs(self.hoster, get_hoster(tree.branch, [self.hoster]))
-        self.assertIsInstance(get_hoster(tree.branch), SampleHoster)
+        self.assertIs(self.forge, get_forge(tree.branch, [self.forge]))
+        self.assertIsInstance(get_forge(tree.branch), SampleForge)
 
         tree = self.make_branch_and_tree('blah')
-        self.assertRaises(UnsupportedHoster, get_hoster, tree.branch)
-
-
-class TestGetProposal(SampleHosterTestCase):
+        self.assertRaises(UnsupportedForge, get_forge, tree.branch)
+
+
+class TestGetProposal(SampleForgeTestCase):
 
     def test_get_proposal_by_url(self):
-        self.assertRaises(UnsupportedHoster, get_proposal_by_url, 'blah')
+        self.assertRaises(UnsupportedForge, get_proposal_by_url, 'blah')
 
         url = urlutils.local_path_to_url(os.path.join(self.test_dir, 'hosted', 'proposal'))
         self.assertIsInstance(get_proposal_by_url(url), MergeProposal)