Merge lp:~jelmer/brz/lp-check-vcs into lp:brz/3.3

[Jelmer Vernooij]

Improve handling of lp: URLs when lp: insteadOf is set in gitconfig

Improve handling of lp: URLs when lp: insteadOf is set in gitconfig:

* Simplify lp: URL resolution, just relying on API rather than local guessing
* Ignore lp: insteadOf when launchpad plugin is loaded
* Support both Git repositories and Bazaar repositories when resolving lp:
* Warn when lp: URL is ambiguous

[Jelmer Vernooij (jelmer)]

review: Approve

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

The attempt to merge lp:~jelmer/brz/lp-check-vcs into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.

... OUTPUT TRIMMED ...

breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_from_subdir(SFTPTransport,SFTPHomeDirServer) OK 41ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_from_subdir(SFTPTransport,SFTPSiblingAbsoluteServer) OK 41ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(LocalTransport,LocalURLServer) OK 69ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPAbsoluteServer) OK 94ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPHomeDirServer) OK 88ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPSiblingAbsoluteServer) OK 85ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(LocalTransport,LocalURLServer) OK 65ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPAbsoluteServer) OK 76ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPHomeDirServer) OK 71ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPSiblingAbsoluteServer) OK 73ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(LocalTransport,LocalURLServer) OK 55ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPAbsoluteServer) OK 75ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPHomeDirServer) OK 54ms
breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPSiblingAbsoluteServer) OK 57ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_no_upload_to_remote_working_tree(LocalTransport,LocalURLServer) OK 67ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_no_upload_to_remote_working_tree(SFTPTransport,SFTPAbsoluteServer) OK 93ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_no_upload_to_remote_working_tree(SFTPTransport,SFTPHomeDirServer) N/A 2ms
    Escaping test isolation
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_no_upload_to_remote_working_tree(SFTPTransport,SFTPSiblingAbsoluteServer) OK 98ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_upload_without_working_tree(LocalTransport,LocalURLServer) OK 70ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_upload_without_working_tree(SFTPTransport,SFTPAbsoluteServer) OK 108ms
breezy.plugins.upload.tests.test_upload.TestUploadFromRemoteBranch.test_upload_without_working_tree(SFTPTransport,SFTPHomeDirServer) N/A 2ms
    Escaping test isola...

[lp:~jelmer/brz/lp-check-vcs]

7805. By Jelmer Vernooij on 2023-07-17

Drop now irrelevant tests

=== modified file 'Cargo.toml'
--- Cargo.toml	2023-02-14 02:35:03 +0000
+++ Cargo.toml	2023-07-17 17:35:02 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "breezy"
-version = "3.3.3"
+version = "3.3.4"
 authors = [ "Martin Packman <[e-mail]>", "Jelmer Vernooij <[e-mail]>"]
 edition = "2018"
 publish = false

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2023-01-31 01:05:40 +0000
+++ breezy/git/__init__.py	2023-07-17 17:35:02 +0000
@@ -264,11 +264,28 @@
 
 
 def rewrite_instead_of(location, purpose):
-    from dulwich.config import StackedConfig, apply_instead_of
+    from dulwich.config import StackedConfig, iter_instead_of
 
     config = StackedConfig.default()
 
-    return apply_instead_of(config, location, push=(purpose == "push"))
+    push = (purpose != "read")
+
+    longest_needle = ""
+    updated_url = location
+    for needle, replacement in iter_instead_of(config, push):
+        if not location.startswith(needle):
+            continue
+        if len(longest_needle) < len(needle):
+            longest_needle = needle
+            if longest_needle == "lp:":
+                # Leave the lp: prefix to the launchpad plugin, if loaded
+                import breezy.plugins
+                if hasattr(breezy.plugins, "launchpad"):
+                    trace.warning(
+                        "Ignoring insteadOf lp: in git config, because the Launchpad plugin is loaded.")
+                    continue
+            updated_url = replacement + location[len(needle):]
+    return updated_url
 
 
 from ..location import hooks as location_hooks

=== modified file 'breezy/plugins/launchpad/lp_api.py'
--- breezy/plugins/launchpad/lp_api.py	2023-01-31 01:05:40 +0000
+++ breezy/plugins/launchpad/lp_api.py	2023-07-17 17:35:02 +0000
@@ -206,24 +206,6 @@
                            '://bazaar.*.launchpad.net')
         return bool(regex.match(url))
 
-    @staticmethod
-    def candidate_urls(bzr_branch):
-        """Iterate through related URLs that might be Launchpad URLs.
-
-        :param bzr_branch: A Bazaar branch to find URLs from.
-        :return: a generator of URL strings.
-        """
-        url = bzr_branch.get_public_branch()
-        if url is not None:
-            yield url
-        url = bzr_branch.get_push_location()
-        if url is not None:
-            yield url
-        url = bzr_branch.get_parent()
-        if url is not None:
-            yield url
-        yield bzr_branch.base
-
     def get_target(self):
         """Return the 'LaunchpadBranch' for the target of this one."""
         lp_branch = self.lp

=== modified file 'breezy/plugins/launchpad/lp_directory.py'
--- breezy/plugins/launchpad/lp_directory.py	2023-03-31 15:00:34 +0000
+++ breezy/plugins/launchpad/lp_directory.py	2023-07-17 17:35:02 +0000
@@ -38,7 +38,7 @@
     The URL is specified by its parsed components, as returned from
     urlsplit.
     """
-    return (scheme in ('bzr+ssh', 'sftp')
+    return (scheme in ('bzr+ssh', 'sftp', 'git+ssh')
             and (netloc.endswith('launchpad.net') or
                  netloc.endswith('launchpad.test')))
 
@@ -64,97 +64,77 @@
     from .lp_api import connect_launchpad
     lp = connect_launchpad(api_base_url, version='devel')
     subpaths = []
+    lp_branch = None
+    git_repo = None
     while path:
         lp_branch = lp.branches.getByPath(path=path)
-        if lp_branch:
+        git_repo = lp.git_repositories.getByPath(path=path)
+        if lp_branch and git_repo:
+            target = git_repo.target
+            vcs = target.vcs
+            trace.warning(
+                "Found both a Bazaar branch and a git repository at lp:%s. Using "
+                "%s, since that is the projects' default vcs", path, vcs)
+            if vcs == "Git":
+                lp_branch = None
+            elif vcs == "Bazaar":
+                git_repo = None
+            else:
+                raise errors.BzrError(
+                    "Unknown default vcs %s for %s" % (vcs, target))
+        if lp_branch or git_repo:
             break
         path, subpath = split(path)
         subpaths.insert(0, subpath)
-    if not lp_branch:
-        raise errors.InvalidURL("Unknown Launchpad path: %s" % url)
-    return {'urls': [join(lp_branch.composePublicURL(scheme='bzr+ssh'), *subpaths),
-                     join(lp_branch.composePublicURL(scheme='http'), *subpaths)]}
+    if lp_branch:
+        return {'urls': [join(lp_branch.composePublicURL(scheme='bzr+ssh'), *subpaths),
+                         join(lp_branch.composePublicURL(scheme='http'), *subpaths)]}
+    elif git_repo:
+        return {'urls': [join(git_repo.git_ssh_url, *subpaths),
+                         join(git_repo.git_https_url, *subpaths)]}
+    else:
+        raise InvalidURL(f"Unknown Launchpad path: {url}")
+
+
+def _resolve(url, _lp_login=None):
+    """Resolve the base URL for this transport."""
+    url, path = _update_url_scheme(url)
+    if _lp_login is None:
+        _lp_login = get_lp_login()
+    path = path.strip('/')
+    path = _expand_user(path, url, _lp_login)
+    result = _resolve_via_api(path, url)
+
+    if 'launchpad' in debug.debug_flags:
+        trace.mutter("resolve_lp_path(%r) == %r", url, result)
+
+    _warned_login = False
+    for url in result['urls']:
+        scheme, netloc, path, query, fragment = urlsplit(url)
+        if _requires_launchpad_login(scheme, netloc, path, query,
+                                     fragment):
+            # Only accept launchpad.net bzr+ssh URLs if we know
+            # the user's Launchpad login:
+            if _lp_login is not None:
+                break
+            if _lp_login is None:
+                if not _warned_login:
+                    trace.warning(
+                        'You have not informed bzr of your Launchpad ID, and you must do this to\n'
+                        'write to Launchpad or access private data.  See "bzr help launchpad-login".')
+                    _warned_login = True
+        else:
+            break
+    else:
+        raise InvalidURL(path=url, extra='no supported schemes')
+    return url
 
 
 class LaunchpadDirectory:
 
     def look_up(self, name, url, purpose=None):
         """See DirectoryService.look_up"""
-        return self._resolve(url)
-
-    def _resolve_locally(self, path, url, _api_resolver):
-        # This is the best I could work out. If an lp: url
-        # includes ~user, then it is specially validated. Otherwise, it is just
-        # sent to +branch/$path.
-        _, netloc, _, _, _ = urlsplit(url)
-        if netloc == '':
-            netloc = DEFAULT_INSTANCE
-        base_url = LAUNCHPAD_DOMAINS[netloc]
-        base = 'bzr+ssh://bazaar.{}/'.format(base_url)
-        maybe_invalid = False
-        if path.startswith('~'):
-            # A ~user style path, validate it a bit.
-            # If a path looks fishy, fall back to asking the API to
-            # resolve it for us.
-            parts = path.split('/')
-            if (len(parts) < 3
-                    or (parts[1] in ('ubuntu', 'debian') and len(parts) < 5)):
-                # This special case requires 5-parts to be valid.
-                maybe_invalid = True
-        else:
-            base += '+branch/'
-        if maybe_invalid:
-            return _api_resolver(path, url)
-        return {'urls': [base + path]}
-
-    def _resolve(self, url, _api_resolver=_resolve_via_api, _lp_login=None):
-        """Resolve the base URL for this transport."""
-        url, path = _update_url_scheme(url)
-        if _lp_login is None:
-            _lp_login = get_lp_login()
-        path = path.strip('/')
-        path = _expand_user(path, url, _lp_login)
-        if _lp_login is not None:
-            result = self._resolve_locally(path, url, _api_resolver)
-            if 'launchpad' in debug.debug_flags:
-                local_res = result
-                result = _api_resolver(path, url)
-                trace.note(gettext(
-                    'resolution for {0}\n  local: {1}\n remote: {2}').format(
-                    url, local_res['urls'], result['urls']))
-        else:
-            result = _api_resolver(path, url)
-
-        if 'launchpad' in debug.debug_flags:
-            trace.mutter("resolve_lp_path(%r) == %r", url, result)
-
-        _warned_login = False
-        for url in result['urls']:
-            scheme, netloc, path, query, fragment = urlsplit(url)
-            if _requires_launchpad_login(scheme, netloc, path, query,
-                                         fragment):
-                # Only accept launchpad.net bzr+ssh URLs if we know
-                # the user's Launchpad login:
-                if _lp_login is not None:
-                    break
-                if _lp_login is None:
-                    if not _warned_login:
-                        trace.warning(
-                            'You have not informed bzr of your Launchpad ID, and you must do this to\n'
-                            'write to Launchpad or access private data.  See "bzr help launchpad-login".')
-                        _warned_login = True
-            else:
-                # Use the URL if we can create a transport for it.
-                try:
-                    transport.get_transport(url)
-                except (errors.PathError, errors.TransportError):
-                    pass
-                else:
-                    break
-        else:
-            raise InvalidURL(path=url, extra='no supported schemes')
-        return url
-
+        return _resolve(url)
 
 def get_test_permutations():
     # Since this transport doesn't do anything once opened, it's not subjected

=== modified file 'breezy/plugins/launchpad/test_lp_directory.py'
--- breezy/plugins/launchpad/test_lp_directory.py	2023-01-31 01:05:40 +0000
+++ breezy/plugins/launchpad/test_lp_directory.py	2023-07-17 17:35:02 +0000
@@ -29,7 +29,7 @@
                       http_server, ssl_certs)
 from . import _register_directory
 from .account import get_lp_login, set_lp_login
-from .lp_directory import LaunchpadDirectory
+from .lp_directory import LaunchpadDirectory, _resolve
 
 
 class FakeResolveFactory:
@@ -44,257 +44,6 @@
         return self._result
 
 
-class LocalDirectoryURLTests(TestCaseInTempDir):
-    """Tests for branch urls that we try to pass through local resolution."""
-
-    def assertResolve(self, expected, url):
-        path = url[url.index(':') + 1:].lstrip('/')
-        factory = FakeResolveFactory(self, path,
-                                     dict(urls=['bzr+ssh://fake-resolved']))
-        directory = LaunchpadDirectory()
-        self.assertEqual(expected,
-                         directory._resolve(url, factory, _lp_login='user'))
-
-    def test_short_form(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
-                           'lp:apt')
-
-    def test_short_form_bzr(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
-                           'lp+bzr:apt')
-
-    def test_two_part_form(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt/2.2',
-                           'lp:apt/2.2')
-
-    def test_two_part_plus_subdir(self):
-        # We allow you to pass more than just what resolves. That way you can
-        # do things like "brz log lp:apt/2.2/BUGS"
-        # Though the virtual FS implementation currently aborts when given a
-        # URL like this, rather than letting you recurse upwards to find the
-        # real branch at lp:apt/2.2
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt/2.2/BUGS',
-                           'lp:apt/2.2/BUGS')
-
-    def test_user_expansion(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/~user/apt/foo',
-                           'lp:~/apt/foo')
-
-    def test_ubuntu(self):
-        # Confirmed against xmlrpc. If you don't have a ~user, xmlrpc doesn't
-        # care that you are asking for 'ubuntu'
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu',
-                           'lp:ubuntu')
-
-    def test_user_two_part(self):
-        # We fall back to the ResolveFactory. The real Launchpad one will raise
-        # InvalidURL for this case.
-        self.assertResolve('bzr+ssh://fake-resolved', 'lp:~jameinel/apt')
-
-    def test_user_three_part(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/~jameinel/apt/foo',
-                           'lp:~jameinel/apt/foo')
-
-    def test_user_three_part_plus_filename(self):
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/~jameinel/apt/foo/fname',
-            'lp:~jameinel/apt/foo/fname')
-
-    def test_user_ubuntu_two_part(self):
-        self.assertResolve('bzr+ssh://fake-resolved', 'lp:~jameinel/ubuntu')
-        self.assertResolve('bzr+ssh://fake-resolved', 'lp:~jameinel/debian')
-
-    def test_user_ubuntu_three_part(self):
-        self.assertResolve('bzr+ssh://fake-resolved',
-                           'lp:~jameinel/ubuntu/natty')
-        self.assertResolve('bzr+ssh://fake-resolved',
-                           'lp:~jameinel/debian/sid')
-
-    def test_user_ubuntu_four_part(self):
-        self.assertResolve('bzr+ssh://fake-resolved',
-                           'lp:~jameinel/ubuntu/natty/project')
-        self.assertResolve('bzr+ssh://fake-resolved',
-                           'lp:~jameinel/debian/sid/project')
-
-    def test_user_ubuntu_five_part(self):
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/~jameinel/ubuntu/natty/apt/branch',
-            'lp:~jameinel/ubuntu/natty/apt/branch')
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/~jameinel/debian/sid/apt/branch',
-            'lp:~jameinel/debian/sid/apt/branch')
-
-    def test_user_ubuntu_five_part_plus_subdir(self):
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/~jameinel/ubuntu/natty/apt/branch/f',
-            'lp:~jameinel/ubuntu/natty/apt/branch/f')
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/~jameinel/debian/sid/apt/branch/f',
-            'lp:~jameinel/debian/sid/apt/branch/f')
-
-    def test_handles_special_lp(self):
-        self.assertResolve(
-            'bzr+ssh://bazaar.launchpad.net/+branch/apt', 'lp:apt')
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
-                           'lp:///apt')
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
-                           'lp://production/apt')
-        self.assertResolve('bzr+ssh://bazaar.launchpad.test/+branch/apt',
-                           'lp://test/apt')
-        self.assertResolve('bzr+ssh://bazaar.staging.launchpad.net/+branch/apt',
-                           'lp://staging/apt')
-        self.assertResolve('bzr+ssh://bazaar.qastaging.launchpad.net/+branch/apt',
-                           'lp://qastaging/apt')
-        self.assertResolve('bzr+ssh://bazaar.demo.launchpad.net/+branch/apt',
-                           'lp://demo/apt')
-
-    def test_debug_launchpad_uses_resolver(self):
-        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/bzr',
-                           'lp:bzr')
-        debug.debug_flags.add('launchpad')
-        self.addCleanup(debug.debug_flags.discard, 'launchpad')
-        self.assertResolve('bzr+ssh://fake-resolved', 'lp:bzr')
-
-
-class DirectoryUrlTests(TestCaseInTempDir):
-    """Tests for branch urls through Launchpad.net directory"""
-
-    def test_short_form(self):
-        """A launchpad url should map to a http url"""
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.launchpad.net/~apt/apt/devel',
-                         directory._resolve('lp:apt', factory))
-
-    def test_qastaging(self):
-        """A launchpad url should map to a http url"""
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'http://bazaar.qastaging.launchpad.net/~apt/apt/devel']))
-        url = 'lp://qastaging/apt'
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.qastaging.launchpad.net/~apt/apt/devel',
-                         directory._resolve(url, factory))
-
-    def test_staging(self):
-        """A launchpad url should map to a http url"""
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'http://bazaar.staging.launchpad.net/~apt/apt/devel']))
-        url = 'lp://staging/apt'
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.staging.launchpad.net/~apt/apt/devel',
-                         directory._resolve(url, factory))
-
-    def test_url_from_directory(self):
-        """A launchpad url should map to a http url"""
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.launchpad.net/~apt/apt/devel',
-                         directory._resolve('lp:///apt', factory))
-
-    def test_directory_skip_bad_schemes(self):
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'bad-scheme://bazaar.launchpad.net/~apt/apt/devel',
-                'http://bazaar.launchpad.net/~apt/apt/devel',
-                'http://another/location']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.launchpad.net/~apt/apt/devel',
-                         directory._resolve('lp:///apt', factory))
-
-    def test_directory_no_matching_schemes(self):
-        # If the XMLRPC call does not return any protocols we support,
-        # invalidURL is raised.
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'bad-scheme://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertRaises(urlutils.InvalidURL,
-                          directory._resolve, 'lp:///apt', factory)
-
-    def test_skip_bzr_ssh_launchpad_net_when_anonymous(self):
-        # Test that bzr+ssh://bazaar.launchpad.net gets skipped if
-        # Bazaar does not know the user's Launchpad ID:
-        self.assertEqual(None, get_lp_login())
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'bzr+ssh://bazaar.launchpad.net/~apt/apt/devel',
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.launchpad.net/~apt/apt/devel',
-                         directory._resolve('lp:///apt', factory))
-
-    def test_skip_sftp_launchpad_net_when_anonymous(self):
-        # Test that sftp://bazaar.launchpad.net gets skipped if
-        # Bazaar does not know the user's Launchpad ID:
-        self.assertEqual(None, get_lp_login())
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'sftp://bazaar.launchpad.net/~apt/apt/devel',
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('http://bazaar.launchpad.net/~apt/apt/devel',
-                         directory._resolve('lp:///apt', factory))
-
-    def test_with_login_avoid_resolve_factory(self):
-        # Test that bzr+ssh URLs get rewritten to include the user's
-        # Launchpad ID (assuming we know the Launchpad ID).
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'bzr+ssh://my-super-custom/special/devel',
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual(
-            'bzr+ssh://bazaar.launchpad.net/+branch/apt',
-            directory._resolve('lp:///apt', factory, _lp_login='username'))
-
-    def test_no_rewrite_of_other_bzr_ssh(self):
-        # Test that we don't rewrite bzr+ssh URLs for other
-        self.assertEqual(None, get_lp_login())
-        factory = FakeResolveFactory(
-            self, 'apt', dict(urls=[
-                'bzr+ssh://example.com/~apt/apt/devel',
-                'http://bazaar.launchpad.net/~apt/apt/devel']))
-        directory = LaunchpadDirectory()
-        self.assertEqual('bzr+ssh://example.com/~apt/apt/devel',
-                         directory._resolve('lp:///apt', factory))
-
-    # TODO: check we get an error if the url is unreasonable
-    def test_error_for_bad_url(self):
-        directory = LaunchpadDirectory()
-        factory = FakeResolveFactory(self, '', {'urls': []})
-        self.assertRaises(urlutils.InvalidURL,
-                          directory._resolve, 'lp://ratotehunoahu', factory)
-
-    def test_resolve_tilde_to_user(self):
-        factory = FakeResolveFactory(
-            self, '~username/apt/test', dict(urls=[
-                'bzr+ssh://bazaar.launchpad.net/~username/apt/test']))
-        directory = LaunchpadDirectory()
-        self.assertEqual(
-            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
-            directory._resolve('lp:~/apt/test', factory, _lp_login='username'))
-        # Should also happen when the login is just set by config
-        set_lp_login('username')
-        self.assertEqual(
-            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
-            directory._resolve('lp:~/apt/test', factory))
-
-    def test_tilde_fails_no_login(self):
-        factory = FakeResolveFactory(
-            self, '~username/apt/test', dict(urls=[
-                'bzr+ssh://bazaar.launchpad.net/~username/apt/test']))
-        self.assertIs(None, get_lp_login())
-        directory = LaunchpadDirectory()
-        self.assertRaises(urlutils.InvalidURL,
-                          directory._resolve, 'lp:~/apt/test', factory)
-
-
 class DirectoryOpenBranchTests(TestCaseWithMemoryTransport):
 
     def test_directory_open_branch(self):

=== modified file 'lib-rio/Cargo.toml'
--- lib-rio/Cargo.toml	2023-02-14 02:35:03 +0000
+++ lib-rio/Cargo.toml	2023-07-17 17:35:02 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "rio-py"
-version = "3.3.3"
+version = "3.3.4"
 edition = "2018"
 
 [lib]