Merge lp:brz/3.3 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.3

[Jelmer Vernooij (jelmer)]

review: Approve

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

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2023-03-09 13:47:07 +0000
+++ breezy/git/branch.py	2023-03-31 22:11:54 +0000
@@ -40,8 +40,7 @@
 from .mapping import decode_git_path, encode_git_path
 from .push import remote_divergence
 from .refs import (branch_name_to_ref, is_tag, ref_to_branch_name,
-                   ref_to_tag_name, remote_refs_dict_to_tag_refs,
-                   tag_name_to_ref)
+                   ref_to_tag_name, tag_name_to_ref)
 from .unpeel_map import UnpeelMap
 from .urls import bzr_url_to_git_url, git_url_to_bzr_url
 

=== modified file 'breezy/git/interrepo.py'
--- breezy/git/interrepo.py	2023-03-09 13:47:07 +0000
+++ breezy/git/interrepo.py	2023-03-31 22:11:54 +0000
@@ -24,7 +24,11 @@
 from dulwich.object_store import ObjectStoreGraphWalker
 from dulwich.pack import PACK_SPOOL_FILE_MAX_SIZE
 from dulwich.protocol import CAPABILITY_THIN_PACK, ZERO_SHA
-from dulwich.refs import ANNOTATED_TAG_SUFFIX, SYMREF
+from dulwich.refs import SYMREF
+try:
+    from dulwich.refs import PEELED_TAG_SUFFIX
+except ImportError:  # dulwich < 0.21.3
+    from dulwich.refs import ANNOTATED_TAG_SUFFIX as PEELED_TAG_SUFFIX
 from dulwich.walk import Walker
 
 from .. import config, trace, ui
@@ -378,12 +382,12 @@
         def determine_wants(refs):
             unpeel_lookup = {}
             for k, v in refs.items():
-                if k.endswith(ANNOTATED_TAG_SUFFIX):
-                    unpeel_lookup[v] = refs[k[:-len(ANNOTATED_TAG_SUFFIX)]]
+                if k.endswith(PEELED_TAG_SUFFIX):
+                    unpeel_lookup[v] = refs[k[:-len(PEELED_TAG_SUFFIX)]]
             potential = {unpeel_lookup.get(w, w) for w in wants}
             if include_tags:
                 for k, sha in refs.items():
-                    if k.endswith(ANNOTATED_TAG_SUFFIX):
+                    if k.endswith(PEELED_TAG_SUFFIX):
                         continue
                     try:
                         tag_name = ref_to_tag_name(k)
@@ -686,7 +690,7 @@
                 if value == ZERO_SHA:
                     continue
 
-                if name.endswith(ANNOTATED_TAG_SUFFIX):
+                if name.endswith(PEELED_TAG_SUFFIX):
                     continue
 
                 if name in branches or (include_tags and is_tag(name)):
@@ -697,7 +701,7 @@
     def determine_wants_all(self, refs):
         potential = {
             v for k, v in refs.items()
-            if not v == ZERO_SHA and not k.endswith(ANNOTATED_TAG_SUFFIX)}
+            if not v == ZERO_SHA and not k.endswith(PEELED_TAG_SUFFIX)}
         return list(potential - self._target_has_shas(potential))
 
 

=== modified file 'breezy/git/refs.py'
--- breezy/git/refs.py	2023-01-31 01:05:40 +0000
+++ breezy/git/refs.py	2023-03-31 22:11:54 +0000
@@ -17,8 +17,11 @@
 """Conversion between refs and Bazaar revision pointers."""
 
 from dulwich.objects import Tag, object_class
-from dulwich.refs import (ANNOTATED_TAG_SUFFIX, LOCAL_BRANCH_PREFIX,
-                          LOCAL_TAG_PREFIX)
+from dulwich.refs import (LOCAL_BRANCH_PREFIX, LOCAL_TAG_PREFIX)
+try:
+    from dulwich.refs import PEELED_TAG_SUFFIX
+except ImportError:
+    from dulwich.refs import ANNOTATED_TAG_SUFFIX as PEELED_TAG_SUFFIX
 from dulwich.repo import RefsContainer
 
 from .. import controldir, errors, osutils
@@ -29,27 +32,8 @@
     return x.startswith(LOCAL_TAG_PREFIX)
 
 
-def is_head(x):
-    return x.startswith(LOCAL_BRANCH_PREFIX)
-
-
 def is_peeled(x):
-    return x.endswith(ANNOTATED_TAG_SUFFIX)
-
-
-def gather_peeled(refs):
-    ret = {}
-    for k, v in refs.items():
-        if is_peeled(k):
-            continue
-        try:
-            peeled = refs[k + ANNOTATED_TAG_SUFFIX]
-            unpeeled = v
-        except KeyError:
-            peeled = v
-            unpeeled = None
-        ret[k] = (peeled, unpeeled)
-    return ret
+    return x.endswith(PEELED_TAG_SUFFIX)
 
 
 def branch_name_to_ref(name):
@@ -192,21 +176,3 @@
     if fn is not None:
         return fn()
     return BazaarRefsContainer(controldir, object_store)
-
-
-def remote_refs_dict_to_tag_refs(refs_dict):
-    base = {}
-    peeled = {}
-    for k, v in refs_dict.items():
-        if is_peeled(k):
-            peeled[k[:-3]] = v
-        else:
-            base[k] = v
-            peeled[k] = v
-    all_keys = set().union(base.keys(), peeled.keys())
-    for n in all_keys:
-        try:
-            tag_name = ref_to_tag_name(n)
-        except ValueError:
-            continue
-        yield (n, tag_name, peeled.get(n), base.get(n))

=== modified file 'breezy/plugin.py'
--- breezy/plugin.py	2023-01-31 01:05:40 +0000
+++ breezy/plugin.py	2023-03-31 22:11:54 +0000
@@ -87,9 +87,7 @@
         from breezy.plugins import __path__ as path
 
     state.plugin_warnings = {}
-    _load_plugins_from_path(state, path)
-    if (None, 'entrypoints') in _env_plugin_path():
-        _load_plugins_from_entrypoints(state)
+    _load_plugins(state, path)
     state.plugins = plugins()
     if warn_load_problems:
         for plugin, errors in state.plugin_warnings.items():
@@ -97,25 +95,6 @@
                 trace.warning('%s', error)
 
 
-def _load_plugins_from_entrypoints(state):
-    try:
-        from importlib.metadata import entry_points
-    except ModuleNotFoundError:
-        # No importlib.metadata, no entrypoints.
-        pass
-    else:
-        try:
-            eps = entry_points(group='breezy.plugin')
-        except TypeError:  # python < 3.10 didn't support group argument
-            eps = [ep[0] for ep in entry_points().values()
-                    if ep[0].group == 'breezy.plugin']
-        for ep in eps:
-            fullname = _MODULE_PREFIX + ep.name
-            if fullname in sys.modules:
-                continue
-            sys.modules[fullname] = ep.load()
-
-
 def plugin_name(module_name):
     """Gives unprefixed name from module_name or None."""
     if module_name.startswith(_MODULE_PREFIX):
@@ -216,7 +195,7 @@
     """Gives list of paths and contexts for plugins from environ key.
 
     Each entry is either a specific path to load plugins from and the value
-    'path', or None and one of the values 'user', 'core', 'entrypoints', 'site'.
+    'path', or None and one of the three values 'user', 'core', 'site'.
     """
     path_details = []
     env = os.environ.get(key)
@@ -224,7 +203,6 @@
         "user": not env,
         "core": True,
         "site": True,
-        'entrypoints': False,
         }
     if env:
         # Add paths specified by user in order
@@ -238,7 +216,7 @@
                 path_details.append((p, 'path'))
 
     # Add any remaining default paths
-    for name in ('user', 'core', 'entrypoints', 'site'):
+    for name in ('user', 'core', 'site'):
         if defaults[name]:
             path_details.append((None, name))
 
@@ -272,7 +250,7 @@
         sys.meta_path.insert(2, finder)
 
 
-def _load_plugins_from_path(state, paths):
+def _load_plugins(state, paths):
     """Do the importing all plugins from paths."""
     imported_names = set()
     for name, path in _iter_possible_plugins(paths):

=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py	2023-01-31 01:05:40 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py	2023-03-31 22:11:54 +0000
@@ -59,9 +59,12 @@
         input += b"IFS=$'\\n'\n"
         input += b'echo "${COMPREPLY[*]}"\n'
         (out, err) = proc.communicate(input)
-        if b'' != err:
+        errlines = [
+            line for line in err.splitlines()
+            if not line.startswith(b'brz: warning: ')]
+        if [] != errlines:
             raise AssertionError('Unexpected error message:\n%s' % err)
-        self.assertEqual(b'', err, 'No messages to standard error')
+        self.assertEqual(b'', b''.join(errlines), 'No messages to standard error')
         #import sys
         #print >>sys.stdout, '---\n%s\n---\n%s\n---\n' % (input, out)
         lines = out.split(b'\n')
@@ -167,7 +170,7 @@
 
     def get_script(self):
         s = super().get_script()
-        s = s.replace("$(brz ", "$('%s' " % self.get_brz_path())
+        s = s.replace("$(brz ", "$(%s " % ' '.join(self.get_brz_command()))
         s = s.replace("2>/dev/null", "")
         return s
 

=== modified file 'breezy/plugins/launchpad/lp_directory.py'
--- breezy/plugins/launchpad/lp_directory.py	2023-01-31 01:05:40 +0000
+++ breezy/plugins/launchpad/lp_directory.py	2023-03-31 22:11:54 +0000
@@ -20,7 +20,7 @@
 
 from ... import debug, errors, trace, transport
 from ...i18n import gettext
-from ...urlutils import InvalidURL
+from ...urlutils import InvalidURL, split, join
 from .account import get_lp_login
 from .uris import DEFAULT_INSTANCE, LAUNCHPAD_DOMAINS, LPNET_SERVICE_ROOT
 
@@ -63,10 +63,17 @@
 def _resolve_via_api(path, url, api_base_url=LPNET_SERVICE_ROOT):
     from .lp_api import connect_launchpad
     lp = connect_launchpad(api_base_url, version='devel')
-    lp_branch = lp.branches.getByPath(path=path)
+    subpaths = []
+    while path:
+        lp_branch = lp.branches.getByPath(path=path)
+        if lp_branch:
+            break
+        path, subpath = split(path)
+        subpaths.insert(0, subpath)
     if not lp_branch:
-        raise InvalidURL("Unknown Launchpad path: %s" % path)
-    return {'urls': [lp_branch.composePublicURL(scheme='bzr+ssh'), lp_branch.composePublicURL(scheme='http')]}
+        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)]}
 
 
 class LaunchpadDirectory:

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2023-01-31 01:05:40 +0000
+++ breezy/tests/__init__.py	2023-03-31 22:11:54 +0000
@@ -2207,8 +2207,6 @@
             for env_var, value in old_env.items():
                 osutils.set_or_unset_env(env_var, value)
 
-        bzr_path = self.get_brz_path()
-
         cwd = None
         if working_dir is not None:
             cwd = osutils.getcwd()
@@ -2222,7 +2220,7 @@
             # Include the subprocess's log file in the test details, in case
             # the test fails due to an error in the subprocess.
             self._add_subprocess_log(trace._get_brz_log_filename())
-            command = [bzr_path]
+            command = self.get_brz_command()
             if not allow_plugins:
                 command.append('--no-plugins')
             command.extend(process_args)
@@ -2284,6 +2282,13 @@
             brz_path = sys.argv[0]
         return brz_path
 
+    def get_brz_command(self):
+        bzr_path = self.get_brz_path()
+        if bzr_path.endswith('__main__.py'):
+            return [sys.executable, '-m', 'breezy']
+        else:
+            return [bzr_path]
+
     def finish_brz_subprocess(self, process, retcode=0, send_signal=None,
                               universal_newlines=False, process_args=None):
         """Finish the execution of process.

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2023-01-31 01:05:40 +0000
+++ breezy/tests/features.py	2023-03-31 22:11:54 +0000
@@ -400,7 +400,6 @@
 flake8 = ModuleAvailableFeature('flake8.api.legacy')
 
 lsprof_feature = ModuleAvailableFeature('breezy.lsprof')
-importlib_metadata_feature = ModuleAvailableFeature('importlib.metadata')
 
 pyinotify = ModuleAvailableFeature('pyinotify')
 

=== modified file 'breezy/tests/test_plugins.py'
--- breezy/tests/test_plugins.py	2023-01-31 01:05:40 +0000
+++ breezy/tests/test_plugins.py	2023-03-31 22:11:54 +0000
@@ -28,7 +28,6 @@
 import breezy
 
 from .. import osutils, plugin, tests
-from ..tests.features import importlib_metadata_feature
 
 # TODO: Write a test for plugin decoration of commands.
 
@@ -610,7 +609,6 @@
     user = "USER"
     core = "CORE"
     site = "SITE"
-    entrypoints = "ENTRYPOINTS"
 
     def check_path(self, expected_dirs, setting_dirs):
         if setting_dirs is None:
@@ -636,10 +634,6 @@
         self.check_path([self.user, self.site, self.core],
                         ['+user', '+site', '+core'])
 
-    def test_enable_entrypoints(self):
-        self.check_path([self.user, self.core, self.site, self.entrypoints],
-                        ['+user', '+core', '+site', '+entrypoints'])
-
     def test_disable_user(self):
         self.check_path([self.core, self.site], ['-user'])
 
@@ -681,9 +675,7 @@
                         ['mycore', '-core'])
 
     def test_my_plugin_only(self):
-        self.check_path(
-            ['myplugin'],
-            ['myplugin', '-user', '-core', '-site', '-entrypoints'])
+        self.check_path(['myplugin'], ['myplugin', '-user', '-core', '-site'])
 
     def test_my_plugin_first(self):
         self.check_path(['myplugin', self.core, self.site, self.user],
@@ -917,54 +909,3 @@
   Hi there
 
 """, ''.join(plugin.describe_plugins(state=self)))
-
-
-class DummyPlugin:
-    """Plugin."""
-
-
-class TestLoadEnvPlugin(BaseTestPlugins):
-
-    _test_needs_features = [importlib_metadata_feature]
-
-    def setup_plugin(self, source=""):
-        # This test tests a new plugin appears in breezy.plugin.plugins().
-        # check the plugin is not loaded already
-        self.assertPluginUnknown('plugin')
-        # write a plugin that _cannot_ fail to load.
-        from importlib.metadata import Distribution, EntryPoint, entry_points
-        class DummyDistribution:
-
-            def __init__(self, name, entry_points):
-                self._normalized_name = self.name = name
-                self.entry_points = entry_points
-        ep = EntryPoint(name='plugin', group='breezy.plugin',
-                        value=__name__ + ':DummyPlugin')
-        d = DummyDistribution('lala', [ep])
-        old_discover = Distribution.discover
-        def override_discover(**kwargs):
-            yield from old_discover(**kwargs)
-            yield d
-        self.overrideAttr(Distribution, 'discover', override_discover)
-        try:
-            eps = entry_points(group='breezy.plugin')
-        except TypeError:  # python < 3.10
-            eps = [ep[0] for ep in entry_points().values()
-                   if ep[0].group == 'breezy.plugin']
-        self.assertEqual(['plugin'], [ep.name for ep in eps])
-        self.load_with_paths(['.'])
-
-    def test_plugin_loaded(self):
-        self.assertPluginUnknown('plugin')
-        self.overrideEnv('BRZ_PLUGIN_PATH', '+entrypoints')
-        self.setup_plugin()
-        p = self.plugins['plugin']
-        self.assertIsInstance(p, breezy.plugin.PlugIn)
-        self.assertIs(p.module, sys.modules[self.module_prefix + 'plugin'])
-
-    def test_plugin_loaded_disabled(self):
-        self.assertPluginUnknown('plugin')
-        self.overrideEnv('BRZ_PLUGIN_PATH', '+entrypoints')
-        self.overrideEnv('BRZ_DISABLE_PLUGINS', 'plugin')
-        self.setup_plugin()
-        self.assertNotIn('plugin', self.plugins)

=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2023-01-31 01:05:40 +0000
+++ breezy/tests/test_selftest.py	2023-03-31 22:11:54 +0000
@@ -2618,14 +2618,25 @@
     def test_run_brz_subprocess_no_plugins(self):
         self.assertRaises(_DontSpawnProcess, self.start_brz_subprocess, [])
         command = self._popen_args[0]
-        self.assertEqual(self.get_brz_path(), command[0])
-        self.assertEqual(['--no-plugins'], command[1:])
+        if self.get_brz_path().endswith('__main__.py'):
+            self.assertEqual(sys.executable, command[0])
+            self.assertEqual('-m', command[1])
+            self.assertEqual('breezy', command[2])
+            rest = command[3:]
+        else:
+            self.assertEqual(self.get_brz_path(), command[0])
+            rest = command[1:]
+        self.assertEqual(['--no-plugins'], rest)
 
     def test_allow_plugins(self):
         self.assertRaises(_DontSpawnProcess, self.start_brz_subprocess, [],
                           allow_plugins=True)
         command = self._popen_args[0]
-        self.assertEqual([], command[2:])
+        if self.get_brz_path().endswith('__main__.py'):
+            rest = command[3:]
+        else:
+            rest = command[1:]
+        self.assertEqual([], rest)
 
     def test_set_env(self):
         self.assertFalse('EXISTANT_ENV_VAR' in os.environ)

=== modified file 'breezy/tests/test_transport.py'
--- breezy/tests/test_transport.py	2023-01-31 01:05:40 +0000
+++ breezy/tests/test_transport.py	2023-03-31 22:11:54 +0000
@@ -1048,8 +1048,8 @@
         self.start_server(ssh_server)
         port = ssh_server.port
 
-        bzr_remote_path = self.get_brz_path()
-        self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path)
+        bzr_remote_command = self.get_brz_command()
+        self.overrideEnv('BZR_REMOTE_PATH', ' '.join(bzr_remote_command))
         self.overrideEnv('PYTHONPATH', ':'.join(sys.path))
 
         # Access the branch via a bzr+ssh URL.  The BZR_REMOTE_PATH environment
@@ -1066,7 +1066,7 @@
 
         self.assertEqual(
             [b'%s serve --inet --directory=/ --allow-writes' %
-                bzr_remote_path.encode()],
+                ' '.join(bzr_remote_command).encode()],
             self.command_executed)
         # Make sure to disconnect, so that the remote process can stop, and we
         # can cleanup. Then pause the test until everything is shutdown

=== modified file 'pyproject.toml'
--- pyproject.toml	2023-03-09 13:21:34 +0000
+++ pyproject.toml	2023-03-31 22:11:54 +0000
@@ -31,7 +31,7 @@
     "fastbencode",
     "patiencediff",
     "merge3",
-    "dulwich>=0.21.2",
+    "dulwich>=0.21.3",
     "urllib3>=1.24.1",
     "pyyaml",
 ]
@@ -43,7 +43,7 @@
 
 [project.optional-dependencies]
 fastimport = ["fastimport"]
-git = ["dulwich>=0.21.2"]
+git = ["dulwich>=0.21.3"]
 launchpad = ["launchpadlib>=1.6.3"]
 workspace = ["pyinotify"]
 doc = [
@@ -67,7 +67,7 @@
     "testtools",
     "testscenarios",
     "python-subunit",
-    "dulwich>=0.21.2",
+    "dulwich>=0.21.3",
 ]
 
 [tool.setuptools]