Merge lp:brz/3.3 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.3

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file '.github/workflows/pythonpackage.yml'
--- .github/workflows/pythonpackage.yml	2022-11-17 17:22:45 +0000
+++ .github/workflows/pythonpackage.yml	2022-11-29 22:50:27 +0000
@@ -82,6 +82,7 @@
           PYTHONHASHSEED: random
           BRZ_PLUGIN_PATH: -site:-user
           PYTHONPATH: .
+        shell: bash
         if: "matrix.os == 'windows-latest'"
       - name: Run mypy
         run: |

=== modified file '.github/workflows/wheels.yaml'
--- .github/workflows/wheels.yaml	2022-11-05 18:57:19 +0000
+++ .github/workflows/wheels.yaml	2022-11-29 22:50:27 +0000
@@ -82,4 +82,4 @@
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: twine upload dist/*.whl
+        run: twine upload artifact/*.whl

=== modified file 'Cargo.toml'
--- Cargo.toml	2022-11-03 17:15:34 +0000
+++ Cargo.toml	2022-11-29 22:50:27 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "breezy"
-version = "3.3.1"
+version = "3.3.2"
 authors = [ "Martin Packman <[e-mail]>", "Jelmer Vernooij <[e-mail]>"]
 edition = "2018"
 publish = false

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2022-11-22 15:15:26 +0000
+++ breezy/__init__.py	2022-11-29 22:50:27 +0000
@@ -51,7 +51,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (3, 3, 1, 'final', 0)
+version_info = (3, 3, 2, 'dev', 0)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2022-11-15 10:35:17 +0000
+++ breezy/branch.py	2022-11-29 22:50:27 +0000
@@ -22,7 +22,6 @@
 lazy_import(globals(), """
 from breezy import (
     debug,
-    repository,
     transport,
     ui,
     )
@@ -42,6 +41,7 @@
     controldir,
     errors,
     revision as _mod_revision,
+    repository,
     registry,
     urlutils,
     )
@@ -92,6 +92,8 @@
 
     _last_revision_info_cache: Optional[Tuple[int, RevisionID]]
 
+    repository: repository.Repository
+
     @property
     def control_transport(self):
         return self._transport

=== modified file 'breezy/bugtracker.py'
--- breezy/bugtracker.py	2022-10-07 06:34:37 +0000
+++ breezy/bugtracker.py	2022-11-29 22:50:27 +0000
@@ -17,11 +17,8 @@
 from . import (
     errors,
     registry,
+    urlutils,
     )
-from .lazy_import import lazy_import
-lazy_import(globals(), """
-from breezy import urlutils
-""")
 
 
 """Provides a shorthand for referring to bugs on a variety of bug trackers.
@@ -318,9 +315,9 @@
         (project, bug_id) = bug_id.rsplit('/', 1)
         """Return the URL for bug_id."""
         if '{id}' not in self._base_url:
-            raise InvalidBugTrackerURL(self._abbreviation, self._base_url)
+            raise InvalidBugTrackerURL(self.abbreviation, self._base_url)
         if '{project}' not in self._base_url:
-            raise InvalidBugTrackerURL(self._abbreviation, self._base_url)
+            raise InvalidBugTrackerURL(self.abbreviation, self._base_url)
         return self._base_url.replace(
             '{project}', project).replace('{id}', str(bug_id))
 

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2022-10-29 02:25:39 +0000
+++ breezy/bzr/bzrdir.py	2022-11-29 22:50:27 +0000
@@ -27,7 +27,7 @@
 
 import contextlib
 import sys
-from typing import Set
+from typing import Set, TYPE_CHECKING, cast
 
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
@@ -72,6 +72,9 @@
     local,
     )
 
+if TYPE_CHECKING:
+    from .branch import BzrBranch
+
 
 class MissingFeature(errors.BzrError):
 
@@ -769,7 +772,7 @@
         raise NotImplementedError(self.get_workingtree_transport)
 
     @classmethod
-    def create(cls, base, format=None, possible_transports=None):
+    def create(cls, base, format=None, possible_transports=None) -> "BzrDir":
         """Create a new BzrDir at the url 'base'.
 
         :param format: If supplied, the format of branch to create.  If not
@@ -782,8 +785,8 @@
                                  "default format, not one of %r" % cls)
         if format is None:
             format = BzrDirFormat.get_default_format()
-        return controldir.ControlDir.create(
-            base, format=format, possible_transports=possible_transports)
+        return cast("BzrDir", controldir.ControlDir.create(
+            base, format=format, possible_transports=possible_transports))
 
     def __repr__(self):
         return "<%s at %r>" % (self.__class__.__name__, self.user_url)

=== modified file 'breezy/bzr_distutils.py'
--- breezy/bzr_distutils.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr_distutils.py	2022-11-29 22:50:27 +0000
@@ -46,17 +46,19 @@
                     ]
 
     boolean_options = ['force']
+    source_dir: str
+    build_dir: str
 
     def initialize_options(self):
         self.build_dir = None
         self.output_base = None
-        self.source_dir = None
+        self.source_dir = None  # type: ignore
         self.force = None
         self.lang = None
 
     def finalize_options(self):
         self.set_undefined_options('build', ('force', 'force'))
-        self.prj_name = self.distribution.get_name()
+        self.prj_name = self.distribution.get_name()  # type: ignore
         if self.build_dir is None:
             self.build_dir = 'breezy/locale'
         if not self.output_base:

=== modified file 'breezy/chunk_writer.py'
--- breezy/chunk_writer.py	2020-02-18 01:57:45 +0000
+++ breezy/chunk_writer.py	2022-11-29 22:50:27 +0000
@@ -17,6 +17,7 @@
 
 """ChunkWriter: write compressed data out with a fixed upper bound."""
 
+from typing import Optional, List
 import zlib
 from zlib import Z_FINISH, Z_SYNC_FLUSH
 
@@ -104,7 +105,7 @@
         """
         self.chunk_size = chunk_size
         self.compressor = zlib.compressobj()
-        self.bytes_in = []
+        self.bytes_in: Optional[List[bytes]] = []
         self.bytes_list = []
         self.bytes_out_len = 0
         # bytes that have been seen, but not included in a flush to out yet
@@ -172,7 +173,7 @@
               Z_SYNC_FLUSH called.
         """
         compressor = zlib.compressobj()
-        bytes_out = []
+        bytes_out: List[bytes] = []
         append = bytes_out.append
         compress = compressor.compress
         for accepted_bytes in self.bytes_in:

=== modified file 'breezy/cmdline.py'
--- breezy/cmdline.py	2020-02-18 01:57:45 +0000
+++ breezy/cmdline.py	2022-11-29 22:50:27 +0000
@@ -21,6 +21,7 @@
 """
 
 import re
+from typing import List
 
 
 _whitespace_match = re.compile(u'\\s', re.UNICODE).match
@@ -150,13 +151,13 @@
 
     def _get_token(self):
         self.quoted = False
-        self.token = []
+        self.token: List[str] = []
         state = _Whitespace()
         for next_char in self.seq:
             state = state.process(next_char, self)
             if state is None:
                 break
-        if state is not None and not getattr(state, 'finish', None) is None:
+        if state is not None and hasattr(state, 'finish'):
             state.finish(self)
         result = u''.join(self.token)
         if not self.quoted and result == '':

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2022-11-15 18:01:05 +0000
+++ breezy/controldir.py	2022-11-29 22:50:27 +0000
@@ -24,7 +24,7 @@
 
 """
 
-from typing import List, Type, Optional
+from typing import List, Type, Optional, TYPE_CHECKING, Dict, Set, Tuple, cast
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -35,7 +35,6 @@
     ui,
     urlutils,
     )
-from breezy.transport import local
 
 from breezy.i18n import gettext
 """)
@@ -49,6 +48,11 @@
     transport as _mod_transport,
     )
 
+if TYPE_CHECKING:
+    from .branch import Branch
+    from .repository import Repository
+    from .workingtree import WorkingTree
+
 
 class MustHaveWorkingTree(errors.BzrError):
 
@@ -134,13 +138,13 @@
         from."""
         return True
 
-    def list_branches(self):
+    def list_branches(self) -> List["Branch"]:
         """Return a sequence of all branches local to this control directory.
 
         """
         return list(self.get_branches().values())
 
-    def branch_names(self):
+    def branch_names(self) -> List[str]:
         """List all branch names in this control directory.
 
         Returns: List of branch names
@@ -152,7 +156,7 @@
         else:
             return [""]
 
-    def get_branches(self):
+    def get_branches(self) -> Dict[str, "Branch"]:
         """Get all branches in this control directory, as a dictionary.
 
         Returns: Dictionary mapping branch names to instances.
@@ -190,7 +194,7 @@
         """
         raise NotImplementedError(self.needs_format_conversion)
 
-    def create_repository(self, shared=False):
+    def create_repository(self, shared=False) -> "Repository":
         """Create a new repository in this control directory.
 
         Args:
@@ -205,7 +209,7 @@
         raise NotImplementedError(self.destroy_repository)
 
     def create_branch(self, name=None, repository=None,
-                      append_revisions_only=None):
+                      append_revisions_only=None) -> "Branch":
         """Create a branch in this ControlDir.
 
         Args:
@@ -232,7 +236,7 @@
         raise NotImplementedError(self.destroy_branch)
 
     def create_workingtree(self, revision_id=None, from_branch=None,
-                           accelerator_tree=None, hardlink=False):
+                           accelerator_tree=None, hardlink=False) -> "WorkingTree":
         """Create a working tree at this ControlDir.
 
         Args:
@@ -304,7 +308,7 @@
         raise NotImplementedError(self.set_branch_reference)
 
     def open_branch(self, name=None, unsupported=False,
-                    ignore_fallbacks=False, possible_transports=None):
+                    ignore_fallbacks=False, possible_transports=None) -> "Branch":
         """Open the branch object at this ControlDir if one is present.
 
         Args:
@@ -316,7 +320,7 @@
         """
         raise NotImplementedError(self.open_branch)
 
-    def open_repository(self, _unsupported=False):
+    def open_repository(self, _unsupported=False) -> "Repository":
         """Open the repository object at this ControlDir if one is present.
 
         This will not follow the Branch object pointer - it's strictly a direct
@@ -328,7 +332,7 @@
         """
         raise NotImplementedError(self.open_repository)
 
-    def find_repository(self):
+    def find_repository(self) -> "Repository":
         """Find the repository that should be used.
 
         This does not require a branch as we use it to find the repo for
@@ -338,7 +342,7 @@
         raise NotImplementedError(self.find_repository)
 
     def open_workingtree(self, unsupported=False,
-                         recommend_upgrade=True, from_branch=None):
+                         recommend_upgrade=True, from_branch=None) -> "WorkingTree":
         """Open the workingtree object at this ControlDir if one is present.
 
         Args:
@@ -671,7 +675,8 @@
         return ret
 
     @classmethod
-    def create_branch_and_repo(klass, base, force_new_repo=False, format=None):
+    def create_branch_and_repo(
+            klass, base, force_new_repo=False, format=None) -> "Branch":
         """Create a new ControlDir, Branch and Repository at the url 'base'.
 
         This will use the current default ControlDirFormat unless one is
@@ -690,7 +695,7 @@
         """
         controldir = klass.create(base, format)
         controldir._find_or_create_repository(force_new_repo)
-        return controldir.create_branch()
+        return cast("Branch", controldir.create_branch())
 
     @classmethod
     def create_branch_convenience(klass, base, force_new_repo=False,
@@ -723,6 +728,7 @@
           possible_transports: An optional reusable transports list.
         """
         if force_new_tree:
+            from breezy.transport import local
             # check for non local urls
             t = _mod_transport.get_transport(base, possible_transports)
             if not isinstance(t, local.LocalTransport):
@@ -739,7 +745,7 @@
         return result
 
     @classmethod
-    def create_standalone_workingtree(klass, base, format=None):
+    def create_standalone_workingtree(klass, base, format=None) -> "WorkingTree":
         """Create a new ControlDir, WorkingTree, Branch and Repository at 'base'.
 
         'base' must be a local path or a file:// url.
@@ -755,6 +761,7 @@
         Returns: The WorkingTree object.
         """
         t = _mod_transport.get_transport(base)
+        from breezy.transport import local
         if not isinstance(t, local.LocalTransport):
             raise errors.NotLocalUrl(base)
         controldir = klass.create_branch_and_repo(base,
@@ -769,7 +776,7 @@
 
     @classmethod
     def open(klass, base, possible_transports=None, probers=None,
-             _unsupported=False):
+             _unsupported=False) -> "ControlDir":
         """Open an existing controldir, rooted at 'base' (url).
 
         Args:
@@ -780,8 +787,8 @@
                                          _unsupported=_unsupported)
 
     @classmethod
-    def open_from_transport(klass, transport, _unsupported=False,
-                            probers=None):
+    def open_from_transport(klass, transport: _mod_transport.Transport,
+                            _unsupported=False, probers=None) -> "ControlDir":
         """Open a controldir within a particular directory.
 
         Args:
@@ -813,7 +820,7 @@
             raise errors.NotBranchError(base)
 
         format.check_support_status(_unsupported)
-        return format.open(transport, _found=True)
+        return cast("ControlDir", format.open(transport, _found=True))
 
     @classmethod
     def open_containing(klass, url, possible_transports=None):
@@ -1216,7 +1223,9 @@
         return result
 
     @classmethod
-    def find_format(klass, transport, probers=None):
+    def find_format(klass, transport: _mod_transport.Transport,
+                    probers: Optional[List[Type["Prober"]]] = None
+                    ) -> "ControlDirFormat":
         """Return the format present at transport."""
         if probers is None:
             probers = sorted(
@@ -1294,7 +1303,7 @@
         """
         raise NotImplementedError(self.network_name)
 
-    def open(self, transport, _found=False):
+    def open(self, transport: _mod_transport.Transport, _found=False) -> "ControlDir":
         """Return an instance of this format for the dir transport points at.
         """
         raise NotImplementedError(self.open)
@@ -1348,7 +1357,7 @@
     ControlDirFormat.
     """
 
-    def probe_transport(self, transport):
+    def probe_transport(self, transport) -> "ControlDirFormat":
         """Return the controldir style format present in a directory.
 
         :raise UnknownFormatError: If a control dir was found but is
@@ -1359,7 +1368,7 @@
         raise NotImplementedError(self.probe_transport)
 
     @classmethod
-    def known_formats(klass):
+    def known_formats(klass) -> Set["ControlDirFormat"]:
         """Return the control dir formats known by this prober.
 
         Multiple probers can return the same formats, so this should
@@ -1370,7 +1379,7 @@
         raise NotImplementedError(klass.known_formats)
 
     @classmethod
-    def priority(klass, transport):
+    def priority(klass, transport: _mod_transport.Transport) -> int:
         """Priority of this prober.
 
         A lower value means the prober gets checked first.

=== modified file 'breezy/git/hg.py'
--- breezy/git/hg.py	2020-02-18 01:57:45 +0000
+++ breezy/git/hg.py	2022-11-29 22:50:27 +0000
@@ -17,7 +17,7 @@
 
 """Compatibility for hg-git."""
 
-import urllib
+import urllib.parse
 
 
 def format_hg_metadata(renames, branch, extra):
@@ -42,7 +42,7 @@
             continue
         else:
             extra_message += "extra : " + key + \
-                " : " + urllib.quote(value) + "\n"
+                " : " + urllib.parse.quote(value) + "\n"
 
     if extra_message:
         return "\n--HG--\n" + extra_message
@@ -75,7 +75,7 @@
                 branch = data
             elif command == 'extra':
                 before, after = data.split(" : ", 1)
-                extra[before] = urllib.unquote(after)
+                extra[before] = urllib.parse.unquote(after)
             else:
                 raise KeyError("unknown hg-git metadata command %s" % command)
     return (message, renames, branch, extra)

=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2022-05-15 14:17:32 +0000
+++ breezy/gpg.py	2022-11-29 22:50:27 +0000
@@ -18,12 +18,11 @@
 """GPG signing and checking logic."""
 
 import os
+from typing import Optional, Dict, List
 
 from breezy.lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy import (
-    config,
-    trace,
     ui,
     )
 from breezy.i18n import (
@@ -33,7 +32,9 @@
 """)
 
 from . import (
+    config,
     errors,
+    trace,
     )
 
 # verification results
@@ -180,7 +181,7 @@
 class GPGStrategy(object):
     """GPG Signing and checking facilities."""
 
-    acceptable_keys = None
+    acceptable_keys: Optional[List[str]] = None
 
     def __init__(self, config_stack):
         self._config_stack = config_stack
@@ -410,7 +411,7 @@
 
 def verbose_expired_key_message(result, repo):
     """takes a verify result and returns list of expired key info"""
-    signers = {}
+    signers: Dict[str, int] = {}
     fingerprint_to_authors = {}
     for rev_id, validity, fingerprint in result:
         if validity == SIGNATURE_EXPIRED:
@@ -431,7 +432,7 @@
 
 def verbose_valid_message(result):
     """takes a verify result and returns list of signed commits strings"""
-    signers = {}
+    signers: Dict[str, int] = {}
     for rev_id, validity, uid in result:
         if validity == SIGNATURE_VALID:
             signers.setdefault(uid, 0)
@@ -446,7 +447,7 @@
 
 def verbose_not_valid_message(result, repo):
     """takes a verify result and returns list of not valid commit info"""
-    signers = {}
+    signers: Dict[str, int] = {}
     for rev_id, validity, empty in result:
         if validity == SIGNATURE_NOT_VALID:
             revision = repo.get_revision(rev_id)
@@ -463,7 +464,7 @@
 
 def verbose_not_signed_message(result, repo):
     """takes a verify result and returns list of not signed commit info"""
-    signers = {}
+    signers: Dict[str, int] = {}
     for rev_id, validity, empty in result:
         if validity == SIGNATURE_NOT_SIGNED:
             revision = repo.get_revision(rev_id)
@@ -480,7 +481,7 @@
 
 def verbose_missing_key_message(result):
     """takes a verify result and returns list of missing key info"""
-    signers = {}
+    signers: Dict[str, int] = {}
     for rev_id, validity, fingerprint in result:
         if validity == SIGNATURE_KEY_MISSING:
             signers.setdefault(fingerprint, 0)

=== modified file 'breezy/hooks.py'
--- breezy/hooks.py	2022-09-23 03:17:56 +0000
+++ breezy/hooks.py	2022-11-29 22:50:27 +0000
@@ -44,7 +44,7 @@
         self.hook = hook_name
 
 
-class KnownHooksRegistry(registry.Registry):
+class KnownHooksRegistry(registry.Registry[str, "Hooks"]):
     # known_hooks registry contains
     # tuple of (module, member name) which is the hook point
     # module where the specific hooks are defined

=== modified file 'breezy/iterablefile.py'
--- breezy/iterablefile.py	2020-02-18 01:57:45 +0000
+++ breezy/iterablefile.py	2022-11-29 22:50:27 +0000
@@ -16,6 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
+from typing import List
+
+
 class IterableFileBase(object):
     """Create a file-like object from any iterable"""
 
@@ -251,7 +254,7 @@
         Traceback (most recent call last):
         ValueError: File is closed.
         """
-        lines = []
+        lines: List[bytes] = []
         while True:
             line = self.readline()
             if line == b"":

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2022-10-06 05:49:43 +0000
+++ breezy/osutils.py	2022-11-29 22:50:27 +0000
@@ -25,7 +25,6 @@
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
-from datetime import datetime
 import getpass
 import locale
 import ntpath
@@ -766,6 +765,7 @@
 
 def local_time_offset(t=None):
     """Return offset of local zone from GMT, either at present or at time t."""
+    from datetime import datetime
     if t is None:
         t = time.time()
     offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)

=== modified file 'breezy/patches.py'
--- breezy/patches.py	2021-01-10 00:25:52 +0000
+++ breezy/patches.py	2022-11-29 22:50:27 +0000
@@ -21,6 +21,7 @@
 
 import os
 import re
+from typing import List, Optional
 
 
 binary_files_re = b'Binary files (.*) and (.*) differ\n'
@@ -119,11 +120,11 @@
     tmp = textrange.split(b',')
     if len(tmp) == 1:
         pos = tmp[0]
-        range = b"1"
+        brange = b"1"
     else:
-        (pos, range) = tmp
+        (pos, brange) = tmp
     pos = int(pos)
-    range = int(range)
+    range = int(brange)
     return (pos, range)
 
 
@@ -432,8 +433,8 @@
     # allow_dirty or restrict those to only being before the patch is found
     # (as allow_dirty does).
     regex = re.compile(binary_files_re)
-    saved_lines = []
-    dirty_head = []
+    saved_lines: List[bytes] = []
+    dirty_head: List[bytes] = []
     orig_range = 0
     beginning = True
 
@@ -494,7 +495,7 @@
     applied at any point up until hunk line parsing, and is safe to apply
     repeatedly.
     """
-    last_line = None
+    last_line: Optional[bytes] = None
     for line in iter_lines:
         if line == NO_NL:
             if not last_line.endswith(b'\n'):

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2022-11-18 00:36:12 +0000
+++ breezy/plugins/propose/cmds.py	2022-11-29 22:50:27 +0000
@@ -220,10 +220,10 @@
             note(gettext('There is already a branch merge proposal: %s'), e.url)
         else:
             note(gettext('Merge proposal created: %s') % proposal.url)
-            web_url = proposal.get_web_url()
-            note(gettext('Opening %s in web browser'), web_url)
             if open:
+                web_url = proposal.get_web_url()
                 import webbrowser
+                note(gettext('Opening %s in web browser'), web_url)
                 webbrowser.open(web_url)
 
 

=== modified file 'breezy/registry.py'
--- breezy/registry.py	2022-11-15 10:35:17 +0000
+++ breezy/registry.py	2022-11-29 22:50:27 +0000
@@ -25,6 +25,7 @@
     Union,
     Callable,
     Dict,
+    List,
     Iterator,
     Tuple,
     Callable,
@@ -127,7 +128,7 @@
         return dict(self._aliases.items())
 
     def alias_map(self):
-        ret = {}
+        ret: Dict[str, List[str]] = {}
         for alias, target in self._aliases.items():
             ret.setdefault(target, []).append(alias)
         return ret
@@ -299,7 +300,7 @@
     """Registry specialised for handling formats."""
 
     def __init__(self, other_registry=None):
-        Registry.__init__(self)
+        super(FormatRegistry, self).__init__()
         self._other_registry = other_registry
 
     def register(self, key, obj, help=None, info=None,

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2022-11-15 21:21:38 +0000
+++ breezy/repository.py	2022-11-29 22:50:27 +0000
@@ -16,7 +16,7 @@
 
 __docformat__ = "google"
 
-from typing import List, Type
+from typing import List, Type, TYPE_CHECKING
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -43,6 +43,7 @@
 from .lock import _RelockDebugMixin, LogicalLockResult
 from .trace import (
     log_exception_quietly, note, mutter, mutter_callsite, warning)
+from .revisiontree import RevisionTree
 
 
 # Old formats display a warning, but only once
@@ -173,7 +174,7 @@
         """
         raise NotImplementedError(self.abort)
 
-    def revision_tree(self):
+    def revision_tree(self) -> "RevisionTree":
         """Return the tree that was just committed.
 
         After calling commit() this can be called to get a
@@ -1041,7 +1042,7 @@
         repository.
         """
 
-    def revision_tree(self, revision_id):
+    def revision_tree(self, revision_id) -> "RevisionTree":
         """Return Tree for a revision on this branch.
 
         `revision_id` may be NULL_REVISION for the empty tree revision.

=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2022-11-13 20:26:24 +0000
+++ breezy/transport/__init__.py	2022-11-29 22:50:27 +0000
@@ -29,7 +29,7 @@
 import errno
 from io import BytesIO
 import sys
-from typing import Dict, Any, Callable
+from typing import Dict, Any, Callable, TypeVar
 
 from stat import S_ISDIR
 
@@ -1613,7 +1613,14 @@
     return None, last_err
 
 
-def do_catching_redirections(action, transport, redirected):
+T = TypeVar('T')
+
+
+def do_catching_redirections(
+        action: Callable[[Transport], T],
+        transport: Transport,
+        redirected: Callable[
+            [Transport, errors.RedirectRequested, str], Transport]) -> T:
     """Execute an action with given transport catching redirections.
 
     This is a facility provided for callers needing to follow redirections

=== modified file 'breezy/util/simplemapi.py'
--- breezy/util/simplemapi.py	2022-10-19 15:50:56 +0000
+++ breezy/util/simplemapi.py	2022-11-29 22:50:27 +0000
@@ -155,7 +155,7 @@
 class MAPIError(WindowsError):  # type: ignore
 
     def __init__(self, code):
-        WindowsError.__init__(self)
+        WindowsError.__init__(self)  # type: ignore
         self.code = code
 
     def __str__(self):
@@ -214,7 +214,7 @@
         rd.ulRecipClass = MAPI_TO
         try:
             rd.lpszName, rd.lpszAddress = _resolveName(session, ra)
-        except WindowsError:
+        except WindowsError:  # type: ignore
             # work-round for Mozilla Thunderbird
             rd.lpszName, rd.lpszAddress = None, ra
         rd.ulEIDSize = 0

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-11-15 10:35:17 +0000
+++ breezy/workingtree.py	2022-11-29 22:50:27 +0000
@@ -33,7 +33,11 @@
 import errno
 import os
 import sys
-from typing import Optional
+from typing import Optional, Tuple, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .branch import Branch
+    from .revisiontree import RevisionTree
 
 import breezy
 
@@ -90,6 +94,8 @@
         (as opposed to a URL).
     """
 
+    branch: "Branch"
+
     # override this to set the strategy for storing views
     def _make_views(self):
         return views.DisabledViews(self)
@@ -145,7 +151,7 @@
         """
         return self.controldir.is_control_filename(filename)
 
-    branch = property(
+    branch = property(  # type: ignore
         fget=lambda self: self._branch,
         doc="""The branch this WorkingTree is connected to.
 
@@ -200,7 +206,7 @@
         return self.branch.get_config_stack()
 
     @staticmethod
-    def open(path=None, _unsupported=False):
+    def open(path=None, _unsupported=False) -> "WorkingTree":
         """Open an existing working tree at path.
 
         """
@@ -210,7 +216,7 @@
         return control.open_workingtree(unsupported=_unsupported)
 
     @staticmethod
-    def open_containing(path=None):
+    def open_containing(path: Optional[str] = None) -> Tuple["WorkingTree", str]:
         """Open an existing working tree which has its root about path.
 
         This probes for a working tree at path and searches upwards from there.
@@ -301,7 +307,7 @@
         return new_list
 
     @staticmethod
-    def open_downlevel(path=None):
+    def open_downlevel(path=None) -> "WorkingTree":
         """Open an unsupported working tree.
 
         Only intended for advanced situations like upgrading part of a controldir.
@@ -315,7 +321,7 @@
     def abspath(self, filename):
         return osutils.pathjoin(self.basedir, filename)
 
-    def basis_tree(self):
+    def basis_tree(self) -> "RevisionTree":
         """Return RevisionTree for the current last revision.
 
         If the left most parent is a ghost then the returned tree will be an
@@ -1028,7 +1034,7 @@
         """Restore uncommitted changes from the branch into the tree."""
         raise NotImplementedError(self.restore_uncommitted)
 
-    def revision_tree(self, revision_id):
+    def revision_tree(self, revision_id) -> "RevisionTree":
         """See Tree.revision_tree.
 
         For trees that can be obtained from the working tree, this

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2022-11-22 13:24:11 +0000
+++ doc/developers/releasing.txt	2022-11-29 22:50:27 +0000
@@ -394,6 +394,10 @@
    installers won't be made and the download list will stay very small!
    <https://bugs.launchpad.net/launchpad/+bug/586445>
 
+#. Run twine to upload to pip::
+
+     twine upload breezy-*.tar.gz breezy-*.tar.gz.asc
+
 
 Kick off the next cycle
 -----------------------

=== modified file 'lib-rio/Cargo.toml'
--- lib-rio/Cargo.toml	2022-10-08 19:29:52 +0000
+++ lib-rio/Cargo.toml	2022-11-29 22:50:27 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "rio-py"
-version = "3.3.1"
+version = "3.3.2"
 edition = "2018"
 
 [lib]

=== modified file 'profile_imports.py'
--- profile_imports.py	2022-09-23 06:44:09 +0000
+++ profile_imports.py	2022-11-29 22:50:27 +0000
@@ -24,7 +24,7 @@
 
 
 _parent_stack: List[Tuple[int, str]] = []
-_total_stack: Dict[str, str] = {}
+_total_stack: Dict[Tuple[int, str], List[Tuple[int, str]]] = {}
 _info = {}
 _cur_id = 0
 _timer = time.time
@@ -192,10 +192,10 @@
 def install():
     """Install the hooks for measuring import and regex compile time."""
     __builtins__['__import__'] = timed_import
-    re._compile = timed_compile
+    re._compile = timed_compile  # type: ignore
 
 
 def uninstall():
     """Remove the import and regex compile timing hooks."""
     __builtins__['__import__'] = _real_import
-    re._compile = _real_compile
+    re._compile = _real_compile  # type: ignore

=== modified file 'pyproject.toml'
--- pyproject.toml	2022-10-27 11:57:11 +0000
+++ pyproject.toml	2022-11-29 22:50:27 +0000
@@ -16,4 +16,5 @@
 ignore_missing_imports = true
 warn_return_any = true
 warn_unused_configs = true
+#check_untyped_defs = true
 exclude = ['^breezy/util/simplemapi\.py$']