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

[Jelmer Vernooij]

Add basic typing, make mypy pass

Add basic typing, make mypy pass.

[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/2206/

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[lp:~jelmer/brz/mypy]

7657. By Jelmer Vernooij on 2022-10-06

Merge trunk.

7658. By Jelmer Vernooij on 2022-10-08

Merge typing.

7659. By Jelmer Vernooij on 2022-10-19

Fix typing.

7660. By Jelmer Vernooij on 2022-10-27

merge lp:brz/3.3

7661. By Jelmer Vernooij on 2022-10-27

Merge lp:brz/3.3

7662. By Jelmer Vernooij on 2022-10-28

Fix type.

7663. By Jelmer Vernooij on 2022-10-28

Fix some more tests.

7664. By Jelmer Vernooij on 2022-10-29

Fix remaining tests.

Unmerged revisions

=== modified file '.github/workflows/pythonpackage.yml'
--- .github/workflows/pythonpackage.yml	2022-07-09 12:49:21 +0000
+++ .github/workflows/pythonpackage.yml	2022-10-19 15:51:12 +0000
@@ -10,7 +10,7 @@
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
         experimental: [false]
 # See https://github.com/actions/toolkit/issues/399
 #        include:
@@ -33,7 +33,7 @@
         run: |
           python -m pip install --upgrade pip
           pip install -U pip setuptools
-          pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich setuptools-rust pyyaml merge3
+          pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich setuptools-rust pyyaml merge3 mypy
       - name: Build docs
         run: |
           make docs PYTHON=python
@@ -48,3 +48,6 @@
           PYTHONHASHSEED: random
           BRZ_PLUGIN_PATH: -site:-user
           PYTHONPATH: .
+      - name: Run mypy
+        run: |
+          python -m mypy breezy

=== modified file 'Makefile'
--- Makefile	2022-10-18 18:12:47 +0000
+++ Makefile	2022-10-19 15:51:12 +0000
@@ -71,6 +71,9 @@
 flake8:
 	flake8
 
+mypy:
+	mypy breezy
+
 clean:
 	$(PYTHON) setup.py clean
 	-find . -name "*.pyc" -o -name "*.pyo" -o -name "*.so" | xargs rm -f

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2022-10-08 07:04:57 +0000
+++ breezy/__init__.py	2022-10-19 15:51:12 +0000
@@ -156,7 +156,7 @@
 _fs_enc = sys.getfilesystemencoding()
 if getattr(sys, "_brz_default_fs_enc", None) is not None:
     if (_fs_enc is None or codecs.lookup(_fs_enc).name == "ascii"):
-        _fs_enc = _patch_filesystem_default_encoding(sys._brz_default_fs_enc)
+        _fs_enc = _patch_filesystem_default_encoding(sys._brz_default_fs_enc)  # type: ignore
 if _fs_enc is None:
     _fs_enc = "ascii"
 else:

=== modified file 'breezy/__main__.py'
--- breezy/__main__.py	2021-11-17 20:10:55 +0000
+++ breezy/__main__.py	2022-10-19 15:51:12 +0000
@@ -45,7 +45,7 @@
     # Use better default than ascii with posix filesystems that deal in bytes
     # natively even when the C locale or no locale at all is given. Note that
     # we need an immortal string for the hack, hence the lack of a hyphen.
-    sys._brz_default_fs_enc = "utf8"
+    sys._brz_default_fs_enc = "utf8"  # type: ignore
 
 
 def main():

=== modified file 'breezy/_known_graph_py.py'
--- breezy/_known_graph_py.py	2020-02-18 01:57:45 +0000
+++ breezy/_known_graph_py.py	2022-10-19 15:51:12 +0000
@@ -18,7 +18,7 @@
 """
 
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 from . import (

=== modified file 'breezy/annotate.py'
--- breezy/annotate.py	2020-02-18 01:57:45 +0000
+++ breezy/annotate.py	2022-10-19 15:51:12 +0000
@@ -30,7 +30,6 @@
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-
 import patiencediff
 
 from breezy import (

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2022-09-12 13:37:25 +0000
+++ breezy/branch.py	2022-10-19 15:51:12 +0000
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from typing import Optional, Tuple
+from typing import Optional, Tuple, List, Type
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -83,6 +83,12 @@
 
     name: Optional[str]
 
+    base: str
+
+    _format: "BranchFormat"
+
+    _last_revision_info_cache: Optional[Tuple[int, RevisionID]]
+
     @property
     def control_transport(self):
         return self._transport
@@ -1758,7 +1764,7 @@
 
 
 # install the default hooks into the Branch class.
-Branch.hooks = BranchHooks()
+Branch.hooks = BranchHooks()  # type: ignore
 
 
 class ChangeBranchTipParams(object):
@@ -2063,7 +2069,7 @@
     can be carried out on.
     """
 
-    _optimisers = []
+    _optimisers: List[Type["InterBranch"]] = []
     """The available optimised InterBranch types."""
 
     @classmethod

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2022-08-22 18:19:46 +0000
+++ breezy/builtins.py	2022-10-19 15:51:12 +0000
@@ -24,6 +24,7 @@
 import breezy.git
 
 from . import (
+    controldir,
     errors,
     transport,
     )
@@ -36,7 +37,6 @@
 from breezy import (
     branch as _mod_branch,
     bugtracker,
-    controldir,
     directory_service,
     delta,
     config as _mod_config,
@@ -924,7 +924,6 @@
     """
 
     takes_args = ['names*']
-    takes_options = []
     aliases = ['copy']
     encoding_type = 'replace'
 
@@ -2084,7 +2083,7 @@
                        help='Specify a format for this branch. '
                        'See "help formats" for a full list.',
                        lazy_registry=('breezy.controldir', 'format_registry'),
-                       converter=lambda name: controldir.format_registry.make_controldir(
+                       converter=lambda name: controldir.format_registry.make_controldir(  # type: ignore
                             name),
                        value_switches=True,
                        title="Branch format",
@@ -2207,7 +2206,7 @@
                                     ' "brz help formats" for details.',
                                     lazy_registry=(
                                         'breezy.controldir', 'format_registry'),
-                                    converter=lambda name: controldir.format_registry.make_controldir(
+                                    converter=lambda name: controldir.format_registry.make_controldir(  # type: ignore
                                         name),
                                     value_switches=True, title='Repository format'),
                      Option('no-trees',
@@ -3894,7 +3893,7 @@
                        help='Upgrade to a specific format.  See "brz help'
                        ' formats" for details.',
                        lazy_registry=('breezy.controldir', 'format_registry'),
-                       converter=lambda name: controldir.format_registry.make_controldir(
+                       converter=lambda name: controldir.format_registry.make_controldir(  # type: ignore
                            name),
                        value_switches=True, title='Branch format'),
         Option('clean',
@@ -5414,7 +5413,6 @@
     """
 
     _see_also = ['checkouts', 'bind']
-    takes_args = []
     takes_options = ['directory']
 
     def run(self, directory=u'.'):
@@ -5455,7 +5453,6 @@
                             ),
                      ]
     takes_args = ['location?']
-    aliases = []
     encoding_type = 'replace'
 
     def run(self, location=None, dry_run=False, verbose=False,
@@ -6455,7 +6452,6 @@
         brz view --delete --all
     """
 
-    _see_also = []
     takes_args = ['file*']
     takes_options = [
         Option('all',

=== modified file 'breezy/bzr/_static_tuple_py.py'
--- breezy/bzr/_static_tuple_py.py	2022-07-16 12:50:01 +0000
+++ breezy/bzr/_static_tuple_py.py	2022-10-19 15:51:12 +0000
@@ -21,6 +21,7 @@
 """
 
 import sys
+from typing import Dict
 
 
 class StaticTuple(tuple):
@@ -80,4 +81,4 @@
 # the _empty_tuple singleton has been created yet or not.
 _empty_tuple = None
 _empty_tuple = StaticTuple()
-_interned_tuples = {}
+_interned_tuples: Dict[StaticTuple, StaticTuple] = {}

=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/branch.py	2022-10-19 15:51:12 +0000
@@ -107,7 +107,7 @@
         """Returns the directory containing the control directory."""
         return self._base
 
-    base = property(_get_base, doc="The URL for the root of this branch.")
+    base = property(_get_base, doc="The URL for the root of this branch.")  # type: ignore
 
     @property
     def user_transport(self):

=== modified file 'breezy/bzr/btree_index.py'
--- breezy/bzr/btree_index.py	2022-07-16 12:50:01 +0000
+++ breezy/bzr/btree_index.py	2022-10-19 15:51:12 +0000
@@ -1557,8 +1557,8 @@
 _gcchk_factory = _LeafNode
 
 try:
-    from . import _btree_serializer_pyx as _btree_serializer
-    _gcchk_factory = _btree_serializer._parse_into_chk
+    from . import _btree_serializer_pyx as _btree_serializer  # type: ignore
+    _gcchk_factory = _btree_serializer._parse_into_chk  # type: ignore
 except ImportError as e:
     osutils.failed_to_load_extension(e)
     from . import _btree_serializer_py as _btree_serializer

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/bzrdir.py	2022-10-19 15:51:12 +0000
@@ -26,6 +26,7 @@
 """
 
 import sys
+from typing import Set
 
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
@@ -34,7 +35,6 @@
 from breezy import (
     branch as _mod_branch,
     lockable_files,
-    lockdir,
     osutils,
     repository,
     revision as _mod_revision,
@@ -65,6 +65,7 @@
     config,
     controldir,
     errors,
+    lockdir,
     transport as _mod_transport,
     )
 from ..transport import (
@@ -1144,7 +1145,7 @@
     :ivar features: Dictionary mapping feature names to their necessity
     """
 
-    _present_features = set()
+    _present_features: Set[str] = set()
 
     def __init__(self):
         self.features = {}
@@ -1850,24 +1851,6 @@
         return BzrDir.open_from_transport(to_convert.root_transport)
 
 
-class ConvertMetaToColo(controldir.Converter):
-    """Convert a 'development-colo' bzrdir to a '2a' bzrdir."""
-
-    def __init__(self, target_format):
-        """Create a converter that converts a 'development-colo' metadir
-        to a '2a' metadir.
-
-        :param target_format: The final metadir format that is desired.
-        """
-        self.target_format = target_format
-
-    def convert(self, to_convert, pb):
-        """See Converter.convert()."""
-        to_convert.transport.put_bytes('branch-format',
-                                       self.target_format.as_string())
-        return BzrDir.open_from_transport(to_convert.root_transport)
-
-
 class CreateRepository(controldir.RepositoryAcquisitionPolicy):
     """A policy of creating a new repository"""
 

=== modified file 'breezy/bzr/groupcompress.py'
--- breezy/bzr/groupcompress.py	2022-07-16 21:26:08 +0000
+++ breezy/bzr/groupcompress.py	2022-10-19 15:51:12 +0000
@@ -17,6 +17,7 @@
 """Core compression logic for compressing streams of related files."""
 
 import time
+from typing import Type
 import zlib
 
 from ..lazy_import import lazy_import
@@ -25,8 +26,6 @@
     annotate,
     config,
     debug,
-    osutils,
-    trace,
     tsort,
     )
 from breezy.bzr import (
@@ -41,7 +40,9 @@
 
 from .. import (
     errors,
-    )
+    osutils,
+    trace,
+)
 from .btree_index import BTreeBuilder
 from ..lru_cache import LRUSizeCache
 from .versionedfile import (
@@ -53,7 +54,7 @@
     FulltextContentFactory,
     VersionedFilesWithFallbacks,
     UnavailableRepresentation,
-    )
+)
 
 # Minimum number of uncompressed bytes to try fetch at once when retrieving
 # groupcompress blocks.
@@ -2244,6 +2245,9 @@
             key_dependencies.add_references(node[1], node[3][0])
 
 
+GroupCompressor: Type[_CommonGroupCompressor]
+
+
 from ._groupcompress_py import (
     apply_delta,
     apply_delta_to_source,
@@ -2253,7 +2257,7 @@
     LinesDeltaIndex,
     )
 try:
-    from ._groupcompress_pyx import (
+    from ._groupcompress_pyx import (  # type: ignore
         apply_delta,
         apply_delta_to_source,
         DeltaIndex,

=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2022-07-16 12:50:01 +0000
+++ breezy/bzr/inventory.py	2022-10-19 15:51:12 +0000
@@ -28,7 +28,7 @@
 ROOT_ID = b"TREE_ROOT"
 
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/inventorytree.py	2022-10-19 15:51:12 +0000
@@ -18,12 +18,13 @@
 """
 
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 
 import os
 import re
+from typing import Type, TYPE_CHECKING
 
 
 from .. import (
@@ -1143,11 +1144,14 @@
     """InterTree implementation for InventoryTree objects.
 
     """
+    if TYPE_CHECKING:
+        from ..workingtree import WorkingTreeFormat
+
     # Formats that will be used to test this InterTree. If both are
     # None, this InterTree will not be tested (e.g. because a complex
     # setup is required)
-    _matching_from_tree_format = None
-    _matching_to_tree_format = None
+    _matching_from_tree_format: "WorkingTreeFormat"
+    _matching_to_tree_format: "WorkingTreeFormat"
 
     @classmethod
     def is_compatible(kls, source, target):

=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/knit.py	2022-10-19 15:51:12 +0000
@@ -68,7 +68,6 @@
     ui,
     )
 from breezy.bzr import (
-    index as _mod_index,
     pack,
     static_tuple,
     tuned_gzip,
@@ -108,6 +107,9 @@
     UnavailableRepresentation,
     VersionedFilesWithFallbacks,
     )
+from . import (
+    index as _mod_index,
+    )
 
 
 # TODO: Split out code specific to this format into an associated object.

=== modified file 'breezy/bzr/knitrepo.py'
--- breezy/bzr/knitrepo.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/knitrepo.py	2022-10-19 15:51:12 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from typing import Type
+
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
 import itertools
@@ -30,6 +32,7 @@
 from breezy.bzr import (
     knit as _mod_knit,
     versionedfile,
+    serializer,
     xml5,
     xml6,
     xml7,
@@ -42,11 +45,13 @@
 from ..repository import (
     InterRepository,
     IsInWriteGroupError,
+    Repository,
     )
-from ..bzr.repository import (
+from .repository import (
     RepositoryFormatMetaDir,
     )
-from ..bzr.vf_repository import (
+from .serializer import Serializer
+from .vf_repository import (
     InterSameDataRepository,
     MetaDirVersionedFileRepository,
     MetaDirVersionedFileRepositoryFormat,
@@ -118,8 +123,8 @@
     # them to None ensures that if the constructor is changed to not initialize
     # them, or a subclass fails to call the constructor, that an error will
     # occur rather than the system working but generating incorrect data.
-    _commit_builder_class = None
-    _serializer = None
+    _commit_builder_class: Type[VersionedFileCommitBuilder]
+    _serializer: Serializer
 
     def __init__(self, _format, a_controldir, control_files, _commit_builder_class,
                  _serializer):
@@ -231,11 +236,11 @@
 
     # Set this attribute in derived classes to control the repository class
     # created by open and initialize.
-    repository_class = None
+    repository_class: Type[Repository]
     # Set this attribute in derived classes to control the
     # _commit_builder_class that the repository objects will have passed to
     # their constructor.
-    _commit_builder_class = None
+    _commit_builder_class: Type[VersionedFileCommitBuilder]
     # Set this attribute in derived clases to control the _serializer that the
     # repository objects will have passed to their constructor.
 

=== modified file 'breezy/bzr/pack_repo.py'
--- breezy/bzr/pack_repo.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/pack_repo.py	2022-10-19 15:51:12 +0000
@@ -16,6 +16,7 @@
 
 import re
 import sys
+from typing import Type
 
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
@@ -44,6 +45,7 @@
     transport as _mod_transport,
     )
 from ..bzr import (
+    index,
     btree_index,
     )
 
@@ -55,11 +57,12 @@
     _LazyListJoin,
     RepositoryWriteLockResult,
     )
-from ..bzr.repository import (
+from .repository import (
     MetaDirRepository,
     RepositoryFormatMetaDir,
     )
-from ..bzr.vf_repository import (
+from .serializer import Serializer
+from .vf_repository import (
     MetaDirVersionedFileRepository,
     MetaDirVersionedFileRepositoryFormat,
     VersionedFileCommitBuilder,
@@ -811,10 +814,10 @@
     :ivar _names: map of {pack_name: (index_size,)}
     """
 
-    pack_factory = None
-    resumed_pack_factory = None
-    normal_packer_class = None
-    optimising_packer_class = None
+    pack_factory: Type[NewPack]
+    resumed_pack_factory: Type[ResumedPack]
+    normal_packer_class: Type[Packer]
+    optimising_packer_class: Type[Packer]
 
     def __init__(self, repo, transport, index_transport, upload_transport,
                  pack_transport, index_builder_class, index_class,
@@ -1721,8 +1724,8 @@
     # them to None ensures that if the constructor is changed to not initialize
     # them, or a subclass fails to call the constructor, that an error will
     # occur rather than the system working but generating incorrect data.
-    _commit_builder_class = None
-    _serializer = None
+    _commit_builder_class: Type[VersionedFileCommitBuilder]
+    _serializer: Serializer
 
     def __init__(self, _format, a_controldir, control_files, _commit_builder_class,
                  _serializer):
@@ -1912,27 +1915,27 @@
 
     # Set this attribute in derived classes to control the repository class
     # created by open and initialize.
-    repository_class = None
+    repository_class: Type[PackRepository]
     # Set this attribute in derived classes to control the
     # _commit_builder_class that the repository objects will have passed to
     # their constructor.
-    _commit_builder_class = None
+    _commit_builder_class: Type[VersionedFileCommitBuilder]
     # Set this attribute in derived clases to control the _serializer that the
     # repository objects will have passed to their constructor.
-    _serializer = None
+    _serializer: Serializer
     # Packs are not confused by ghosts.
-    supports_ghosts = True
+    supports_ghosts: bool = True
     # External references are not supported in pack repositories yet.
-    supports_external_lookups = False
+    supports_external_lookups: bool = False
     # Most pack formats do not use chk lookups.
-    supports_chks = False
+    supports_chks: bool = False
     # What index classes to use
-    index_builder_class = None
-    index_class = None
-    _fetch_uses_deltas = True
-    fast_deltas = False
-    supports_funky_characters = True
-    revision_graph_can_have_wrong_parents = True
+    index_builder_class: Type[index.GraphIndexBuilder]
+    index_class: Type[object]
+    _fetch_uses_deltas: bool = True
+    fast_deltas: bool = False
+    supports_funky_characters: bool = True
+    revision_graph_can_have_wrong_parents: bool = True
 
     def initialize(self, a_controldir, shared=False):
         """Create a pack based repository.

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2022-09-22 22:55:28 +0000
+++ breezy/bzr/remote.py	2022-10-19 15:51:12 +0000
@@ -1059,6 +1059,7 @@
         self._supports_chks = None
         self._supports_external_lookups = None
         self._supports_tree_reference = None
+        self._supports_ghosts = None
         self._supports_funky_characters = None
         self._supports_nesting_repositories = None
         self._rich_root_data = None
@@ -1119,6 +1120,14 @@
         return self._supports_tree_reference
 
     @property
+    def supports_ghosts(self):
+        if self._supports_ghosts is None:
+            self._ensure_real()
+            self._supports_ghosts = \
+                    self._custom_format.supports_ghosts
+        return self._supports_ghosts
+
+    @property
     def revision_graph_can_have_wrong_parents(self):
         if self._revision_graph_can_have_wrong_parents is None:
             self._ensure_real()

=== modified file 'breezy/bzr/smart/client.py'
--- breezy/bzr/smart/client.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/client.py	2022-10-19 15:51:12 +0000
@@ -329,7 +329,7 @@
                       "accessible.", None)
 
 
-_SmartClient.hooks = SmartClientHooks()
+_SmartClient.hooks = SmartClientHooks()  # type: ignore
 
 
 class CallHookParams(object):

=== modified file 'breezy/bzr/smart/medium.py'
--- breezy/bzr/smart/medium.py	2022-07-15 14:06:55 +0000
+++ breezy/bzr/smart/medium.py	2022-10-19 15:51:12 +0000
@@ -30,10 +30,7 @@
 import sys
 import time
 
-try:
-    import _thread
-except ImportError:
-    import thread as _thread
+import _thread
 
 import breezy
 from ...lazy_import import lazy_import

=== modified file 'breezy/bzr/smart/message.py'
--- breezy/bzr/smart/message.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/message.py	2022-10-19 15:51:12 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 

=== modified file 'breezy/bzr/smart/protocol.py'
--- breezy/bzr/smart/protocol.py	2022-07-15 14:13:49 +0000
+++ breezy/bzr/smart/protocol.py	2022-10-19 15:51:12 +0000
@@ -20,7 +20,7 @@
 
 
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 

=== modified file 'breezy/bzr/smart/server.py'
--- breezy/bzr/smart/server.py	2022-07-04 15:43:01 +0000
+++ breezy/bzr/smart/server.py	2022-10-19 15:51:12 +0000
@@ -348,7 +348,7 @@
                       "in which case the server will exit normally.", (2, 4))
 
 
-SmartTCPServer.hooks = SmartServerHooks()
+SmartTCPServer.hooks = SmartServerHooks()  # type: ignore
 
 
 def _local_path_for_transport(transport):

=== modified file 'breezy/bzr/tests/test__simple_set.py'
--- breezy/bzr/tests/test__simple_set.py	2022-07-16 13:33:49 +0000
+++ breezy/bzr/tests/test__simple_set.py	2022-10-19 15:51:12 +0000
@@ -26,7 +26,7 @@
     )
 
 try:
-    from .. import _simple_set_pyx
+    from .. import _simple_set_pyx  # type: ignore
 except ImportError:
     _simple_set_pyx = None
 

=== modified file 'breezy/bzr/tests/test__static_tuple.py'
--- breezy/bzr/tests/test__static_tuple.py	2022-07-16 12:50:01 +0000
+++ breezy/bzr/tests/test__static_tuple.py	2022-10-19 15:51:12 +0000
@@ -16,10 +16,7 @@
 
 """Tests for the StaticTuple type."""
 
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 import operator
 import sys
 

=== modified file 'breezy/bzr/tests/test_btree_index.py'
--- breezy/bzr/tests/test_btree_index.py	2020-06-10 03:30:11 +0000
+++ breezy/bzr/tests/test_btree_index.py	2022-10-19 15:51:12 +0000
@@ -1273,26 +1273,6 @@
             ], node.keys)
         self.assertEqual(1, node.offset)
 
-    def test_LeafNode_2_2(self):
-        node_bytes = (b"type=leaf\n"
-                      b"00\x0000\x00\t00\x00ref00\x00value:0\n"
-                      b"00\x0011\x0000\x00ref00\t00\x00ref00\r01\x00ref01\x00value:1\n"
-                      b"11\x0033\x0011\x00ref22\t11\x00ref22\r11\x00ref22\x00value:3\n"
-                      b"11\x0044\x00\t11\x00ref00\x00value:4\n"
-                      b""
-                      )
-        node = btree_index._LeafNode(node_bytes, 2, 2)
-        # We do direct access, or don't care about order, to leaf nodes most of
-        # the time, so a dict is useful:
-        self.assertEqual({
-            (b'00', b'00'): (b'value:0', ((), ((b'00', b'ref00'),))),
-            (b'00', b'11'): (b'value:1', (((b'00', b'ref00'),),
-                                          ((b'00', b'ref00'), (b'01', b'ref01')))),
-            (b'11', b'33'): (b'value:3', (((b'11', b'ref22'),),
-                                          ((b'11', b'ref22'), (b'11', b'ref22')))),
-            (b'11', b'44'): (b'value:4', ((), ((b'11', b'ref00'),)))
-            }, dict(node.all_items()))
-
     def assertFlattened(self, expected, key, value, refs):
         flat_key, flat_line = self.parse_btree._flatten_node(
             (None, key, value, refs), bool(refs))

=== modified file 'breezy/bzr/tests/test_bundle.py'
--- breezy/bzr/tests/test_bundle.py	2022-09-22 22:55:28 +0000
+++ breezy/bzr/tests/test_bundle.py	2022-10-19 15:51:12 +0000
@@ -393,10 +393,10 @@
         return tests.TestCaseWithTransport.make_branch_and_tree(
             self, path, format)
 
-    def make_branch(self, path, format=None):
+    def make_branch(self, path, format=None, name=None):
         if format is None:
             format = self.bzrdir_format()
-        return tests.TestCaseWithTransport.make_branch(self, path, format)
+        return tests.TestCaseWithTransport.make_branch(self, path, format, name=name)
 
     def create_bundle_text(self, base_rev_id, rev_id):
         bundle_txt = BytesIO()

=== modified file 'breezy/bzr/tests/test_inv.py'
--- breezy/bzr/tests/test_inv.py	2022-07-02 13:44:01 +0000
+++ breezy/bzr/tests/test_inv.py	2022-10-19 15:51:12 +0000
@@ -716,7 +716,7 @@
         dir = inventory.InventoryLink(b'123', 'hello.c', ROOT_ID)
         self.assertEqual(dir.kind_character(), '')
 
-    def test_link_kind_character(self):
+    def test_tree_ref_kind_character(self):
         dir = TreeReference(b'123', 'hello.c', ROOT_ID)
         self.assertEqual(dir.kind_character(), '+')
 

=== modified file 'breezy/bzr/tests/test_pack.py'
--- breezy/bzr/tests/test_pack.py	2022-07-16 17:53:49 +0000
+++ breezy/bzr/tests/test_pack.py	2022-10-19 15:51:12 +0000
@@ -178,16 +178,6 @@
             b'Bazaar pack format 1 (introduced in 0.18)\n'
             b'B3\nname1\nname2\n\nabc')
 
-    def test_add_bytes_record_two_names(self):
-        """Add a bytes record with two names."""
-        self.writer.begin()
-        offset, length = self.writer.add_bytes_record(
-            [b'abc'], len(b'abc'), names=[(b'name1', ), (b'name2', )])
-        self.assertEqual((42, 19), (offset, length))
-        self.assertOutput(
-            b'Bazaar pack format 1 (introduced in 0.18)\n'
-            b'B3\nname1\nname2\n\nabc')
-
     def test_add_bytes_record_two_element_name(self):
         """Add a bytes record with a two-element name."""
         self.writer.begin()

=== modified file 'breezy/bzr/tests/test_repository.py'
--- breezy/bzr/tests/test_repository.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/tests/test_repository.py	2022-10-19 15:51:12 +0000
@@ -403,9 +403,11 @@
         dummy_a = DummyRepository()
         dummy_a._format = RepositoryFormat()
         dummy_a._format.supports_full_versioned_files = True
+        dummy_a._format.rich_root_data = True
         dummy_b = DummyRepository()
         dummy_b._format = RepositoryFormat()
         dummy_b._format.supports_full_versioned_files = True
+        dummy_b._format.rich_root_data = True
         self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
 
     def assertGetsDefaultInterRepository(self, repo_a, repo_b):
@@ -585,54 +587,6 @@
         # versions of the file.
         self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
 
-    def test_fetch_combines_groups(self):
-        builder = self.make_branch_builder('source', format='2a')
-        builder.start_series()
-        builder.build_snapshot(None, [
-            ('add', ('', b'root-id', 'directory', '')),
-            ('add', ('file', b'file-id', 'file', b'content\n'))],
-            revision_id=b'1')
-        builder.build_snapshot([b'1'], [
-            ('modify', ('file', b'content-2\n'))],
-            revision_id=b'2')
-        builder.finish_series()
-        source = builder.get_branch()
-        target = self.make_repository('target', format='2a')
-        target.fetch(source.repository)
-        target.lock_read()
-        self.addCleanup(target.unlock)
-        details = target.texts._index.get_build_details(
-            [(b'file-id', b'1',), (b'file-id', b'2',)])
-        file_1_details = details[(b'file-id', b'1')]
-        file_2_details = details[(b'file-id', b'2')]
-        # The index, and what to read off disk, should be the same for both
-        # versions of the file.
-        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
-
-    def test_fetch_combines_groups(self):
-        builder = self.make_branch_builder('source', format='2a')
-        builder.start_series()
-        builder.build_snapshot(None, [
-            ('add', ('', b'root-id', 'directory', '')),
-            ('add', ('file', b'file-id', 'file', b'content\n'))],
-            revision_id=b'1')
-        builder.build_snapshot([b'1'], [
-            ('modify', ('file', b'content-2\n'))],
-            revision_id=b'2')
-        builder.finish_series()
-        source = builder.get_branch()
-        target = self.make_repository('target', format='2a')
-        target.fetch(source.repository)
-        target.lock_read()
-        self.addCleanup(target.unlock)
-        details = target.texts._index.get_build_details(
-            [(b'file-id', b'1',), (b'file-id', b'2',)])
-        file_1_details = details[(b'file-id', b'1')]
-        file_2_details = details[(b'file-id', b'2')]
-        # The index, and what to read off disk, should be the same for both
-        # versions of the file.
-        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
-
     def test_format_pack_compresses_True(self):
         repo = self.make_repository('repo', format='2a')
         self.assertTrue(repo._format.pack_compresses)

=== modified file 'breezy/bzr/tests/test_smart_transport.py'
--- breezy/bzr/tests/test_smart_transport.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/tests/test_smart_transport.py	2022-10-19 15:51:12 +0000
@@ -26,6 +26,7 @@
 import sys
 import threading
 import time
+from typing import Type, Optional
 
 from testtools.matchers import DocTestMatches
 
@@ -1936,10 +1937,10 @@
     Subclasses can override client_protocol_class and server_protocol_class.
     """
 
-    request_encoder = None
-    response_decoder = None
-    server_protocol_class = None
-    client_protocol_class = None
+    request_encoder: object
+    response_decoder: Type[protocol._StatefulDecoder]
+    server_protocol_class: Type[protocol.SmartProtocolBase]
+    client_protocol_class: Optional[Type[protocol.SmartProtocolBase]] = None
 
     def make_client_protocol_and_output(self, input_bytes=None):
         """
@@ -2785,7 +2786,7 @@
     # method.  So we make server_protocol_class be a static method, rather than
     # simply doing:
     # "server_protocol_class = protocol.build_server_protocol_three".
-    server_protocol_class = staticmethod(protocol.build_server_protocol_three)
+    server_protocol_class = staticmethod(protocol.build_server_protocol_three)  # type: ignore
 
     def setUp(self):
         super(TestVersionOneFeaturesInProtocolThree, self).setUp()
@@ -2835,7 +2836,7 @@
 
     request_encoder = protocol.ProtocolThreeRequester
     response_decoder = protocol.ProtocolThreeDecoder
-    server_protocol_class = protocol.ProtocolThreeDecoder
+    server_protocol_class = protocol.ProtocolThreeDecoder  # type: ignore
 
     def test_trivial_request(self):
         """Smoke test for the simplest possible v3 request: empty headers, no
@@ -3207,7 +3208,7 @@
 
     request_encoder = protocol.ProtocolThreeRequester
     response_decoder = protocol.ProtocolThreeDecoder
-    server_protocol_class = protocol.ProtocolThreeDecoder
+    server_protocol_class = protocol.ProtocolThreeDecoder  # type: ignore
 
     def make_client_encoder_and_output(self):
         result = self.make_client_protocol_and_output()

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2022-09-08 14:15:34 +0000
+++ breezy/bzr/versionedfile.py	2022-10-19 15:51:12 +0000
@@ -39,7 +39,6 @@
     )
 from breezy.bzr import (
     groupcompress,
-    index,
     knit,
     )
 """)
@@ -50,6 +49,10 @@
 from ..registry import Registry
 from ..textmerge import TextMerge
 
+from . import (
+    index,
+    )
+
 
 adapter_registry = Registry()
 adapter_registry.register_lazy(('knit-annotated-delta-gz', 'knit-delta-gz'),

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/workingtree.py	2022-10-19 15:51:12 +0000
@@ -33,7 +33,7 @@
 from bisect import bisect_left
 import breezy
 try:
-    from collections.abc import deque
+    from collections.abc import deque  # type: ignore
 except ImportError:  # python < 3.7
     from collections import deque
 import errno
@@ -57,7 +57,6 @@
     globbing,
     ignores,
     merge,
-    revision as _mod_revision,
     )
 from breezy.bzr import (
     conflicts as _mod_bzr_conflicts,
@@ -73,6 +72,7 @@
 from .. import (
     errors,
     osutils,
+    revision as _mod_revision,
     transport as _mod_transport,
     )
 from ..controldir import ControlDir
@@ -767,6 +767,40 @@
                 raise _mod_transport.NoSuchFile(path)
             raise
 
+    def path_content_summary(self, path, _lstat=os.lstat,
+                             _mapper=osutils.file_kind_from_stat_mode):
+        """See Tree.path_content_summary."""
+        abspath = self.abspath(path)
+        try:
+            stat_result = _lstat(abspath)
+        except OSError as e:
+            if getattr(e, 'errno', None) == errno.ENOENT:
+                # no file.
+                return ('missing', None, None, None)
+            # propagate other errors
+            raise
+        kind = _mapper(stat_result.st_mode)
+        if kind == 'file':
+            return self._file_content_summary(path, stat_result)
+        elif kind == 'directory':
+            # perhaps it looks like a plain directory, but it's really a
+            # reference.
+            if self._directory_is_tree_reference(path):
+                kind = 'tree-reference'
+            return kind, None, None, None
+        elif kind == 'symlink':
+            target = osutils.readlink(abspath)
+            return ('symlink', None, None, target)
+        else:
+            return (kind, None, None, None)
+
+    def _file_content_summary(self, path, stat_result):
+        size = stat_result.st_size
+        executable = self._is_executable_from_path_and_stat(path, stat_result)
+        # try for a stat cache lookup
+        return ('file', size, executable, self._sha_from_stat(
+            path, stat_result))
+
     def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
         try:
             return self._path2ie(path).executable

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/workingtree_4.py	2022-10-19 15:51:12 +0000
@@ -38,13 +38,11 @@
     debug,
     filters as _mod_filters,
     osutils,
-    revision as _mod_revision,
     revisiontree,
     trace,
     views,
     )
 from breezy.bzr import (
-    dirstate,
     generate_ids,
     transform as bzr_transform,
     )
@@ -52,8 +50,8 @@
 
 from .. import (
     errors,
+    revision as _mod_revision,
     )
-from .inventory import Inventory, ROOT_ID, entry_factory
 from ..lock import LogicalLockResult
 from ..lockable_files import LockableFiles
 from ..lockdir import LockDir
@@ -83,10 +81,12 @@
 from ..workingtree import (
     WorkingTree,
     )
+from .inventory import Inventory, ROOT_ID, entry_factory
 from .workingtree import (
     InventoryWorkingTree,
     WorkingTreeFormatMetaDir,
     )
+from . import dirstate
 
 
 class DirStateWorkingTree(InventoryWorkingTree):
@@ -453,7 +453,7 @@
         return self._inventory
 
     root_inventory = property(_get_root_inventory,
-                              "Root inventory of this tree")
+                              doc="Root inventory of this tree")
 
     def get_parent_ids(self):
         """See Tree.get_parent_ids.

=== modified file 'breezy/bzr/xml8.py'
--- breezy/bzr/xml8.py	2021-11-13 12:44:39 +0000
+++ breezy/bzr/xml8.py	2022-10-19 15:51:12 +0000
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from io import BytesIO
+from typing import List, Optional
 
 from .. import (
     lazy_regex,
@@ -69,16 +69,16 @@
     Its revision format number matches its inventory number.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
-    root_id = None
+    root_id: Optional[bytes] = None
     support_altered_by_hack = True
     # This format supports the altered-by hack that reads file ids directly out
     # of the versionedfile, without doing XML parsing.
 
     supported_kinds = {'file', 'directory', 'symlink'}
     format_num = b'8'
-    revision_format_num = None
+    revision_format_num: Optional[bytes] = None
 
     # The search regex used by xml based repositories to determine what things
     # where changed in a single commit.

=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2022-01-21 17:19:24 +0000
+++ breezy/bzr/xml_serializer.py	2022-10-19 15:51:12 +0000
@@ -23,24 +23,12 @@
 # ElementTree bits
 
 import re
-
-try:
-    import xml.etree.cElementTree as elementtree
-    from xml.etree.ElementTree import ParseError
-except ImportError:
-    # Fall back to pure python implementation if C extension is unavailable
-    import xml.etree.ElementTree as elementtree
-    try:
-        from xml.etree.ElementTree import ParseError
-    except ImportError:
-        from xml.parsers.expat import ExpatError as ParseError
-
-(ElementTree, SubElement, Element, fromstringlist, tostringlist, tostring,
- fromstring) = (
-    elementtree.ElementTree, elementtree.SubElement, elementtree.Element,
-    elementtree.fromstringlist, elementtree.tostringlist, elementtree.tostring,
-    elementtree.fromstring)
-
+from typing import Dict, Union
+
+from xml.etree.ElementTree import (
+    ElementTree, SubElement, Element,
+    fromstringlist, tostringlist, tostring,
+    fromstring, ParseError)
 
 from .. import (
     errors,
@@ -193,7 +181,7 @@
                         for uni_chr in match.group().decode('utf8'))
 
 
-_to_escaped_map = {}
+_to_escaped_map: Dict[Union[bytes, str], str] = {}
 
 
 def encode_and_escape(unicode_or_utf8_str, _map=_to_escaped_map):

=== modified file 'breezy/cache_utf8.py'
--- breezy/cache_utf8.py	2020-02-18 01:57:45 +0000
+++ breezy/cache_utf8.py	2022-10-19 15:51:12 +0000
@@ -19,10 +19,11 @@
 
 """Some functions to enable caching the conversion between unicode to utf8"""
 
-import codecs
-
-_utf8_encode = codecs.utf_8_encode
-_utf8_decode = codecs.utf_8_decode
+from codecs import (
+    utf_8_encode as _utf8_encode,
+    utf_8_decode as _utf8_decode,
+)
+from typing import Dict
 
 
 def _utf8_decode_with_None(bytestring, _utf8_decode=_utf8_decode):
@@ -40,8 +41,8 @@
 # Map revisions from and to utf8 encoding
 # Whenever we do an encode/decode operation, we save the result, so that
 # we don't have to do it again.
-_unicode_to_utf8_map = {}
-_utf8_to_unicode_map = {}
+_unicode_to_utf8_map: Dict[str, bytes] = {}
+_utf8_to_unicode_map: Dict[bytes, str] = {}
 
 
 def encode(unicode_str,

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2022-07-02 13:44:01 +0000
+++ breezy/commands.py	2022-10-19 15:51:12 +0000
@@ -24,6 +24,7 @@
 import contextlib
 import os
 import sys
+from typing import Type, List, Union, Optional
 
 from . import (
     i18n,
@@ -33,7 +34,6 @@
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-import errno
 
 import breezy
 from breezy import (
@@ -50,11 +50,6 @@
 from . import errors, registry
 
 
-class BzrOptionError(errors.CommandError):
-
-    _fmt = "Error in command line options"
-
-
 class CommandAvailableInPlugin(Exception):
 
     internal_error = False
@@ -284,7 +279,8 @@
     return candidate
 
 
-def get_cmd_object(cmd_name, plugins_override=True):
+def get_cmd_object(
+        cmd_name: str, plugins_override: bool = True) -> Command:
     """Return the command object for a command.
 
     plugins_override
@@ -303,7 +299,9 @@
                                   % cmd_name)
 
 
-def _get_cmd_object(cmd_name, plugins_override=True, check_missing=True):
+def _get_cmd_object(
+        cmd_name: str, plugins_override: bool = True,
+        check_missing: bool = True) -> Command:
     """Get a command object.
 
     :param cmd_name: The name of the command.
@@ -317,7 +315,7 @@
     # in a Unicode name. In that case, they should just get a
     # 'command not found' error later.
     # In the future, we may actually support Unicode command names.
-    cmd = None
+    cmd: Optional[Command] = None
     # Get a command
     for hook in Command.hooks['get_command']:
         cmd = hook(cmd, cmd_name)
@@ -469,14 +467,17 @@
             class Foo(Command):
                 __doc__ = "My help goes here"
     """
-    aliases = []
-    takes_args = []
-    takes_options = []
-    encoding_type = 'strict'
-    invoked_as = None
-    l10n = True
-
-    hidden = False
+    aliases: List[str] = []
+    takes_args: List[str] = []
+    takes_options: List[Union[str, option.Option]] = []
+    encoding_type: str = 'strict'
+    invoked_as: Optional[str] = None
+    l10n: bool = True
+    _see_also: List[str]
+
+    hidden: bool = False
+
+    hooks: Hooks
 
     def __init__(self):
         """Construct an instance of this command."""
@@ -783,7 +784,7 @@
                     hook(self)
         self.run = run
 
-    def run(self):
+    def run(self):  # type: ignore
         """Actually run the command.
 
         This is invoked with the options and arguments bound to
@@ -884,7 +885,7 @@
             "object.", (2, 6))
 
 
-Command.hooks = CommandHooks()
+Command.hooks = CommandHooks()  # type: ignore
 
 
 def parse_args(command, argv, alias_argv=None):
@@ -1222,6 +1223,7 @@
             sys.stdout.flush()
             return result
         except IOError as e:
+            import errno
             if getattr(e, 'errno', None) is None:
                 raise
             if e.errno != errno.EPIPE:

=== modified file 'breezy/config.py'
--- breezy/config.py	2022-09-01 19:17:39 +0000
+++ breezy/config.py	2022-10-19 15:51:12 +0000
@@ -82,7 +82,7 @@
 import configobj
 from io import BytesIO
 
-from typing import Tuple, Iterable
+from typing import Tuple, Iterable, Dict
 
 import breezy
 from .lazy_import import lazy_import
@@ -3035,7 +3035,7 @@
         for hook in ConfigHooks['save']:
             hook(self)
 
-    def get_sections(self) -> Iterable[Tuple[Store, str]]:
+    def get_sections(self) -> Iterable[Tuple[Store, Section]]:
         """Get the configobj section in the file order.
 
         Returns: An iterable of (store, section).
@@ -3433,7 +3433,7 @@
 
 # FIXME: _shared_stores should be an attribute of a library state once a
 # library_state object is always available.
-_shared_stores = {}
+_shared_stores: Dict[str, Store] = {}
 _shared_stores_at_exit_installed = False
 
 

=== modified file 'breezy/conflicts.py'
--- breezy/conflicts.py	2021-11-13 13:01:39 +0000
+++ breezy/conflicts.py	2022-10-19 15:51:12 +0000
@@ -311,7 +311,7 @@
 class Conflict(object):
     """Base class for conflicts."""
 
-    typestring = None
+    typestring: str
 
     def __init__(self, path):
         self.path = path

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2022-09-12 18:35:44 +0000
+++ breezy/controldir.py	2022-10-19 15:51:12 +0000
@@ -24,13 +24,14 @@
 
 """
 
+from typing import List, Type, Optional
+
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import textwrap
 
 from breezy import (
     branch as _mod_branch,
-    hooks,
     revision as _mod_revision,
     ui,
     urlutils,
@@ -42,6 +43,7 @@
 
 from . import (
     errors,
+    hooks,
     registry,
     trace,
     transport as _mod_transport,
@@ -125,6 +127,8 @@
     API users to check for magic attributes to see what features are supported.
     """
 
+    hooks: hooks.Hooks
+
     def can_convert_format(self):
         """Return true if this controldir is one whose format we can convert
         from."""
@@ -948,7 +952,7 @@
 
 
 # install the default hooks
-ControlDir.hooks = ControlDirHooks()
+ControlDir.hooks = ControlDirHooks()  # type: ignore
 
 
 class ControlComponentFormat(object):
@@ -1099,10 +1103,10 @@
                                  working tree.
     """
 
-    _default_format = None
+    _default_format: Optional["ControlDirFormat"] = None
     """The default format used for new control directories."""
 
-    _probers = []
+    _probers: List[Type["Prober"]] = []
     """The registered format probers, e.g. BzrProber.
 
     This is a list of Prober-derived classes.

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2022-09-22 22:55:28 +0000
+++ breezy/diff.py	2022-10-19 15:51:12 +0000
@@ -26,7 +26,6 @@
 import errno
 import patiencediff
 import subprocess
-import tempfile
 
 from breezy import (
     controldir,
@@ -255,6 +254,7 @@
 def external_diff(old_label, oldlines, new_label, newlines, to_file,
                   diff_opts):
     """Display a diff by calling out to the external diff program."""
+    import tempfile
     # make sure our own output is properly ordered before the diff
     to_file.flush()
 
@@ -775,8 +775,10 @@
     def __init__(self, command_template: Union[str, List[str]],
             old_tree: Tree, new_tree: Tree, to_file,
                  path_encoding='utf-8'):
+        import tempfile
         DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
         self.command_template = command_template
+        import tempfile
         self._root = tempfile.mkdtemp(prefix='brz-diff-')
 
     @classmethod

=== modified file 'breezy/doc_generate/conf.py'
--- breezy/doc_generate/conf.py	2020-02-18 01:57:45 +0000
+++ breezy/doc_generate/conf.py	2022-10-19 15:51:12 +0000
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+from typing import Dict, Any, List
+
 #
 # Bazaar documentation build configuration file, created by
 # sphinx-quickstart on Tue Jul 21 17:04:52 2009.
@@ -100,7 +103,7 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
+html_theme_options: Dict[str, Any] = {
     # Unfortunately, the right sidebar breaks under IE6 and maybe IE7.
     # So we stick with the default left placement to cater for users stuck
     # on those browsers.
@@ -196,7 +199,7 @@
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = []
+latex_documents: List[Any] = []
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2022-08-22 18:19:46 +0000
+++ breezy/errors.py	2022-10-19 15:51:12 +0000
@@ -875,6 +875,8 @@
 
 class NoSuchRevision(InternalBzrError):
 
+    revision: bytes
+
     _fmt = "%(branch)s has no revision %(revision)s"
 
     def __init__(self, branch, revision):

=== modified file 'breezy/filters/__init__.py'
--- breezy/filters/__init__.py	2022-07-02 13:44:01 +0000
+++ breezy/filters/__init__.py	2022-10-19 15:51:12 +0000
@@ -43,6 +43,8 @@
     BytesIO,
     )
 
+from typing import List, Tuple, Dict
+
 from .. import (
     errors,
     osutils,
@@ -65,6 +67,10 @@
         return "reader: %s, writer: %s" % (self.reader, self.writer)
 
 
+Preferences = List[Tuple[str, str]]
+Stack = List[ContentFilter]
+
+
 class ContentFilterContext(object):
     """Object providing information that filters can use."""
 
@@ -168,7 +174,7 @@
 
 # Cache of preferences -> stack
 # TODO: make this per branch (say) rather than global
-_stack_cache = {}
+_stack_cache: Dict[Preferences, Stack] = {}
 
 
 def _get_registered_names():
@@ -178,7 +184,7 @@
     return filter_stacks_registry.keys()
 
 
-def _get_filter_stack_for(preferences):
+def _get_filter_stack_for(preferences: Preferences) -> Stack:
     """Get the filter stack given a sequence of preferences.
 
     :param preferences: a sequence of (name,value) tuples where

=== modified file 'breezy/foreign.py'
--- breezy/foreign.py	2020-02-18 01:57:45 +0000
+++ breezy/foreign.py	2022-10-19 15:51:12 +0000
@@ -39,7 +39,7 @@
 
     # Prefix used when importing revisions native to the foreign VCS (as
     # opposed to roundtripping bzr-native revisions) using this mapping.
-    revid_prefix = None
+    revid_prefix: bytes
 
     def __init__(self, vcs):
         """Create a new VcsMapping.
@@ -191,7 +191,7 @@
     """
 
     # This repository's native version control system
-    vcs = None
+    vcs: ForeignVcs
 
     def has_foreign_revision(self, foreign_revid):
         """Check whether the specified foreign revision is present.

=== modified file 'breezy/forge.py'
--- breezy/forge.py	2022-07-17 01:52:51 +0000
+++ breezy/forge.py	2022-10-19 15:51:12 +0000
@@ -259,7 +259,7 @@
 
     # Does this forge support arbitrary labels being attached to merge
     # proposals?
-    supports_merge_proposal_labels = None
+    supports_merge_proposal_labels: bool
 
     @property
     def name(self):
@@ -268,18 +268,18 @@
 
     # Does this forge support suggesting a commit message in the
     # merge proposal?
-    supports_merge_proposal_commit_message = None
+    supports_merge_proposal_commit_message: bool
 
     # The base_url that would be visible to users. I.e. https://github.com/
     # rather than https://api.github.com/
-    base_url = None
+    base_url: str
 
     # The syntax to use for formatting merge proposal descriptions.
     # Common values: 'plain', 'markdown'
-    merge_proposal_description_format = None
+    merge_proposal_description_format: str
 
     # Does this forge support the allow_collaboration flag?
-    supports_allow_collaboration = False
+    supports_allow_collaboration: bool = False
 
     def publish_derived(self, new_branch, base_branch, name, project=None,
                         owner=None, revision_id=None, overwrite=False,

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2022-08-28 18:54:11 +0000
+++ breezy/git/branch.py	2022-10-19 15:51:12 +0000
@@ -21,6 +21,7 @@
 import contextlib
 from io import BytesIO
 from collections import defaultdict
+from typing import Dict
 
 from dulwich.config import (
     ConfigFile as GitConfigFile,
@@ -465,7 +466,7 @@
         self._user_transport = controldir.user_transport.clone('.')
         self._control_transport = controldir.control_transport.clone('.')
         self._tag_refs = None
-        params = {}
+        params: Dict[str, str] = {}
         try:
             self.name = ref_to_branch_name(ref)
         except ValueError:

=== modified file 'breezy/git/cache.py'
--- breezy/git/cache.py	2022-08-22 18:19:46 +0000
+++ breezy/git/cache.py	2022-10-19 15:51:12 +0000
@@ -16,16 +16,14 @@
 
 """Map from Git sha's to Bazaar objects."""
 
+import os
+import threading
+
 from dulwich.objects import (
     sha_to_hex,
     hex_to_sha,
-    )
-import os
-import threading
-
-from dulwich.objects import (
     ShaFile,
-    )
+)
 
 from .. import (
     bedding,
@@ -33,17 +31,17 @@
     osutils,
     registry,
     trace,
-    )
+)
 from ..bzr import (
     btree_index as _mod_btree_index,
     index as _mod_index,
     versionedfile,
-    )
+)
 from ..transport import (
     get_transport_from_path,
     FileExists,
     NoSuchFile,
-    )
+)
 
 
 def get_cache_dir():
@@ -67,30 +65,6 @@
     return get_transport_from_path(path)
 
 
-def check_pysqlite_version(sqlite3):
-    """Check that sqlite library is compatible.
-
-    """
-    if (sqlite3.sqlite_version_info[0] < 3
-            or (sqlite3.sqlite_version_info[0] == 3 and
-                sqlite3.sqlite_version_info[1] < 3)):
-        trace.warning('Needs at least sqlite 3.3.x')
-        raise bzr_errors.BzrError("incompatible sqlite library")
-
-
-try:
-    try:
-        import sqlite3
-        check_pysqlite_version(sqlite3)
-    except (ImportError, bzr_errors.BzrError):
-        from pysqlite2 import dbapi2 as sqlite3
-        check_pysqlite_version(sqlite3)
-except BaseException:
-    trace.warning('Needs at least Python2.5 or Python2.4 with the pysqlite2 '
-                  'module')
-    raise bzr_errors.BzrError("missing sqlite library")
-
-
 _mapdbs = threading.local()
 
 
@@ -420,6 +394,7 @@
     """Bazaar GIT Sha map that uses a sqlite database for storage."""
 
     def __init__(self, path=None):
+        import sqlite3
         self.path = path
         if path is None:
             self.db = sqlite3.connect(":memory:")

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2022-08-22 18:19:46 +0000
+++ breezy/git/dir.py	2022-10-19 15:51:12 +0000
@@ -23,7 +23,7 @@
 try:
     from dulwich.refs import SymrefLoop
 except ImportError:
-    SymrefLoop = KeyError
+    SymrefLoop = KeyError  # type: ignore
 
 from .. import (
     branch as _mod_branch,

=== modified file 'breezy/git/filegraph.py'
--- breezy/git/filegraph.py	2022-01-04 18:23:48 +0000
+++ breezy/git/filegraph.py	2022-10-19 15:51:12 +0000
@@ -23,11 +23,7 @@
 from dulwich.errors import (
     NotTreeError,
     )
-try:
-    from dulwich.objects import SubmoduleEncountered
-except ImportError:
-    class SubmoduleEncountered(Exception):
-        pass
+from dulwich.objects import SubmoduleEncountered
 from dulwich.object_store import (
     tree_lookup_path,
     )

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2022-08-26 08:53:40 +0000
+++ breezy/git/mapping.py	2022-10-19 15:51:12 +0000
@@ -20,6 +20,7 @@
 
 import base64
 import stat
+from typing import Optional
 
 import fastbencode as bencode
 

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2022-09-14 19:01:01 +0000
+++ breezy/git/remote.py	2022-10-19 15:51:12 +0000
@@ -22,7 +22,7 @@
 try:
     from dulwich.refs import SymrefLoop
 except ImportError:
-    SymrefLoop = KeyError
+    SymrefLoop = KeyError  # type: ignore
 
 from .. import (
     config,
@@ -125,7 +125,6 @@
 import select
 
 import urllib.parse as urlparse
-from urllib.parse import splituser
 
 # urlparse only supports a limited number of schemes by default
 register_urlparse_netloc_protocol('git')

=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2022-01-24 20:22:05 +0000
+++ breezy/git/repository.py	2022-10-19 15:51:12 +0000
@@ -115,7 +115,6 @@
 class GitRepository(ForeignRepository):
     """An adapter to git repositories for bzr."""
 
-    _serializer = None
     vcs = foreign_vcs_git
     chk_bytes = None
 
@@ -583,6 +582,8 @@
     supports_custom_revision_properties = False
     records_per_file_revision = False
     supports_multiple_authors = False
+    supports_ghosts = False
+    supports_chks = False
 
     @property
     def _matchingcontroldir(self):

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-09-14 13:52:36 +0000
+++ breezy/git/tests/test_remote.py	2022-10-19 15:51:12 +0000
@@ -308,7 +308,7 @@
 
     _test_needs_features = [ExecutableFeature('git')]
 
-    _to_format = None
+    _to_format: str
 
     def setUp(self):
         TestCaseWithTransport.setUp(self)
@@ -495,7 +495,7 @@
 
     _test_needs_features = [ExecutableFeature('git')]
 
-    _from_format = None
+    _from_format: str
 
     def setUp(self):
         TestCaseWithTransport.setUp(self)

=== modified file 'breezy/git/tests/test_repository.py'
--- breezy/git/tests/test_repository.py	2022-09-30 23:41:52 +0000
+++ breezy/git/tests/test_repository.py	2022-10-19 15:51:12 +0000
@@ -240,7 +240,7 @@
         r = dulwich.repo.Repo('.')
         self.assertEqual(b'Joe Example <[e-mail]>', r[r.head()].author)
 
-    def test_authors(self):
+    def test_authors_single_author(self):
         wt = self.make_branch_and_tree('.', format='git')
         revid = wt.commit(
             "base", allow_pointless=True,

=== modified file 'breezy/git/transportgit.py'
--- breezy/git/transportgit.py	2022-09-14 13:52:36 +0000
+++ breezy/git/transportgit.py	2022-10-19 15:51:12 +0000
@@ -54,7 +54,7 @@
 try:
     from dulwich.refs import SymrefLoop
 except ImportError:  # dulwich < 0.20.46
-    SymrefLoop = KeyError
+    SymrefLoop = KeyError  # type: ignore
 from dulwich.repo import (
     BaseRepo,
     InfoRefsContainer,

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2022-10-02 16:57:16 +0000
+++ breezy/git/tree.py	2022-10-19 15:51:12 +0000
@@ -996,8 +996,6 @@
 class InterGitTrees(_mod_tree.InterTree):
     """InterTree that works between two git trees."""
 
-    _matching_from_tree_format = None
-    _matching_to_tree_format = None
     _test_mutable_trees_to_test_trees = None
 
     def __init__(self, source, target):
@@ -1618,7 +1616,11 @@
             raise
         kind = mode_kind(stat_result.st_mode)
         if kind == 'file':
-            return self._file_content_summary(path, stat_result)
+            size = stat_result.st_size
+            executable = self._is_executable_from_path_and_stat(path, stat_result)
+            # try for a stat cache lookup
+            return ('file', size, executable, self._sha_from_stat(
+                path, stat_result))
         elif kind == 'directory':
             # perhaps it looks like a plain directory, but it's really a
             # reference.

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/git/workingtree.py	2022-10-19 15:51:12 +0000
@@ -1303,7 +1303,7 @@
     def _read_submodule_head(self, path):
         return read_submodule_head(self.abspath(path))
 
-    def get_reference_revision(self, path, branch=None):
+    def get_reference_revision(self, path):
         hexsha = self._read_submodule_head(path)
         if hexsha is None:
             (index, subpath) = self._lookup_index(

=== modified file 'breezy/graph.py'
--- breezy/graph.py	2020-02-18 01:57:45 +0000
+++ breezy/graph.py	2022-10-19 15:51:12 +0000
@@ -722,7 +722,7 @@
                                  all_unique_searcher._iterations)
             unique_tip_searchers = next_unique_searchers
 
-    def get_parent_map(self, revisions):
+    def get_parent_map(self, revisions):   # type: ignore
         """Get a map of key:parent_list for revisions.
 
         This implementation delegates to get_parents, for old parent_providers

=== modified file 'breezy/hooks.py'
--- breezy/hooks.py	2022-07-09 20:29:40 +0000
+++ breezy/hooks.py	2022-10-19 15:51:12 +0000
@@ -18,6 +18,8 @@
 
 """Support for plugin hooking logic."""
 
+from typing import Dict, Tuple, List
+
 from . import (
     errors,
     registry,
@@ -436,7 +438,7 @@
 
 # Lazily registered hooks. Maps (module, name, hook_name) tuples
 # to lists of tuples with objectgetters and names
-_lazy_hooks = {}
+_lazy_hooks: Dict[Tuple[str, str, str], List[Tuple[registry._ObjectGetter, str]]] = {}
 
 
 def install_lazy_named_hook(hookpoints_module, hookpoints_name, hook_name,

=== modified file 'breezy/ignores.py'
--- breezy/ignores.py	2020-02-18 01:57:45 +0000
+++ breezy/ignores.py	2022-10-19 15:51:12 +0000
@@ -19,6 +19,7 @@
 import errno
 from io import BytesIO
 import os
+from typing import Set
 
 import breezy
 from .lazy_import import lazy_import
@@ -154,7 +155,7 @@
     return to_add
 
 
-_runtime_ignores = set()
+_runtime_ignores: Set[str] = set()
 
 
 def add_runtime_ignores(ignores):

=== modified file 'breezy/lock.py'
--- breezy/lock.py	2022-05-15 14:17:32 +0000
+++ breezy/lock.py	2022-10-19 15:51:12 +0000
@@ -37,6 +37,7 @@
 import errno
 import os
 import sys
+from typing import Dict, Set, List, Tuple, Type, Any
 import warnings
 
 from . import (
@@ -184,7 +185,7 @@
         raise NotImplementedError()
 
 
-_lock_classes = []
+_lock_classes: List[Tuple[str, Any, Any]] = []
 
 
 if have_fcntl:
@@ -197,7 +198,7 @@
 
     class _fcntl_WriteLock(_fcntl_FileLock):
 
-        _open_locks = set()
+        _open_locks: Set[str] = set()
 
         def __init__(self, filename):
             super(_fcntl_WriteLock, self).__init__()
@@ -237,7 +238,7 @@
 
     class _fcntl_ReadLock(_fcntl_FileLock):
 
-        _open_locks = {}
+        _open_locks: Dict[str, int] = {}
 
         def __init__(self, filename):
             super(_fcntl_ReadLock, self).__init__()
@@ -349,12 +350,13 @@
 
 if have_ctypes_win32:
     from ctypes.wintypes import DWORD, LPWSTR
+    import ctypes
     LPSECURITY_ATTRIBUTES = ctypes.c_void_p  # used as NULL no need to declare
     HANDLE = ctypes.c_int  # rather than unsigned as in ctypes.wintypes
     _function_name = "CreateFileW"
 
     # CreateFile <http://msdn.microsoft.com/en-us/library/aa363858.aspx>
-    _CreateFile = ctypes.WINFUNCTYPE(
+    _CreateFile = ctypes.WINFUNCTYPE(   # type: ignore
         HANDLE,                # return value
         LPWSTR,                # lpFileName
         DWORD,                 # dwDesiredAccess
@@ -363,7 +365,7 @@
         DWORD,                 # dwCreationDisposition
         DWORD,                 # dwFlagsAndAttributes
         HANDLE                 # hTemplateFile
-        )((_function_name, ctypes.windll.kernel32))
+     )((_function_name, ctypes.windll.kernel32))  # type: ignore
 
     INVALID_HANDLE_VALUE = -1
 

=== modified file 'breezy/lsprof.py'
--- breezy/lsprof.py	2020-02-18 01:57:45 +0000
+++ breezy/lsprof.py	2022-10-19 15:51:12 +0000
@@ -4,15 +4,13 @@
 # instead of just the Stats object
 
 import codecs
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 import operator
 import os
 import sys
 import _thread
 import threading
+from typing import Dict
 from _lsprof import Profiler, profiler_entry
 
 from . import errors
@@ -291,7 +289,7 @@
         out_file.write('%d %d\n' % (lineno, totaltime))
 
 
-_fn2mod = {}
+_fn2mod: Dict[str, object] = {}
 
 
 def label(code, calltree=False):

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2022-09-22 23:36:26 +0000
+++ breezy/merge.py	2022-10-19 15:51:12 +0000
@@ -167,7 +167,7 @@
         is present.
     """
 
-    name_prefix = None
+    name_prefix: str
     default_files = None
 
     def __init__(self, merger):

=== modified file 'breezy/merge_directive.py'
--- breezy/merge_directive.py	2022-07-07 15:57:20 +0000
+++ breezy/merge_directive.py	2022-10-19 15:51:12 +0000
@@ -26,8 +26,6 @@
     diff,
     email_message,
     gpg,
-    hooks,
-    registry,
     revision as _mod_revision,
     timestamp,
     trace,
@@ -42,6 +40,8 @@
 """)
 from . import (
     errors,
+    hooks,
+    registry,
     )
 
 

=== modified file 'breezy/mutabletree.py'
--- breezy/mutabletree.py	2022-07-04 16:45:36 +0000
+++ breezy/mutabletree.py	2022-10-19 15:51:12 +0000
@@ -356,7 +356,7 @@
 
 
 # install the default hooks into the MutableTree class.
-MutableTree.hooks = MutableTreeHooks()
+MutableTree.hooks = MutableTreeHooks()  # type: ignore
 
 
 class PostCommitHookParams(object):

=== modified file 'breezy/option.py'
--- breezy/option.py	2020-06-23 01:02:30 +0000
+++ breezy/option.py	2022-10-19 15:51:12 +0000
@@ -19,6 +19,7 @@
 
 import optparse
 import re
+from typing import Dict
 
 from . import (
     errors,
@@ -141,12 +142,12 @@
     """
 
     # The dictionary of standard options. These are always legal.
-    STD_OPTIONS = {}
+    STD_OPTIONS: Dict[str, "Option"] = {}
 
     # The dictionary of commonly used options. these are only legal
     # if a command explicitly references them by name in the list
     # of supported options.
-    OPTIONS = {}
+    OPTIONS: Dict[str, "Option"] = {}
 
     def __init__(self, name, help='', type=None, argname=None,
                  short_name=None, param_name=None, custom_callback=None,

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2022-09-22 22:55:28 +0000
+++ breezy/osutils.py	2022-10-19 15:51:12 +0000
@@ -21,6 +21,7 @@
 import sys
 import time
 import codecs
+from typing import Dict, List
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -795,7 +796,7 @@
 
 
 # Cache of formatted offset strings
-_offset_cache = {}
+_offset_cache: Dict[int, str] = {}
 
 
 def format_date_with_offset_in_original_timezone(t, offset=0,
@@ -999,7 +1000,7 @@
     return pathjoin(*p)
 
 
-def parent_directories(filename):
+def parent_directories(filename: str):
     """Return the list of parent directories, deepest first.
 
     For example, parent_directories("a/b/c") -> ["a/b", "a"].
@@ -2017,12 +2018,12 @@
 # data at once.
 MAX_SOCKET_CHUNK = 64 * 1024
 
-_end_of_stream_errors = [errno.ECONNRESET, errno.EPIPE, errno.EINVAL]
+_end_of_stream_errors: List[int] = [errno.ECONNRESET, errno.EPIPE, errno.EINVAL]
 for _eno in ['WSAECONNRESET', 'WSAECONNABORTED']:
-    _eno = getattr(errno, _eno, None)
-    if _eno is not None:
-        _end_of_stream_errors.append(_eno)
-del _eno
+    try:
+        _end_of_stream_errors.append(getattr(errno, _eno))
+    except AttributeError:
+        pass
 
 
 def read_bytes_from_socket(sock, report_activity=None,

=== modified file 'breezy/plugins/darcs/__init__.py'
--- breezy/plugins/darcs/__init__.py	2020-08-10 15:00:17 +0000
+++ breezy/plugins/darcs/__init__.py	2022-10-19 15:51:12 +0000
@@ -54,10 +54,6 @@
     def _known_formats(self):
         return set([DarcsDirFormat()])
 
-    def open(self, transport, _found=False):
-        """Open this directory."""
-        raise DarcsUnsupportedError()
-
     def check_support_status(self, allow_unsupported, recommend_upgrade=True,
                              basedir=None):
         raise DarcsUnsupportedError()

=== modified file 'breezy/plugins/flake8/__init__.py'
--- breezy/plugins/flake8/__init__.py	2022-05-15 14:17:32 +0000
+++ breezy/plugins/flake8/__init__.py	2022-10-19 15:51:12 +0000
@@ -130,4 +130,4 @@
 
 
 from breezy.branch import Branch
-Branch.hooks.install_named_hook("pre_commit", _check_flake8, "Check flake8")
+Branch.hooks.install_named_hook("pre_commit", _check_flake8, "Check flake8")  # type: ignore

=== modified file 'breezy/plugins/launchpad/forge.py'
--- breezy/plugins/launchpad/forge.py	2022-09-06 20:41:25 +0000
+++ breezy/plugins/launchpad/forge.py	2022-10-19 15:51:12 +0000
@@ -215,8 +215,6 @@
 class Launchpad(Forge):
     """The Launchpad hosting service."""
 
-    name = 'launchpad'
-
     # https://bugs.launchpad.net/launchpad/+bug/397676
     supports_merge_proposal_labels = False
 

=== modified file 'breezy/plugins/launchpad/lp_registration.py'
--- breezy/plugins/launchpad/lp_registration.py	2022-05-15 14:17:32 +0000
+++ breezy/plugins/launchpad/lp_registration.py	2022-10-19 15:51:12 +0000
@@ -20,7 +20,6 @@
 from urllib.parse import urlsplit, urlunsplit
 import urllib
 from xmlrpc.client import (
-    __version__ as xmlrpc_version,
     Fault,
     ProtocolError,
     ServerProxy,
@@ -100,8 +99,8 @@
     # NB: these should always end in a slash to avoid xmlrpclib appending
     # '/RPC2'
     LAUNCHPAD_INSTANCE = {}
-    for instance, domain in LAUNCHPAD_DOMAINS.items():
-        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
+    for instance, _domain in LAUNCHPAD_DOMAINS.items():
+        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % _domain
 
     DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
 
@@ -214,7 +213,7 @@
     """Base request for talking to a XMLRPC server."""
 
     # Set this to the XMLRPC method name.
-    _methodname = None
+    _methodname: str
 
     def _request_params(self):
         """Return the arguments to pass to the method"""

=== modified file 'breezy/plugins/repodebug/check_chk.py'
--- breezy/plugins/repodebug/check_chk.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/repodebug/check_chk.py	2022-10-19 15:51:12 +0000
@@ -36,7 +36,6 @@
     """
 
     hidden = True
-    takes_args = []
     takes_options = ['directory', 'revision']
 
     def run(self, directory='.', revision=None):

=== modified file 'breezy/plugins/weave_fmt/bzrdir.py'
--- breezy/plugins/weave_fmt/bzrdir.py	2022-08-22 18:19:46 +0000
+++ breezy/plugins/weave_fmt/bzrdir.py	2022-10-19 15:51:12 +0000
@@ -32,6 +32,7 @@
     )
 from ... import (
     errors,
+    lockable_files,
     )
 from ...transport import (
     get_transport,
@@ -46,7 +47,6 @@
 from breezy import (
     branch as _mod_branch,,
     graph,
-    lockable_files,
     lockdir,
     osutils,
     revision as _mod_revision,

=== modified file 'breezy/plugins/weave_fmt/test_store.py'
--- breezy/plugins/weave_fmt/test_store.py	2022-05-03 20:36:36 +0000
+++ breezy/plugins/weave_fmt/test_store.py	2022-10-19 15:51:12 +0000
@@ -287,7 +287,7 @@
         my_store.add(stream, b"foo", b'dsc')
         self.assertEqual([("_add", "foo.dsc", stream)], my_store._calls)
 
-    def test_add_simple_suffixed(self):
+    def test_add_simple_suffixed_dir(self):
         stream = BytesIO(b"content")
         my_store = InstrumentedTransportStore(MockTransport(), True)
         my_store.register_suffix('dsc')

=== modified file 'breezy/plugins/weave_fmt/xml4.py'
--- breezy/plugins/weave_fmt/xml4.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/weave_fmt/xml4.py	2022-10-19 15:51:12 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from typing import List
+
 from ...bzr.xml_serializer import (
     Element,
     SubElement,
@@ -34,7 +36,7 @@
     v4 serialisation is no longer supported, only deserialisation.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     def _pack_entry(self, ie):
         """Convert InventoryEntry to XML element"""

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2022-07-02 13:44:01 +0000
+++ breezy/repository.py	2022-10-19 15:51:12 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from typing import List, Type
+
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import time
@@ -1276,61 +1278,61 @@
 
     # Set to True or False in derived classes. True indicates that the format
     # supports ghosts gracefully.
-    supports_ghosts = None
+    supports_ghosts: bool
     # Can this repository be given external locations to lookup additional
     # data. Set to True or False in derived classes.
-    supports_external_lookups = None
+    supports_external_lookups: bool
     # Does this format support CHK bytestring lookups. Set to True or False in
     # derived classes.
-    supports_chks = None
+    supports_chks: bool
     # Should fetch trigger a reconcile after the fetch? Only needed for
     # some repository formats that can suffer internal inconsistencies.
-    _fetch_reconcile = False
+    _fetch_reconcile: bool = False
     # Does this format have < O(tree_size) delta generation. Used to hint what
     # code path for commit, amongst other things.
-    fast_deltas = None
+    fast_deltas: bool
     # Does doing a pack operation compress data? Useful for the pack UI command
     # (so if there is one pack, the operation can still proceed because it may
     # help), and for fetching when data won't have come from the same
     # compressor.
-    pack_compresses = False
+    pack_compresses: bool = False
     # Does the repository storage understand references to trees?
-    supports_tree_reference = None
+    supports_tree_reference: bool
     # Is the format experimental ?
-    experimental = False
+    experimental: bool = False
     # Does this repository format escape funky characters, or does it create
     # files with similar names as the versioned files in its contents on disk
     # ?
-    supports_funky_characters = None
+    supports_funky_characters: bool
     # Does this repository format support leaving locks?
-    supports_leaving_lock = None
+    supports_leaving_lock: bool
     # Does this format support the full VersionedFiles interface?
-    supports_full_versioned_files = None
+    supports_full_versioned_files: bool
     # Does this format support signing revision signatures?
-    supports_revision_signatures = True
+    supports_revision_signatures: bool = True
     # Can the revision graph have incorrect parents?
-    revision_graph_can_have_wrong_parents = None
+    revision_graph_can_have_wrong_parents: bool
     # Does this format support setting revision ids?
-    supports_setting_revision_ids = True
+    supports_setting_revision_ids: bool = True
     # Does this format support rich root data?
-    rich_root_data = None
+    rich_root_data: bool
     # Does this format support explicitly versioned directories?
-    supports_versioned_directories = None
+    supports_versioned_directories: bool
     # Can other repositories be nested into one of this format?
-    supports_nesting_repositories = None
+    supports_nesting_repositories: bool
     # Is it possible for revisions to be present without being referenced
     # somewhere ?
-    supports_unreferenced_revisions = None
+    supports_unreferenced_revisions: bool
     # Does this format store the current Branch.nick in a revision when
     # creating commits?
-    supports_storing_branch_nick = True
+    supports_storing_branch_nick: bool = True
     # Does the format support overriding the transport to use
-    supports_overriding_transport = True
+    supports_overriding_transport: bool = True
     # Does the format support setting custom revision properties?
-    supports_custom_revision_properties = True
+    supports_custom_revision_properties: bool = True
     # Does the format record per-file revision metadata?
-    records_per_file_revision = True
-    supports_multiple_authors = True
+    records_per_file_revision: bool = True
+    supports_multiple_authors: bool = True
 
     def __repr__(self):
         return "%s()" % self.__class__.__name__
@@ -1513,7 +1515,7 @@
     InterRepository.get(other).method_name(parameters).
     """
 
-    _optimisers = []
+    _optimisers: List[Type["InterRepository"]] = []
     """The available optimised InterRepository types."""
 
     def copy_content(self, revision_id=None):

=== modified file 'breezy/revision.py'
--- breezy/revision.py	2022-07-09 20:29:40 +0000
+++ breezy/revision.py	2022-10-19 15:51:12 +0000
@@ -19,7 +19,7 @@
 
 __docformat__ = "google"
 
-from typing import List, Optional, Dict
+from typing import List, Optional, Dict, Tuple
 
 from . import (
     errors,
@@ -59,7 +59,7 @@
     timestamp: float
     timezone: int
 
-    def __init__(self, revision_id: RevisionID, properties=None, **args):
+    def __init__(self, revision_id: RevisionID, properties=None, **args) -> None:
         self.revision_id = revision_id
         if properties is None:
             self.properties = {}
@@ -69,7 +69,7 @@
         self.committer = None
         self.parent_ids = []
         self.parent_sha1s = []
-        """Not used anymore - legacy from for 4."""
+        # Not used anymore - legacy from for 4.
         self.__dict__.update(args)
 
     def __repr__(self):
@@ -166,7 +166,7 @@
     ancestors = [revision_id]
     distance = 0
     while len(ancestors) > 0:
-        new_ancestors = []
+        new_ancestors: List[bytes] = []
         for ancestor in ancestors:
             if not only_present:
                 yield ancestor, distance
@@ -184,13 +184,13 @@
         distance += 1
 
 
-def find_present_ancestors(revision_id: RevisionID, revision_source) -> List[RevisionID]:
+def find_present_ancestors(revision_id: RevisionID, revision_source) -> Dict[RevisionID, Tuple[int, int]]:
     """Return the ancestors of a revision present in a branch.
 
     It's possible that a branch won't have the complete ancestry of
     one of its revisions.
     """
-    found_ancestors = {}
+    found_ancestors: Dict[RevisionID, Tuple[int, int]] = {}
     anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
                                         only_present=True))
     for anc_order, (anc_id, anc_distance) in anc_iter:

=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2022-07-03 21:06:21 +0000
+++ breezy/revisionspec.py	2022-10-19 15:51:12 +0000
@@ -14,6 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from typing import List, Type, Optional
 
 from breezy import (
     revision,
@@ -44,20 +45,6 @@
             self.extra = ''
 
 
-class InvalidRevisionSpec(errors.BzrError):
-
-    _fmt = ("Requested revision: '%(spec)s' does not exist in branch:"
-            " %(branch_url)s%(extra)s")
-
-    def __init__(self, spec, branch, extra=None):
-        errors.BzrError.__init__(self, branch=branch, spec=spec)
-        self.branch_url = getattr(branch, 'user_url', str(branch))
-        if extra:
-            self.extra = '\n' + str(extra)
-        else:
-            self.extra = ''
-
-
 class RevisionInfo(object):
     """The results of applying a revision specification to a branch."""
 
@@ -156,8 +143,8 @@
     (Equivalent to the old Branch method get_revision_info())
     """
 
-    prefix = None
-    dwim_catchable_exceptions = (InvalidRevisionSpec,)
+    prefix: Optional[str] = None
+    dwim_catchable_exceptions: List[Type[Exception]] = [InvalidRevisionSpec]
     """Exceptions that RevisionSpec_dwim._match_on will catch.
 
     If the revspec is part of ``dwim_revspecs``, it may be tried with an
@@ -300,12 +287,12 @@
     is called so the string describing the revision is kept here until needed.
     """
 
-    help_txt = None
+    help_txt: str
 
     _revno_regex = lazy_regex.lazy_compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
 
     # The revspecs to try
-    _possible_revspecs = []
+    _possible_revspecs: List[Type[registry._ObjectGetter]] = []
 
     def _try_spectype(self, rstype, branch):
         rs = rstype(self.spec, _internal=True)
@@ -320,7 +307,7 @@
         if self._revno_regex.match(self.spec) is not None:
             try:
                 return self._try_spectype(RevisionSpec_revno, branch)
-            except RevisionSpec_revno.dwim_catchable_exceptions:
+            except tuple(RevisionSpec_revno.dwim_catchable_exceptions):
                 pass
 
         # Next see what has been registered
@@ -328,7 +315,7 @@
             rs_class = objgetter.get_obj()
             try:
                 return self._try_spectype(rs_class, branch)
-            except rs_class.dwim_catchable_exceptions:
+            except tuple(rs_class.dwim_catchable_exceptions):
                 pass
 
         # Well, I dunno what it is. Note that we don't try to keep track of the
@@ -621,7 +608,7 @@
     """
 
     prefix = 'tag:'
-    dwim_catchable_exceptions = (errors.NoSuchTag, errors.TagsNotSupported)
+    dwim_catchable_exceptions = [errors.NoSuchTag, errors.TagsNotSupported]
 
     def _match_on(self, branch, revs):
         # Can raise tags not supported, NoSuchTag, etc
@@ -826,7 +813,7 @@
       branch:/path/to/branch
     """
     prefix = 'branch:'
-    dwim_catchable_exceptions = (errors.NotBranchError,)
+    dwim_catchable_exceptions = [errors.NotBranchError]
 
     def _match_on(self, branch, revs):
         from .branch import Branch

=== modified file 'breezy/tag.py'
--- breezy/tag.py	2020-02-21 03:58:42 +0000
+++ breezy/tag.py	2022-10-19 15:51:12 +0000
@@ -27,6 +27,7 @@
 import itertools
 import re
 import sys
+from typing import List, Type
 
 # NOTE: I was going to call this tags.py, but vim seems to think all files
 # called tags* are ctags files... mbp 20070220.
@@ -186,7 +187,7 @@
     """Operations between sets of tags.
     """
 
-    _optimisers = []
+    _optimisers: List[Type["InterTags"]] = []
     """The available optimised InterTags types."""
 
     @classmethod

=== modified file 'breezy/tests/TestUtil.py'
--- breezy/tests/TestUtil.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/TestUtil.py	2022-10-19 15:51:12 +0000
@@ -18,6 +18,7 @@
 
 import logging
 import unittest
+from typing import List, Dict
 import weakref
 
 from .. import pyutils
@@ -133,7 +134,7 @@
 
     suiteClass = TestSuite
     # Memoize test names by test class dict
-    test_func_names = {}
+    test_func_names: Dict[str, List[str]] = {}
 
     def loadTestsFromModuleNames(self, names):
         """use a custom means to load tests from modules.

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2022-09-22 22:55:28 +0000
+++ breezy/tests/__init__.py	2022-10-19 15:51:12 +0000
@@ -51,6 +51,7 @@
 import threading
 import time
 import traceback
+from typing import Set
 import unittest
 import warnings
 
@@ -835,7 +836,7 @@
                         % (type(suite), suite))
 
 
-TestSkipped = testtools.testcase.TestSkipped
+from testtools.testcase import TestSkipped
 
 
 class TestNotApplicable(TestSkipped):
@@ -860,7 +861,7 @@
             return '<unprintable %s object>' % type(value).__name__
 
 
-traceback._some_str = _clever_some_str
+traceback._some_str = _clever_some_str  # type: ignore
 
 
 # deprecated - use self.knownFailure(), or self.expectFailure.
@@ -2432,7 +2433,7 @@
         # client frames. Beyond this we could get more clever, but this is good
         # enough for now.
         stack = traceback.extract_stack()[prefix_length:-5]
-        self.stack = ''.join(traceback.format_list(stack))
+        self._stack = ''.join(traceback.format_list(stack))
 
     def __str__(self):
         return self.call.method.decode('utf-8')
@@ -2441,7 +2442,7 @@
         return self.call.method.decode('utf-8')
 
     def stack(self):
-        return self.stack
+        return self._stack
 
 
 class TestCaseWithMemoryTransport(TestCase):
@@ -3457,7 +3458,7 @@
             self.addTest(suite)
 
     # Don't need subclass run method with suite emptying
-    run = unittest.TestSuite.run
+    run = unittest.TestSuite.run  # type: ignore
 
 
 class CountingDecorator(TestDecorator):
@@ -3726,7 +3727,7 @@
 #   -Euncollected_cases     Display the identity of any test cases that weren't
 #                           deallocated after being completed.
 #   -Econfig_stats          Will collect statistics using addDetail
-selftest_debug_flags = set()
+selftest_debug_flags: Set[str] = set()
 
 
 def selftest(verbose=False, pattern=".*", stop_on_failure=True,

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2022-07-02 13:44:01 +0000
+++ breezy/tests/blackbox/test_push.py	2022-10-19 15:51:12 +0000
@@ -429,7 +429,7 @@
         self.assertPublished(branch_tree.last_revision(),
                              trunk_tree.branch.base)
 
-    def test_push_new_branch_stacked_on(self):
+    def test_push_new_branch_stacked_on_can_use_dir_urls(self):
         """Pushing a new branch with --stacked-on can use directory URLs."""
         trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
         class FooDirectory(object):

=== modified file 'breezy/tests/blackbox/test_remember_option.py'
--- breezy/tests/blackbox/test_remember_option.py	2020-05-15 01:31:05 +0000
+++ breezy/tests/blackbox/test_remember_option.py	2022-10-19 15:51:12 +0000
@@ -14,6 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from typing import List
 
 from breezy import (
     branch,
@@ -28,14 +29,14 @@
     """--remember and --no-remember set locations or not."""
 
     # the command to run (expecting additional arguments from the tests
-    command = []
+    command: List[str] = []
     # the dir where the command should be run (it should contain a branch for
     # which the tested locations are/will be set)
-    working_dir = None
+    working_dir: str
     # argument list for the first command invocation
-    first_use_args = []
+    first_use_args: List[str] = []
     # argument list for the next command invocation
-    next_uses_args = []
+    next_uses_args: List[str] = []
 
     def do_command(self, *args):
         # We always expect the same result here and care only about the

=== modified file 'breezy/tests/blackbox/test_serve.py'
--- breezy/tests/blackbox/test_serve.py	2021-11-15 17:27:44 +0000
+++ breezy/tests/blackbox/test_serve.py	2022-10-19 15:51:12 +0000
@@ -17,10 +17,9 @@
 
 """Tests of the brz serve command."""
 
-import os
 import signal
 import sys
-from _thread import interrupt_main
+from _thread import interrupt_main  # type: ignore
 
 import threading
 

=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2020-06-13 02:58:24 +0000
+++ breezy/tests/blackbox/test_switch.py	2022-10-19 15:51:12 +0000
@@ -172,21 +172,6 @@
         checkout = checkout.controldir.open_workingtree()
         self.assertEqual(tree2.branch.base, checkout.branch.base)
 
-    def test_switch_finds_relative_unicode_branch(self):
-        """Switch will find 'foo' relative to the branch the checkout is of."""
-        self.requireFeature(UnicodeFilenameFeature)
-        self.build_tree(['repo/'])
-        tree1 = self.make_branch_and_tree('repo/brancha')
-        tree1.commit('foo')
-        tree2 = self.make_branch_and_tree(u'repo/branch\xe9')
-        tree2.pull(tree1.branch)
-        branchb_id = tree2.commit('bar')
-        checkout = tree1.branch.create_checkout('checkout', lightweight=True)
-        self.run_bzr(['switch', u'branch\xe9'], working_dir='checkout')
-        self.assertEqual(branchb_id, checkout.last_revision())
-        checkout = checkout.controldir.open_workingtree()
-        self.assertEqual(tree2.branch.base, checkout.branch.base)
-
     def test_switch_revision(self):
         tree = self._create_sample_tree()
         checkout = tree.branch.create_checkout('checkout', lightweight=True)

=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py	2019-09-01 15:33:59 +0000
+++ breezy/tests/blackbox/test_upgrade.py	2022-10-19 15:51:12 +0000
@@ -21,7 +21,7 @@
 from breezy import (
     bzr,
     controldir,
-    lockable_files,
+    lockdir,
     ui,
     urlutils,
     )
@@ -57,7 +57,7 @@
 
 class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
 
-    _lock_class = lockable_files.TransportLock
+    _lock_class = lockdir.LockDir
 
     def get_converter(self, format=None):
         return ConvertOldTestToMeta()

=== modified file 'breezy/tests/fake_command.py'
--- breezy/tests/fake_command.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/fake_command.py	2022-10-19 15:51:12 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from . import test_commands
-test_commands.lazy_command_imported = True
+test_commands.lazy_command_imported = True  # type: ignore
 
 
 class cmd_fake(object):

=== modified file 'breezy/tests/https_server.py'
--- breezy/tests/https_server.py	2022-05-02 11:39:09 +0000
+++ breezy/tests/https_server.py	2022-10-19 15:51:12 +0000
@@ -97,8 +97,8 @@
     _url_protocol = 'https'
 
     # The real servers depending on the protocol
-    http_server_class = {'HTTP/1.0': TestingHTTPSServer,
-                         'HTTP/1.1': TestingThreadingHTTPSServer,
+    http_server_class = {'HTTP/1.0': TestingHTTPSServer,  # type: ignore
+                         'HTTP/1.1': TestingThreadingHTTPSServer,  # type: ignore
                          }
 
     # Provides usable defaults since an https server requires both a

=== modified file 'breezy/tests/per_interbranch/__init__.py'
--- breezy/tests/per_interbranch/__init__.py	2020-06-22 01:07:05 +0000
+++ breezy/tests/per_interbranch/__init__.py	2022-10-19 15:51:12 +0000
@@ -24,6 +24,8 @@
 itself rather than in tests/per_interbranch/*.py.
 """
 
+from typing import List, Any
+
 
 from breezy import (
     branchbuilder,
@@ -165,7 +167,7 @@
     and added rather than actually trying to do something.
     """
 
-    _uses = []
+    _uses: List[Any] = []
 
     def __init__(self, source, target):
         self.source = source

=== modified file 'breezy/tests/per_transport.py'
--- breezy/tests/per_transport.py	2022-08-22 18:19:46 +0000
+++ breezy/tests/per_transport.py	2022-10-19 15:51:12 +0000
@@ -232,14 +232,6 @@
         t = self.get_transport()
         self.assertRaises(NoSuchFile, t.get_bytes, 'c')
 
-    def test_get_with_open_write_stream_sees_all_content(self):
-        t = self.get_transport()
-        if t.is_readonly():
-            return
-        with t.open_write_stream('foo') as handle:
-            handle.write(b'b')
-            self.assertEqual(b'b', t.get_bytes('foo'))
-
     def test_get_bytes_with_open_write_stream_sees_all_content(self):
         t = self.get_transport()
         if t.is_readonly():

=== modified file 'breezy/tests/stub_sftp.py'
--- breezy/tests/stub_sftp.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/stub_sftp.py	2022-10-19 15:51:12 +0000
@@ -551,7 +551,7 @@
         self._vendor = ssh.LoopbackVendor()
         self.request_handler_class = TestingSFTPWithoutSSHConnectionHandler
 
-    def get_host_key():
+    def get_host_key(self):
         return None
 
 

=== modified file 'breezy/tests/test__annotator.py'
--- breezy/tests/test__annotator.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test__annotator.py	2022-10-19 15:51:12 +0000
@@ -192,7 +192,7 @@
                           (self.fc_key, b'content\n'),
                           ], self.ann.annotate_flat(self.fd_key))
 
-    def test_annotate_common_merge_text(self):
+    def test_annotate_common_merge_text_more(self):
         self.make_common_merge_text()
         # there is no common point, so we just pick the lexicographical lowest
         # and b'b-id' comes before b'c-id'
@@ -200,7 +200,7 @@
                           (self.fb_key, b'new content\n'),
                           ], self.ann.annotate_flat(self.fd_key))
 
-    def test_annotate_many_way_common_merge_text(self):
+    def test_annotate_many_way_common_merge_text_more(self):
         self.make_many_way_common_merge_text()
         self.assertEqual([(self.fa_key, b'simple\n'),
                           (self.fb_key, b'new content\n')],

=== modified file 'breezy/tests/test_atomicfile.py'
--- breezy/tests/test_atomicfile.py	2022-05-03 18:47:58 +0000
+++ breezy/tests/test_atomicfile.py	2022-10-19 15:51:12 +0000
@@ -101,9 +101,6 @@
     def test_mode_0660(self):
         self._test_mode(0o660)
 
-    def test_mode_0660(self):
-        self._test_mode(0o660)
-
     def test_mode_0640(self):
         self._test_mode(0o640)
 

=== modified file 'breezy/tests/test_commands.py'
--- breezy/tests/test_commands.py	2020-06-21 02:15:25 +0000
+++ breezy/tests/test_commands.py	2022-10-19 15:51:12 +0000
@@ -458,8 +458,7 @@
 
         def pre_command(cmd):
             hook_calls.append('pre')
-            # verify that all subclasses of CommandError caught too
-            raise commands.BzrOptionError()
+            raise errors.CommandError()
 
         def post_command(cmd, e):
             self.fail('post_command should not be called')

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2022-08-22 18:19:46 +0000
+++ breezy/tests/test_config.py	2022-10-19 15:51:12 +0000
@@ -1293,7 +1293,7 @@
                 'http://www.example.com/norecurse', 'normal_option'),
             config.POLICY_NORECURSE)
 
-    def test__get_option_policy_normal(self):
+    def test__get_option_policy_normal_appendpath(self):
         self.get_branch_config('http://www.example.com')
         self.assertEqual(
             self.my_location_config._get_option_policy(
@@ -1482,13 +1482,6 @@
         self.assertEqual("Robert Collins <[e-mail]>",
                          my_config.username())
 
-    def test_BRZ_EMAIL_OVERRIDES(self):
-        self.overrideEnv('BZR_EMAIL', "Robert Collins <[e-mail]>")
-        branch = FakeBranch()
-        my_config = config.BranchConfig(branch)
-        self.assertEqual("Robert Collins <[e-mail]>",
-                         my_config.username())
-
     def test_get_user_option_global(self):
         my_config = self.get_branch_config(global_config=sample_config_text)
         self.assertEqual('something',

=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2022-07-02 16:15:20 +0000
+++ breezy/tests/test_conflicts.py	2022-10-19 15:51:12 +0000
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
+from typing import List, Tuple, Dict, Any, Callable, Type
 
 from .. import (
     conflicts,
@@ -24,6 +25,7 @@
     tests,
     transform,
     )
+from ..workingtree import WorkingTree
 from ..bzr import conflicts as bzr_conflicts
 from . import (
     script,
@@ -159,7 +161,7 @@
 # FIXME: Tests missing for DuplicateID conflict type
 class TestResolveConflicts(script.TestCaseWithTransportAndScript):
 
-    preamble = None  # The setup script set by daughter classes
+    preamble: str  # The setup script set by daughter classes
 
     def setUp(self):
         super(TestResolveConflicts, self).setUp()
@@ -236,15 +238,18 @@
     """
 
     # Set by daughter classes
-    _conflict_type = None
-    _assert_conflict = None
+    _conflict_type: Type[conflicts.Conflict]
+    _assert_conflict: Callable[[Any, Any, Any], Any]
 
     # Set by load_tests
     _base_actions = None
     _this = None
     _other = None
 
-    scenarios = []
+    scenarios: List[Tuple[
+        Dict[str, Any],
+        Tuple[str, Dict[str, Any]],
+        Tuple[str, Dict[str, Any]]]] = []
     """The scenario list for the conflict type defined by the class.
 
     Each scenario is of the form:

=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2022-08-22 18:19:46 +0000
+++ breezy/tests/test_foreign.py	2022-10-19 15:51:12 +0000
@@ -38,6 +38,7 @@
     )
 
 from ..bzr import groupcompress_repo
+from ..bzr.pack_repo import PackCommitBuilder
 
 # This is the dummy foreign revision control system, used
 # mainly here in the testsuite to test the foreign VCS infrastructure.
@@ -124,7 +125,7 @@
         return (revno, revid)
 
 
-class DummyForeignCommitBuilder(vf_repository.VersionedFileCommitBuilder):
+class DummyForeignCommitBuilder(PackCommitBuilder):
 
     def _generate_revision_if_needed(self, revid):
         mapping = DummyForeignVcsMapping(DummyForeignVcs())

=== modified file 'breezy/tests/test_forge.py'
--- breezy/tests/test_forge.py	2022-07-12 09:23:34 +0000
+++ breezy/tests/test_forge.py	2022-10-19 15:51:12 +0000
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
+from typing import List
 
 from ..forge import (
     determine_title,
@@ -41,7 +42,7 @@
 
 class SampleForge(Forge):
 
-    _locations = []
+    _locations: List[str] = []
 
     @classmethod
     def _add_location(cls, url):

=== modified file 'breezy/tests/test_hooks.py'
--- breezy/tests/test_hooks.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_hooks.py	2022-10-19 15:51:12 +0000
@@ -158,7 +158,9 @@
         self.assertEqual("demo", set_rh_lazy_hooks[0][1])
         self.assertEqual(list(TestHooks.hooks['set_rh']), [set_rh])
 
-    def set_rh(): return None
+    @classmethod
+    def set_rh(cls):
+        return None
 
     def test_install_named_hook_lazy(self):
         hooks = Hooks("breezy.tests.hooks", "some_hooks")
@@ -221,7 +223,8 @@
         hook.hook(callback, "my callback")
         self.assertEqual([callback], list(hook))
 
-    def lazy_callback():
+    @classmethod
+    def lazy_callback(cls):
         pass
 
     def test_lazy_hook(self):

=== modified file 'breezy/tests/test_http.py'
--- breezy/tests/test_http.py	2021-01-10 00:25:52 +0000
+++ breezy/tests/test_http.py	2022-10-19 15:51:12 +0000
@@ -649,7 +649,7 @@
     Both implementations raises the same error as for a bad status.
     """
 
-    _req_handler_class = InvalidStatusRequestHandler
+    _req_handler_class = InvalidStatusRequestHandler  # type: ignore
 
 
 class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
@@ -1853,7 +1853,7 @@
         self.assertEndsWith(response, expected_end_of_response)
 
 
-class ForbiddenRequestHandler(http_server.TestingHTTPRequestHandler):
+class NotSmartServerRequestHandler(http_server.TestingHTTPRequestHandler):
     """No smart server here request handler."""
 
     def do_POST(self):
@@ -1863,7 +1863,7 @@
 class SmartClientAgainstNotSmartServer(TestSpecificRequestHandler):
     """Test smart client behaviour against an http server without smarts."""
 
-    _req_handler_class = ForbiddenRequestHandler
+    _req_handler_class = NotSmartServerRequestHandler
 
     def test_probe_smart_server(self):
         """Test error handling against server refusing smart requests."""

=== modified file 'breezy/tests/test_lazy_import.py'
--- breezy/tests/test_lazy_import.py	2020-01-11 17:41:33 +0000
+++ breezy/tests/test_lazy_import.py	2022-10-19 15:51:12 +0000
@@ -972,7 +972,7 @@
                         '    two,\n'
                         '    )\n')
 
-    def test_from_one_import_two(self):
+    def test_from_one_import_two_two(self):
         exp = {'two': (['one'], 'two', {})}
         self.check(exp, 'from one import two\n')
         self.check(exp, 'from one import (two)\n')

=== modified file 'breezy/tests/test_lazy_regex.py'
--- breezy/tests/test_lazy_regex.py	2018-11-16 19:09:31 +0000
+++ breezy/tests/test_lazy_regex.py	2022-10-19 15:51:12 +0000
@@ -18,8 +18,8 @@
 
 import pickle
 import re
+from typing import List, Tuple
 
-from .. import errors
 from .. import (
     lazy_regex,
     tests,
@@ -37,7 +37,7 @@
 class InstrumentedLazyRegex(lazy_regex.LazyRegex):
     """Keep track of actions on the lazy regex"""
 
-    _actions = []
+    _actions: List[Tuple[str, ...]] = []
 
     @classmethod
     def use_actions(cls, actions):

=== modified file 'breezy/tests/test_lsprof.py'
--- breezy/tests/test_lsprof.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_lsprof.py	2022-10-19 15:51:12 +0000
@@ -17,10 +17,7 @@
 """Tests for profiling data collection."""
 
 
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 import threading
 
 from .. import (

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2022-07-15 14:04:05 +0000
+++ breezy/tests/test_merge.py	2022-10-19 15:51:12 +0000
@@ -2006,33 +2006,6 @@
         # Only the kind was changed (content)
         self.assertEqual([], entries)
 
-    def test_interesting_files(self):
-        # Two files modified, but we should filter one of them
-        builder = self.get_builder()
-        builder.build_snapshot(None,
-                               [('add', (u'', b'a-root-id', 'directory', None)),
-                                ('add', (u'a', b'a-id', 'file', b'content\n')),
-                                   ('add', (u'b', b'b-id', 'file', b'content\n'))],
-                               revision_id=b'A-id')
-        builder.build_snapshot([b'A-id'], [], revision_id=b'B-id')
-        builder.build_snapshot([b'A-id'], [], revision_id=b'C-id')
-        builder.build_snapshot([b'C-id', b'B-id'],
-                               [('modify', ('a', b'new-content\n')),
-                                ('modify', ('b', b'new-content\n'))],
-                               revision_id=b'E-id')
-        builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
-        merge_obj = self.make_merge_obj(builder, b'E-id',
-                                        interesting_files=['b'])
-        entries = list(merge_obj._entries_lca())
-        root_id = b'a-root-id'
-        self.assertEqual([(b'b-id', True,
-                           ((u'b', [u'b', u'b']), u'b', u'b'),
-                           ((root_id, [root_id, root_id]), root_id, root_id),
-                           ((u'b', [u'b', u'b']), u'b', u'b'),
-                           ((False, [False, False]), False, False),
-                           False),
-                          ], entries)
-
     def test_interesting_file_in_this(self):
         # This renamed the file, but it should still match the entry in other
         builder = self.get_builder()

=== modified file 'breezy/tests/test_osutils_encodings.py'
--- breezy/tests/test_osutils_encodings.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_osutils_encodings.py	2022-10-19 15:51:12 +0000
@@ -19,6 +19,7 @@
 import codecs
 import locale
 import sys
+from typing import Set
 
 from .. import (
     osutils,
@@ -39,8 +40,8 @@
     implemented they cannot be removed. Be careful with naming to avoid
     collisions between tests.
     """
-    _registered = False
-    _enabled_encodings = set()
+    _registered: bool = False
+    _enabled_encodings: Set[str] = set()
 
     def add(self, encoding_name):
         """Adding encoding name to fake.

=== modified file 'breezy/tests/test_patch.py'
--- breezy/tests/test_patch.py	2019-11-22 04:59:15 +0000
+++ breezy/tests/test_patch.py	2022-10-19 15:51:12 +0000
@@ -35,9 +35,6 @@
             f.write(b'\x00')
         self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')
 
-
-class TestPatch(TestCaseInTempDir):
-
     def test_missing_patch(self):
         self.assertRaises(PatchInvokeError, run_patch, '.', [],
                           _patch_cmd='/unlikely/to/exist')

=== modified file 'breezy/tests/test_plugins.py'
--- breezy/tests/test_plugins.py	2022-01-04 23:53:15 +0000
+++ breezy/tests/test_plugins.py	2022-10-19 15:51:12 +0000
@@ -23,6 +23,7 @@
 import os
 import sys
 import types
+from typing import Dict, List, Any
 
 import breezy
 from .. import (
@@ -153,7 +154,7 @@
 
 class TestLoadingPlugins(BaseTestPlugins):
 
-    activeattributes = {}
+    activeattributes: Dict[str, List[Any]] = {}
 
     def test_plugins_with_the_same_name_are_not_loaded(self):
         # This test tests that having two plugins in different directories does

=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2022-07-02 13:44:01 +0000
+++ breezy/tests/test_shelf.py	2022-10-19 15:51:12 +0000
@@ -534,15 +534,6 @@
         self.addCleanup(creator.finalize)
         self.assertEqual([], list(creator.iter_shelvable()))
 
-    def test_shelve_skips_added_root(self):
-        """Skip adds of the root when iterating through shelvable changes."""
-        tree = self.make_branch_and_tree('tree')
-        tree.lock_tree_write()
-        self.addCleanup(tree.unlock)
-        creator = shelf.ShelfCreator(tree, tree.basis_tree())
-        self.addCleanup(creator.finalize)
-        self.assertEqual([], list(creator.iter_shelvable()))
-
 
 class TestUnshelver(tests.TestCaseWithTransport):
 

=== modified file 'breezy/tests/test_ssh_transport.py'
--- breezy/tests/test_ssh_transport.py	2019-06-26 00:13:55 +0000
+++ breezy/tests/test_ssh_transport.py	2022-10-19 15:51:12 +0000
@@ -230,7 +230,7 @@
                 "-s", "--", "host", "sftp"]
             )
 
-    def test_openssh_command_tricked(self):
+    def test_openssh_command_strange_hostname(self):
         vendor = SSHCorpSubprocessVendor()
         self.assertRaises(
             StrangeHostname,

=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2021-02-19 21:27:44 +0000
+++ breezy/tests/test_tree.py	2022-10-19 15:51:12 +0000
@@ -16,10 +16,11 @@
 
 """Tests for Tree and InterTree."""
 
+from typing import List, Tuple
+
 from breezy import (
     errors,
     revision,
-    tree as _mod_tree,
     )
 from breezy.tests import (
     TestCase,
@@ -80,7 +81,7 @@
 
 class RecordingOptimiser(InterTree):
 
-    calls = []
+    calls: List[Tuple[str, ...]] = []
 
     def compare(self, want_unchanged=False, specific_files=None,
                 extra_trees=None, require_versioned=False, include_root=False,

=== modified file 'breezy/tests/test_url_policy_open.py'
--- breezy/tests/test_url_policy_open.py	2019-06-09 14:00:10 +0000
+++ breezy/tests/test_url_policy_open.py	2022-10-19 15:51:12 +0000
@@ -16,6 +16,8 @@
 
 """Tests for the branch open with specific URL policy code."""
 
+from typing import List
+
 from .. import urlutils
 from ..branch import (
     Branch,
@@ -157,7 +159,7 @@
 class TrackingProber(BzrProber):
     """Subclass of BzrProber which tracks URLs it has been asked to open."""
 
-    seen_urls = []
+    seen_urls: List[str] = []
 
     @classmethod
     def probe_transport(klass, transport):

=== modified file 'breezy/tests/test_utextwrap.py'
--- breezy/tests/test_utextwrap.py	2022-05-15 14:17:32 +0000
+++ breezy/tests/test_utextwrap.py	2022-10-19 15:51:12 +0000
@@ -194,17 +194,17 @@
 
 except ImportError:
 
-    class TestWrap(tests.TestCase):
+    class TestWrap(tests.TestCase):  # type: ignore
 
         def test_wrap(self):
             raise tests.TestSkipped("test.test_textwrap is not available.")
 
-    class TestLongWord(tests.TestCase):
+    class TestLongWord(tests.TestCase):  # type: ignore
 
         def test_longword(self):
             raise tests.TestSkipped("test.test_textwrap is not available.")
 
-    class TestIndent(tests.TestCase):
+    class TestIndent(tests.TestCase):  # type: ignore
 
         def test_indent(self):
             raise tests.TestSkipped("test.test_textwrap is not available.")

=== modified file 'breezy/tests/test_win32utils.py'
--- breezy/tests/test_win32utils.py	2022-01-09 13:12:27 +0000
+++ breezy/tests/test_win32utils.py	2022-10-19 15:51:12 +0000
@@ -17,6 +17,7 @@
 """Tests for win32utils."""
 
 import os
+from typing import List
 
 from .. import (
     osutils,
@@ -40,7 +41,7 @@
 
 class TestWin32UtilsGlobExpand(TestCaseInTempDir):
 
-    _test_needs_features = []
+    _test_needs_features: List[features.Feature] = []
 
     def test_empty_tree(self):
         self.build_tree([])

=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2022-09-22 23:12:07 +0000
+++ breezy/transport/__init__.py	2022-10-19 15:51:12 +0000
@@ -29,6 +29,7 @@
 import errno
 from io import BytesIO
 import sys
+from typing import Dict, Any
 
 from stat import S_ISDIR
 
@@ -47,7 +48,7 @@
 
 # a dictionary of open file streams. Keys are absolute paths, values are
 # transport defined.
-_file_streams = {}
+_file_streams: Dict[str, Any] = {}
 
 
 def _get_protocol_handlers():

=== modified file 'breezy/transport/decorator.py'
--- breezy/transport/decorator.py	2020-02-18 01:57:45 +0000
+++ breezy/transport/decorator.py	2022-10-19 15:51:12 +0000
@@ -163,7 +163,8 @@
         self._decorated.segment_parameters = value
 
     segment_parameters = property(_get_segment_parameters,
-                                  _set_segment_parameters, "See Transport.segment_parameters")
+                                  _set_segment_parameters,
+                                  doc="See Transport.segment_parameters")
 
     def stat(self, relpath):
         """See Transport.stat()."""

=== modified file 'breezy/transport/http/urllib.py'
--- breezy/transport/http/urllib.py	2022-08-31 14:25:13 +0000
+++ breezy/transport/http/urllib.py	2022-10-19 15:51:12 +0000
@@ -86,7 +86,7 @@
     return host, None
 
 
-class addinfourl(urllib_request.addinfourl):
+class addinfourl(urllib_request.addinfourl):  # type: ignore
     '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
 
     In python-2.7, xmlrpclib expects that the response object that it receives
@@ -317,7 +317,7 @@
         self.sock = _ReportingSocket(sock, self._report_activity)
 
 
-class HTTPConnection(AbstractHTTPConnection, http_client.HTTPConnection):
+class HTTPConnection(AbstractHTTPConnection, http_client.HTTPConnection):  # type: ignore
 
     # XXX: Needs refactoring at the caller level.
     def __init__(self, host, port=None, proxied_host=None,
@@ -334,7 +334,7 @@
         self._wrap_socket_for_reporting(self.sock)
 
 
-class HTTPSConnection(AbstractHTTPConnection, http_client.HTTPSConnection):
+class HTTPSConnection(AbstractHTTPConnection, http_client.HTTPSConnection):  # type: ignore
 
     def __init__(self, host, port=None, key_file=None, cert_file=None,
                  proxied_host=None,
@@ -1128,7 +1128,7 @@
       successful and the request authentication parameters have been updated.
     """
 
-    scheme = None
+    scheme: str
     """The scheme as it appears in the server header (lower cased)"""
 
     _max_retry = 3

=== modified file 'breezy/transport/memory.py'
--- breezy/transport/memory.py	2022-08-22 18:19:46 +0000
+++ breezy/transport/memory.py	2022-10-19 15:51:12 +0000
@@ -162,10 +162,11 @@
         self._files[_abspath] = (raw_bytes, mode)
         return len(raw_bytes)
 
-    def symlink(self, source, target):
-        _abspath = self._resolve_symlinks(target)
+    def symlink(self, source, link_name):
+        """Create a symlink pointing to source named link_name."""
+        _abspath = self._abspath(link_name)
         self._check_parent(_abspath)
-        self._symlinks[_abspath] = self._abspath(source)
+        self._symlinks[_abspath] = source.split('/')
 
     def mkdir(self, relpath, mode=None):
         """See Transport.mkdir()."""
@@ -315,12 +316,6 @@
                 r = self._symlinks.get('/'.join(r), r)
         return '/' + '/'.join(r)
 
-    def symlink(self, source, link_name):
-        """Create a symlink pointing to source named link_name."""
-        _abspath = self._abspath(link_name)
-        self._check_parent(_abspath)
-        self._symlinks[_abspath] = source.split('/')
-
     def readlink(self, link_name):
         _abspath = self._abspath(link_name)
         try:

=== modified file 'breezy/transport/ssh.py'
--- breezy/transport/ssh.py	2022-05-15 14:17:32 +0000
+++ breezy/transport/ssh.py	2022-10-19 15:51:12 +0000
@@ -24,6 +24,7 @@
 import socket
 import subprocess
 import sys
+from typing import Tuple, Type, Set, Dict, Optional
 from binascii import hexlify
 
 from .. import (
@@ -40,7 +41,7 @@
 except ModuleNotFoundError as e:
     # If we have an ssh subprocess, we don't strictly need paramiko for all ssh
     # access
-    paramiko = None
+    paramiko = None  # type: ignore
 else:
     from paramiko.sftp_client import SFTPClient
 
@@ -49,8 +50,8 @@
     _fmt = "Refusing to connect to strange SSH hostname %(hostname)s"
 
 
-SYSTEM_HOSTKEYS = {}
-BRZ_HOSTKEYS = {}
+SYSTEM_HOSTKEYS: Dict[str, Dict[str, str]] = {}
+BRZ_HOSTKEYS: Dict[str, Dict[str, str]] = {}
 
 
 class SSHVendorManager(object):
@@ -333,7 +334,7 @@
                                          msg='Unable to invoke remote bzr')
 
 
-_ssh_connection_errors = (EOFError, OSError, IOError, socket.error)
+_ssh_connection_errors: Tuple[Type[Exception], ...] = (EOFError, OSError, IOError, socket.error)
 if paramiko is not None:
     vendor = ParamikoVendor()
     register_ssh_vendor('paramiko', vendor)
@@ -671,7 +672,7 @@
 
 
 import weakref
-_subproc_weakrefs = set()
+_subproc_weakrefs: Set[weakref.ref] = set()
 
 
 def _close_ssh_proc(proc, sock):

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2022-07-08 22:26:28 +0000
+++ breezy/tree.py	2022-10-19 15:51:12 +0000
@@ -17,6 +17,8 @@
 """Tree classes, representing directory at point in time.
 """
 
+from typing import List, Type, TYPE_CHECKING
+
 from . import (
     errors,
     lock,
@@ -49,14 +51,14 @@
     """An entry that implements the minimum interface used by commands.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     def __eq__(self, other):
         # yes, this is ugly, TODO: best practice __eq__ style.
         return (isinstance(other, TreeEntry)
                 and other.__class__ == self.__class__)
 
-    kind = None
+    kind: str
 
     def kind_character(self):
         return "???"
@@ -73,7 +75,7 @@
 class TreeDirectory(TreeEntry):
     """See TreeEntry. This is a directory in a working tree."""
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     kind = 'directory'
 
@@ -84,7 +86,7 @@
 class TreeFile(TreeEntry):
     """See TreeEntry. This is a regular file in a working tree."""
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     kind = 'file'
 
@@ -95,7 +97,7 @@
 class TreeLink(TreeEntry):
     """See TreeEntry. This is a symlink in a working tree."""
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     kind = 'symlink'
 
@@ -106,7 +108,7 @@
 class TreeReference(TreeEntry):
     """See TreeEntry. This is a reference to a nested tree in a working tree."""
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     kind = 'tree-reference'
 
@@ -402,7 +404,7 @@
         """
         raise NotImplementedError(self.path_content_summary)
 
-    def get_reference_revision(self, path, branch=None):
+    def get_reference_revision(self, path):
         raise NotImplementedError("Tree subclass %s must implement "
                                   "get_reference_revision"
                                   % self.__class__.__name__)
@@ -753,10 +755,12 @@
     # Formats that will be used to test this InterTree. If both are
     # None, this InterTree will not be tested (e.g. because a complex
     # setup is required)
-    _matching_from_tree_format = None
-    _matching_to_tree_format = None
+    if TYPE_CHECKING:
+        from .workingtree import WorkingTreeFormat
+    _matching_from_tree_format: "WorkingTreeFormat"
+    _matching_to_tree_format: "WorkingTreeFormat"
 
-    _optimisers = []
+    _optimisers: List[Type["InterTree"]] = []
 
     @classmethod
     def is_compatible(kls, source, target):

=== modified file 'breezy/util/simplemapi.py'
--- breezy/util/simplemapi.py	2020-02-18 01:57:45 +0000
+++ breezy/util/simplemapi.py	2022-10-19 15:51:12 +0000
@@ -129,7 +129,7 @@
 
 lpMapiMessage = POINTER(MapiMessage)
 
-MAPI = windll.mapi32
+MAPI = windll.mapi32  # type: ignore
 MAPISendMail = MAPI.MAPISendMail
 MAPISendMail.restype = c_ulong
 MAPISendMail.argtypes = (LHANDLE, c_ulong, lpMapiMessage, FLAGS, c_ulong)
@@ -152,7 +152,7 @@
 MAPILogoff.argtypes = (LHANDLE, c_ulong, FLAGS, c_ulong)
 
 
-class MAPIError(WindowsError):
+class MAPIError(WindowsError):  # type: ignore
 
     def __init__(self, code):
         WindowsError.__init__(self)

=== modified file 'breezy/version_info_formats/format_rio.py'
--- breezy/version_info_formats/format_rio.py	2022-07-07 15:57:20 +0000
+++ breezy/version_info_formats/format_rio.py	2022-10-19 15:51:12 +0000
@@ -97,4 +97,4 @@
                       " revision object and a RIO stanza.", (1, 15))
 
 
-RioVersionInfoBuilder.hooks = RioVersionInfoBuilderHooks()
+RioVersionInfoBuilder.hooks = RioVersionInfoBuilderHooks()  # type: ignore

=== modified file 'breezy/version_info_formats/format_yaml.py'
--- breezy/version_info_formats/format_yaml.py	2022-07-07 15:36:19 +0000
+++ breezy/version_info_formats/format_yaml.py	2022-10-19 15:51:12 +0000
@@ -103,4 +103,4 @@
                       " revision object and a YAML stanza.", (3, 3))
 
 
-YamlVersionInfoBuilder.hooks = YamlVersionInfoBuilderHooks()
+YamlVersionInfoBuilder.hooks = YamlVersionInfoBuilderHooks()  # type: ignore

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/workingtree.py	2022-10-19 15:51:12 +0000
@@ -33,6 +33,7 @@
 import errno
 import os
 import sys
+from typing import Optional
 
 import breezy
 
@@ -537,39 +538,9 @@
             if updated:
                 self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
 
-    def path_content_summary(self, path, _lstat=os.lstat,
-                             _mapper=osutils.file_kind_from_stat_mode):
+    def path_content_summary(self, path):
         """See Tree.path_content_summary."""
-        abspath = self.abspath(path)
-        try:
-            stat_result = _lstat(abspath)
-        except OSError as e:
-            if getattr(e, 'errno', None) == errno.ENOENT:
-                # no file.
-                return ('missing', None, None, None)
-            # propagate other errors
-            raise
-        kind = _mapper(stat_result.st_mode)
-        if kind == 'file':
-            return self._file_content_summary(path, stat_result)
-        elif kind == 'directory':
-            # perhaps it looks like a plain directory, but it's really a
-            # reference.
-            if self._directory_is_tree_reference(path):
-                kind = 'tree-reference'
-            return kind, None, None, None
-        elif kind == 'symlink':
-            target = osutils.readlink(abspath)
-            return ('symlink', None, None, target)
-        else:
-            return (kind, None, None, None)
-
-    def _file_content_summary(self, path, stat_result):
-        size = stat_result.st_size
-        executable = self._is_executable_from_path_and_stat(path, stat_result)
-        # try for a stat cache lookup
-        return ('file', size, executable, self._sha_from_stat(
-            path, stat_result))
+        raise NotImplementedError(self.path_content_summary)
 
     def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
         """Common ghost checking functionality from set_parent_*.
@@ -1326,7 +1297,7 @@
     missing_parent_conflicts = False
     """If this format supports missing parent conflicts."""
 
-    supports_versioned_directories = None
+    supports_versioned_directories: bool
 
     supports_merge_modified = True
     """If this format supports storing merge modified hashes."""
@@ -1341,7 +1312,7 @@
 
     supports_righthand_parent_id_as_ghost = True
 
-    ignore_filename = None
+    ignore_filename: Optional[str] = None
     """Name of file with ignore patterns, if any. """
 
     def initialize(self, controldir, revision_id=None, from_branch=None,

=== modified file 'breezy/workspace.py'
--- breezy/workspace.py	2022-08-22 18:19:46 +0000
+++ breezy/workspace.py	2022-10-19 15:51:12 +0000
@@ -52,7 +52,7 @@
     local_tree: WorkingTree,
     basis_tree: Optional[Tree] = None,
     subpath: str = "",
-    dirty_tracker: "DirtyTracker" = None,
+    dirty_tracker=None,
 ) -> None:
     """Reset a tree back to its basis tree.
 
@@ -216,7 +216,8 @@
         if self._dirty_tracker is not None:
             self._dirty_tracker.mark_clean()
 
-    def _stage(self) -> List[str]:
+    def _stage(self) -> Optional[List[str]]:
+        changed: Optional[List[str]]
         if self._dirty_tracker:
             relpaths = self._dirty_tracker.relpaths()
             # Sort paths so that directories get added before the files they

=== modified file 'byov.conf'
--- byov.conf	2022-09-08 17:24:19 +0000
+++ byov.conf	2022-10-19 15:51:12 +0000
@@ -4,7 +4,8 @@
 # External sources dependencies, packages are not recent enough
 subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
 sphinx_epytext.install = (pip3 install sphinx_epytext)
-flake8.install3 = (pip3 install flake8)
+flake8.install = (pip3 install flake8)
+mypy.install = (pip3 install mypy types-PyYAML types-paramiko types-setuptools)
 brz.extras = fastimport,launchpad,workspace,git,cext,doc
 
 [brz]
@@ -22,9 +23,9 @@
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = bionic
-byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade "pyopenssl>=0.22" cython setuptools-rust sphinx paramiko merge3 && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
+byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade "pyopenssl>=0.22" cython setuptools-rust sphinx paramiko merge3 && {subunit.clone} && {flake8.install} && {mypy.install} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=tools:$PYTHONPATH python3 -m flake8 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=tools:$PYTHONPATH python3 -m flake8 && PYTHONPATH=tools:$PYTHONPATH python3 -m mypy breezy && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-cosmic]
 vm.release = cosmic
 [brz-disco]

=== modified file 'profile_imports.py'
--- profile_imports.py	2020-02-18 01:57:45 +0000
+++ profile_imports.py	2022-10-19 15:51:12 +0000
@@ -20,10 +20,11 @@
 import re
 import sys
 import time
-
-
-_parent_stack = []
-_total_stack = {}
+from typing import Dict, Tuple, List
+
+
+_parent_stack: List[Tuple[int, str]] = []
+_total_stack: Dict[str, str] = {}
 _info = {}
 _cur_id = 0
 _timer = time.time
@@ -158,7 +159,7 @@
     return repr(pattern)
 
 
-_real_compile = re._compile
+_real_compile = re._compile  # type: ignore
 
 
 def timed_compile(*args, **kwargs):

=== modified file 'pyproject.toml'
--- pyproject.toml	2022-10-18 19:30:24 +0000
+++ pyproject.toml	2022-10-19 15:51:12 +0000
@@ -8,4 +8,14 @@
     "cython>=0.29",
     "pyyaml",
 ]
+<<<<<<< TREE
 build-backend = "setuptools.build_meta"
+=======
+
+[tool.mypy]
+python_version = "3.6"
+ignore_missing_imports = true
+warn_return_any = true
+warn_unused_configs = true
+exclude = ['^breezy/util/simplemapi\.py$']
+>>>>>>> MERGE-SOURCE

=== modified file 'setup.cfg'
--- setup.cfg	2022-10-18 19:30:24 +0000
+++ setup.cfg	2022-10-19 15:51:12 +0000
@@ -31,7 +31,7 @@
     merge3
     # Technically, Breezy works without these two dependencies too. But there's
     # no way to enable them by default and let users opt out.
-    dulwich>=0.20.23
+    dulwich>=0.20.46
     urllib3>=1.24.1
     pyyaml
 tests_require =
@@ -51,7 +51,7 @@
 [options.extras_require]
 cext = cython>=0.29
 fastimport = fastimport
-git = dulwich>=0.20.23
+git = dulwich>=0.20.46
 launchpad = launchpadlib>=1.6.3
 workspace = pyinotify
 doc =