Merge lp:brz/3.3 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.3

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2022-11-13 20:26:24 +0000
+++ breezy/branch.py	2022-11-15 21:31:51 +0000
@@ -1930,7 +1930,7 @@
         self._default_format = None
 
 
-network_format_registry = registry.FormatRegistry()
+network_format_registry = registry.FormatRegistry[BranchFormat]()
 """Registry of formats indexed by their network name.
 
 The network name for a branch format is an identifier that can be used when
@@ -2237,7 +2237,7 @@
 
             # what's the current last revision, before we fetch [and change it
             # possibly]
-            last_rev = _mod_revision.ensure_null(self.target.last_revision())
+            last_rev = self.target.last_revision()
             # we fetch here so that we don't process data twice in the common
             # case of having something to pull, and so that the check for
             # already merged can operate on the just fetched graph, which will

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2022-10-29 11:59:45 +0000
+++ breezy/builtins.py	2022-11-15 21:31:51 +0000
@@ -1833,7 +1833,7 @@
             revision_id = revision[0].as_revision_id(branch)
         else:
             revision_id = branch.last_revision()
-        if revision_id == _mod_revision.ensure_null(tree.last_revision()):
+        if revision_id == tree.last_revision():
             revno = branch.revision_id_to_dotted_revno(revision_id)
             note(gettext("Tree is up to date at revision {0} of branch {1}"
                          ).format('.'.join(map(str, revno)), branch_location))
@@ -1855,8 +1855,7 @@
                 "brz update --revision only works"
                 " for a revision in the branch history")
                 % (exc.revision)) from exc
-        revno = tree.branch.revision_id_to_dotted_revno(
-            _mod_revision.ensure_null(tree.last_revision()))
+        revno = tree.branch.revision_id_to_dotted_revno(tree.last_revision())
         note(gettext('Updated to revision {0} of branch {1}').format(
              '.'.join(map(str, revno)), branch_location))
         parent_ids = tree.get_parent_ids()
@@ -4346,14 +4345,12 @@
 
     @display_command
     def run(self, branch, other):
-        from .revision import ensure_null
-
         branch1 = Branch.open_containing(branch)[0]
         branch2 = Branch.open_containing(other)[0]
         self.enter_context(branch1.lock_read())
         self.enter_context(branch2.lock_read())
-        last1 = ensure_null(branch1.last_revision())
-        last2 = ensure_null(branch2.last_revision())
+        last1 = branch1.last_revision()
+        last2 = branch2.last_revision()
 
         graph = branch1.repository.get_graph(branch2.repository)
         base_rev_id = graph.find_unique_lca(last1, last2)
@@ -4670,8 +4667,7 @@
             if len(revision) == 2:
                 base_revision_id = revision[0].as_revision_id(base_branch)
         if other_revision_id is None:
-            other_revision_id = _mod_revision.ensure_null(
-                other_branch.last_revision())
+            other_revision_id = other_branch.last_revision()
         # Remember where we merge from. We need to remember if:
         # - user specify a location (and we don't merge from the parent
         #   branch)
@@ -5769,7 +5765,7 @@
     def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
             sign=False, revision=None, mail_to=None, message=None,
             directory=u'.'):
-        from .revision import ensure_null, NULL_REVISION
+        from .revision import NULL_REVISION
         include_patch, include_bundle = {
             'plain': (False, False),
             'diff': (True, False),
@@ -5808,7 +5804,6 @@
                 base_revision_id = revision[0].as_revision_id(branch)
         else:
             revision_id = branch.last_revision()
-        revision_id = ensure_null(revision_id)
         if revision_id == NULL_REVISION:
             raise errors.CommandError(gettext('No revisions to bundle.'))
         directive = merge_directive.MergeDirective2.from_objects(

=== modified file 'breezy/bzr/__init__.py'
--- breezy/bzr/__init__.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/__init__.py	2022-11-15 21:31:51 +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_CHECKING
+
 from .. import (
     config,
     errors,
@@ -24,6 +26,10 @@
     )
 
 
+if TYPE_CHECKING:
+    from .bzrdir import BzrDirFormat
+
+
 class LineEndingError(errors.BzrError):
 
     _fmt = ("Line ending corrupted for file: %(file)s; "
@@ -36,7 +42,7 @@
 class BzrProber(controldir.Prober):
     """Prober for formats that use a .bzr/ control directory."""
 
-    formats = registry.FormatRegistry(controldir.network_format_registry)
+    formats = registry.FormatRegistry["BzrDirFormat"](controldir.network_format_registry)
     """The known .bzr formats."""
 
     @classmethod

=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2022-10-29 11:59:45 +0000
+++ breezy/bzr/branch.py	2022-11-15 21:31:51 +0000
@@ -240,7 +240,6 @@
         if not revision_id or not isinstance(revision_id, bytes):
             raise errors.InvalidRevisionId(
                 revision_id=revision_id, branch=self)
-        revision_id = _mod_revision.ensure_null(revision_id)
         with self.lock_write():
             old_revno, old_revid = self.last_revision_info()
             if self.get_append_revisions_only():
@@ -370,11 +369,10 @@
         with self.lock_write():
             master = self.get_master_branch(possible_transports)
             if master is not None:
-                old_tip = _mod_revision.ensure_null(self.last_revision())
+                old_tip = self.last_revision()
                 self.pull(master, overwrite=True)
                 if self.repository.get_graph().is_ancestor(
-                        old_tip, _mod_revision.ensure_null(
-                            self.last_revision())):
+                        old_tip, self.last_revision()):
                     return None
                 return old_tip
             return None
@@ -393,7 +391,6 @@
 
         Does not update the revision_history cache.
         """
-        revision_id = _mod_revision.ensure_null(revision_id)
         out_string = b'%d %s\n' % (revno, revision_id)
         self._transport.put_bytes('last-revision', out_string,
                                   mode=self.controldir._get_file_mode())
@@ -513,13 +510,12 @@
         self._reference_info = None
 
     def _check_history_violation(self, revision_id):
-        current_revid = self.last_revision()
-        last_revision = _mod_revision.ensure_null(current_revid)
+        last_revision = self.last_revision()
         if _mod_revision.is_null(last_revision):
             return
         graph = self.repository.get_graph()
         for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
-            if lh_ancestor == current_revid:
+            if lh_ancestor == last_revision:
                 return
         raise errors.AppendRevisionsOnlyViolation(self.user_url)
 

=== modified file 'breezy/bzr/fullhistory.py'
--- breezy/bzr/fullhistory.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/fullhistory.py	2022-11-15 21:31:51 +0000
@@ -40,7 +40,6 @@
         if not revision_id or not isinstance(revision_id, bytes):
             raise errors.InvalidRevisionId(
                 revision_id=revision_id, branch=self)
-        revision_id = _mod_revision.ensure_null(revision_id)
         with self.lock_write():
             # this old format stores the full history, but this api doesn't
             # provide it, so we must generate, and might as well check it's

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2022-11-13 20:26:24 +0000
+++ breezy/bzr/remote.py	2022-11-15 21:31:51 +0000
@@ -1933,7 +1933,6 @@
 
     def revision_tree(self, revision_id):
         with self.lock_read():
-            revision_id = _mod_revision.ensure_null(revision_id)
             if revision_id == _mod_revision.NULL_REVISION:
                 return InventoryRevisionTree(self,
                                              Inventory(root_id=None), _mod_revision.NULL_REVISION)

=== modified file 'breezy/bzr/tests/per_bzrdir/test_bzrdir.py'
--- breezy/bzr/tests/per_bzrdir/test_bzrdir.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/tests/per_bzrdir/test_bzrdir.py	2022-11-15 21:31:51 +0000
@@ -437,8 +437,7 @@
         self.assertTrue(repo.has_revision(b'1'))
         try:
             self.assertTrue(
-                _mod_revision.is_null(_mod_revision.ensure_null(
-                    dir.open_branch().last_revision())))
+                _mod_revision.is_null(dir.open_branch().last_revision()))
         except errors.NotBranchError:
             pass
         target = dir.sprout(self.get_url('target'))

=== modified file 'breezy/bzr/tests/test__simple_set.py'
--- breezy/bzr/tests/test__simple_set.py	2022-09-24 17:01:11 +0000
+++ breezy/bzr/tests/test__simple_set.py	2022-11-15 21:31:51 +0000
@@ -104,10 +104,14 @@
         assertRefcount actually creates a new pointer, as does calling
         sys.getrefcount. So pass the expected value *before* the call.
         """
-        # I'm not sure why the offset is 3, but I've check that in the caller,
-        # an offset of 1 works, which is expected. Not sure why assertRefcount
-        # is incrementing/decrementing 2 times
-        self.assertEqual(count, sys.getrefcount(obj) - 3)
+        if sys.version_info < (3, 11):
+            # I'm not sure why the offset is 3, but I've check that in the caller,
+            # an offset of 1 works, which is expected. Not sure why assertRefcount
+            # is incrementing/decrementing 2 times
+            self.assertEqual(count, sys.getrefcount(obj) - 3)
+        else:
+            # On 3.11, the offset is 2
+            self.assertEqual(count, sys.getrefcount(obj) - 2)
 
     def test_initial(self):
         obj = self.module.SimpleSet()

=== modified file 'breezy/bzr/tests/test__static_tuple.py'
--- breezy/bzr/tests/test__static_tuple.py	2022-09-23 03:17:56 +0000
+++ breezy/bzr/tests/test__static_tuple.py	2022-11-15 21:31:51 +0000
@@ -52,12 +52,15 @@
         assertRefcount actually creates a new pointer, as does calling
         sys.getrefcount. So pass the expected value *before* the call.
         """
-        # I don't understand why it is getrefcount()-3 here, but it seems to be
-        # correct. If I check in the calling function, with:
-        # self.assertEqual(count, sys.getrefcount(obj)-1)
-        # Then it works fine. Something about passing it to assertRefcount is
-        # actually double-incrementing (and decrementing) the refcount
-        self.assertEqual(count, sys.getrefcount(obj) - 3)
+        if sys.version_info < (3, 11):
+            # I don't understand why it is getrefcount()-3 here, but it seems to be
+            # correct. If I check in the calling function, with:
+            # self.assertEqual(count, sys.getrefcount(obj)-1)
+            # Then it works fine. Something about passing it to assertRefcount is
+            # actually double-incrementing (and decrementing) the refcount
+            self.assertEqual(count, sys.getrefcount(obj) - 3)
+        else:
+            self.assertEqual(count, sys.getrefcount(obj) - 2)
 
     def test_create(self):
         k = self.module.StaticTuple('foo')

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2022-09-01 19:17:39 +0000
+++ breezy/bzr/vf_repository.py	2022-11-15 21:31:51 +0000
@@ -1554,7 +1554,6 @@
 
         `revision_id` may be NULL_REVISION for the empty tree revision.
         """
-        revision_id = _mod_revision.ensure_null(revision_id)
         # TODO: refactor this to use an existing revision object
         # so we don't need to read it in twice.
         if revision_id == _mod_revision.NULL_REVISION:

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2022-11-13 18:35:58 +0000
+++ breezy/bzr/workingtree.py	2022-11-15 21:31:51 +0000
@@ -1997,7 +1997,7 @@
                     self.add_parent_tree((old_tip, other_tree))
                     return len(nb_conflicts)
 
-            if last_rev != _mod_revision.ensure_null(revision):
+            if last_rev != revision:
                 # the working tree is up to date with the branch
                 # we can merge the specified revision from master
                 to_tree = self.branch.repository.revision_tree(revision)

=== modified file 'breezy/bzr/workingtree_3.py'
--- breezy/bzr/workingtree_3.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/workingtree_3.py	2022-11-15 21:31:51 +0000
@@ -205,7 +205,7 @@
         else:
             branch = a_controldir.open_branch()
         if revision_id is None:
-            revision_id = _mod_revision.ensure_null(branch.last_revision())
+            revision_id = branch.last_revision()
         # WorkingTree3 can handle an inventory which has a unique root id.
         # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
         # those trees. And because there isn't a format bump inbetween, we

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2022-10-08 17:46:49 +0000
+++ breezy/controldir.py	2022-11-15 21:31:51 +0000
@@ -32,7 +32,6 @@
 
 from breezy import (
     branch as _mod_branch,
-    revision as _mod_revision,
     ui,
     urlutils,
     )
@@ -45,6 +44,7 @@
     errors,
     hooks,
     registry,
+    revision as _mod_revision,
     trace,
     transport as _mod_transport,
     )
@@ -998,7 +998,7 @@
         raise NotImplementedError(cls.get_format_string)
 
 
-class ControlComponentFormatRegistry(registry.FormatRegistry):
+class ControlComponentFormatRegistry(registry.FormatRegistry[ControlComponentFormat]):
     """A registry for control components (branch, workingtree, repository)."""
 
     def __init__(self, other_registry=None):
@@ -1185,14 +1185,14 @@
                 target_format.rich_root_data)
 
     @classmethod
-    def register_prober(klass, prober):
+    def register_prober(klass, prober: Type["Prober"]):
         """Register a prober that can look for a control dir.
 
         """
         klass._probers.append(prober)
 
     @classmethod
-    def unregister_prober(klass, prober):
+    def unregister_prober(klass, prober: Type["Prober"]):
         """Unregister a prober.
 
         """
@@ -1203,7 +1203,7 @@
         return self.get_format_description().rstrip()
 
     @classmethod
-    def all_probers(klass):
+    def all_probers(klass) -> List[Type["Prober"]]:
         return klass._probers
 
     @classmethod
@@ -1329,7 +1329,7 @@
         this in the future - for instance to make bzr talk with svn working
         trees.
         """
-        raise NotImplementedError(self.is_control_filename)
+        raise NotImplementedError(cls.is_control_filename)
 
 
 class Prober(object):
@@ -1394,7 +1394,7 @@
         self.experimental = experimental
 
 
-class ControlDirFormatRegistry(registry.Registry):
+class ControlDirFormatRegistry(registry.Registry[str, ControlDirFormat]):
     """Registry of user-selectable ControlDir subformats.
 
     Differs from ControlDirFormat._formats in that it provides sub-formats,
@@ -1677,7 +1677,7 @@
 # on previous ones.
 format_registry = ControlDirFormatRegistry()
 
-network_format_registry = registry.FormatRegistry()
+network_format_registry = registry.FormatRegistry[ControlDirFormat]()
 """Registry of formats indexed by their network name.
 
 The network name for a ControlDirFormat is an identifier that can be used when

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2022-11-13 18:35:58 +0000
+++ breezy/git/workingtree.py	2022-11-15 21:31:51 +0000
@@ -382,7 +382,7 @@
         This implementation reads the pending merges list and last_revision
         value and uses that to decide what the parents list should be.
         """
-        last_rev = _mod_revision.ensure_null(self._last_revision())
+        last_rev = self._last_revision()
         if _mod_revision.NULL_REVISION == last_rev:
             parents = []
         else:
@@ -1537,7 +1537,7 @@
                     self.add_parent_tree((old_tip, other_tree))
                     return len(nb_conflicts)
 
-            if last_rev != _mod_revision.ensure_null(revision):
+            if last_rev != revision:
                 to_tree = self.branch.repository.revision_tree(revision)
 
                 # determine the branch point

=== modified file 'breezy/main.rs'
--- breezy/main.rs	2022-11-03 17:14:55 +0000
+++ breezy/main.rs	2022-11-15 21:31:51 +0000
@@ -4,9 +4,9 @@
 
 
 fn check_version(py: Python<'_>) -> PyResult<()> {
-    let MAJOR: u32 = env!("CARGO_PKG_VERSION_MAJOR").parse::<u32>().unwrap();
-    let MINOR: u32 = env!("CARGO_PKG_VERSION_MINOR").parse::<u32>().unwrap();
-    let PATCH: u32 = env!("CARGO_PKG_VERSION_PATCH").parse::<u32>().unwrap();
+    let major: u32 = env!("CARGO_PKG_VERSION_MAJOR").parse::<u32>().unwrap();
+    let minor: u32 = env!("CARGO_PKG_VERSION_MINOR").parse::<u32>().unwrap();
+    let patch: u32 = env!("CARGO_PKG_VERSION_PATCH").parse::<u32>().unwrap();
     let breezy = PyModule::import(py, "breezy").map_err(|e| {
         eprintln!(
             "brz: ERROR: Couldn't import breezy and dependencies.\n\
@@ -19,7 +19,7 @@
         .getattr("version_info")?
         .extract::<(u32, u32, u32, String, u32)>()?;
 
-    if ver.0 != MAJOR || ver.1 != MINOR || ver.2 != PATCH {
+    if ver.0 != major || ver.1 != minor || ver.2 != patch {
         eprintln!(
             "\
             brz: WARNING: breezy version doesn't match the brz program.\n  \
@@ -27,9 +27,9 @@
             breezy version is {}\n  \
             brz version is {}.{}.{}\n",
             breezy.getattr("_format_version_tuple")?.call1((ver,))?,
-            MAJOR,
-            MINOR,
-            PATCH
+            major,
+            minor,
+            patch
         );
     }
     Ok(())

=== modified file 'breezy/memorytree.py'
--- breezy/memorytree.py	2022-08-22 18:19:46 +0000
+++ breezy/memorytree.py	2022-11-15 21:31:51 +0000
@@ -89,8 +89,7 @@
     @staticmethod
     def create_on_branch(branch):
         """Create a MemoryTree for branch, using the last-revision of branch."""
-        revision_id = _mod_revision.ensure_null(branch.last_revision())
-        return MemoryTree(branch, revision_id)
+        return MemoryTree(branch, branch.last_revision())
 
     def _gather_kinds(self, files, kinds):
         """See MutableTree._gather_kinds.

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2022-11-13 20:26:24 +0000
+++ breezy/merge.py	2022-11-15 21:31:51 +0000
@@ -273,8 +273,7 @@
                  recurse='down', revision_graph=None):
         object.__init__(self)
         self.this_branch = this_branch
-        self.this_basis = _mod_revision.ensure_null(
-            this_branch.last_revision())
+        self.this_basis = this_branch.last_revision()
         self.this_rev_id = None
         self.this_tree = this_tree
         self.this_revision_tree = None
@@ -436,7 +435,6 @@
             revision_id = branch.last_revision()
         else:
             revision_id = branch.get_rev_id(revno)
-        revision_id = _mod_revision.ensure_null(revision_id)
         return branch, self.revision_tree(revision_id, branch)
 
     def set_interesting_files(self, file_list):
@@ -472,8 +470,7 @@
         self.other_branch, self.other_tree = self._get_tree(other_revision,
                                                             possible_transports)
         if other_revision[1] == -1:
-            self.other_rev_id = _mod_revision.ensure_null(
-                self.other_branch.last_revision())
+            self.other_rev_id = self.other_branch.last_revision()
             if _mod_revision.is_null(self.other_rev_id):
                 raise errors.NoCommits(self.other_branch)
             self.other_basis = self.other_rev_id
@@ -518,8 +515,7 @@
             target.fetch(source, revision_id)
 
     def find_base(self):
-        revisions = [_mod_revision.ensure_null(self.this_basis),
-                     _mod_revision.ensure_null(self.other_basis)]
+        revisions = [self.this_basis, self.other_basis]
         if _mod_revision.NULL_REVISION in revisions:
             self.base_rev_id = _mod_revision.NULL_REVISION
             self.base_tree = self.revision_tree(self.base_rev_id)
@@ -591,8 +587,7 @@
             elif base_revision[1] is None:
                 self.base_rev_id = _mod_revision.NULL_REVISION
             else:
-                self.base_rev_id = _mod_revision.ensure_null(
-                    base_branch.get_rev_id(base_revision[1]))
+                self.base_rev_id = base_branch.get_rev_id(base_revision[1])
             self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
 
     def make_merger(self):

=== modified file 'breezy/merge_directive.py'
--- breezy/merge_directive.py	2022-10-08 17:46:49 +0000
+++ breezy/merge_directive.py	2022-11-15 21:31:51 +0000
@@ -208,7 +208,6 @@
             patch = None
         else:
             submit_revision_id = submit_branch.last_revision()
-            submit_revision_id = _mod_revision.ensure_null(submit_revision_id)
             repository.fetch(submit_branch.repository, submit_revision_id)
             graph = repository.get_graph()
             ancestor_id = graph.find_unique_lca(revision_id,
@@ -620,7 +619,6 @@
             if submit_branch.get_public_branch() is not None:
                 target_branch = submit_branch.get_public_branch()
             submit_revision_id = submit_branch.last_revision()
-            submit_revision_id = _mod_revision.ensure_null(submit_revision_id)
             graph = repository.get_graph(submit_branch.repository)
             ancestor_id = graph.find_unique_lca(revision_id,
                                                 submit_revision_id)

=== modified file 'breezy/plugins/weave_fmt/workingtree.py'
--- breezy/plugins/weave_fmt/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/plugins/weave_fmt/workingtree.py	2022-11-15 21:31:51 +0000
@@ -94,7 +94,7 @@
         else:
             branch = a_controldir.open_branch()
         if revision_id is None:
-            revision_id = _mod_revision.ensure_null(branch.last_revision())
+            revision_id = branch.last_revision()
         with branch.lock_write():
             branch.generate_revision_history(revision_id)
         inv = inventory.Inventory()

=== modified file 'breezy/registry.py'
--- breezy/registry.py	2022-11-13 20:26:24 +0000
+++ breezy/registry.py	2022-11-15 21:31:51 +0000
@@ -27,6 +27,7 @@
     Dict,
     Iterator,
     Tuple,
+    Callable,
 )
 
 from .pyutils import get_named_object
@@ -293,7 +294,8 @@
                            " Can be set to any existing key.")
 
 
-class FormatRegistry(Registry):
+Format = TypeVar('Format')
+class FormatRegistry(Registry[str, Union[Format, Callable[[], Format]]]):
     """Registry specialised for handling formats."""
 
     def __init__(self, other_registry=None):

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2022-11-15 16:29:43 +0000
+++ breezy/repository.py	2022-11-15 21:31:51 +0000
@@ -1259,7 +1259,7 @@
         return controldir.format_registry.make_controldir('default').repository_format
 
 
-network_format_registry = registry.FormatRegistry()
+network_format_registry = registry.FormatRegistry["RepositoryFormat"]()
 """Registry of formats indexed by their network name.
 
 The network name for a repository format is an identifier that can be used when

=== modified file 'breezy/revision.py'
--- breezy/revision.py	2022-09-24 20:50:15 +0000
+++ breezy/revision.py	2022-11-15 21:31:51 +0000
@@ -223,15 +223,6 @@
         raise errors.ReservedId(revision_id)
 
 
-def ensure_null(revision_id: RevisionID) -> RevisionID:
-    """Ensure only NULL_REVISION is used to represent the null revision"""
-    if revision_id is None:
-        raise ValueError(
-            'NULL_REVISION should be used for the null'
-            ' revision instead of None.')
-    return revision_id
-
-
 def is_null(revision_id: RevisionID) -> bool:
     if revision_id is None:
         raise ValueError('NULL_REVISION should be used for the null'

=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2022-11-13 20:26:24 +0000
+++ breezy/revisionspec.py	2022-11-15 21:31:51 +0000
@@ -784,14 +784,14 @@
         from .branch import Branch
 
         with branch.lock_read():
-            revision_a = revision.ensure_null(branch.last_revision())
+            revision_a = branch.last_revision()
             if revision_a == revision.NULL_REVISION:
                 raise errors.NoCommits(branch)
             if other_location == '':
                 other_location = branch.get_parent()
             other_branch = Branch.open(other_location)
             with other_branch.lock_read():
-                revision_b = revision.ensure_null(other_branch.last_revision())
+                revision_b = other_branch.last_revision()
                 if revision_b == revision.NULL_REVISION:
                     raise errors.NoCommits(other_branch)
                 graph = branch.repository.get_graph(other_branch.repository)
@@ -835,7 +835,6 @@
         from .branch import Branch
         other_branch = Branch.open(self.spec)
         last_revision = other_branch.last_revision()
-        last_revision = revision.ensure_null(last_revision)
         context_branch.fetch(other_branch, last_revision)
         if last_revision == revision.NULL_REVISION:
             raise errors.NoCommits(other_branch)
@@ -845,7 +844,6 @@
         from .branch import Branch
         other_branch = Branch.open(self.spec)
         last_revision = other_branch.last_revision()
-        last_revision = revision.ensure_null(last_revision)
         if last_revision == revision.NULL_REVISION:
             raise errors.NoCommits(other_branch)
         return other_branch.repository.revision_tree(last_revision)

=== modified file 'breezy/switch.py'
--- breezy/switch.py	2020-06-23 01:02:30 +0000
+++ breezy/switch.py	2022-11-15 21:31:51 +0000
@@ -169,7 +169,7 @@
 
 def _any_local_commits(this_branch, possible_transports):
     """Does this branch have any commits not in the master branch?"""
-    last_rev = revision.ensure_null(this_branch.last_revision())
+    last_rev = this_branch.last_revision()
     if last_rev != revision.NULL_REVISION:
         other_branch = this_branch.get_master_branch(possible_transports)
         with this_branch.lock_read(), other_branch.lock_read():

=== modified file 'breezy/tests/blackbox/test_serve.py'
--- breezy/tests/blackbox/test_serve.py	2022-09-24 20:50:15 +0000
+++ breezy/tests/blackbox/test_serve.py	2022-11-15 21:31:51 +0000
@@ -157,7 +157,7 @@
         with branch.lock_read():
             branch.repository.all_revision_ids()
             self.assertEqual(_mod_revision.NULL_REVISION,
-                             _mod_revision.ensure_null(branch.last_revision()))
+                             branch.last_revision())
 
     def start_server_inet(self, extra_options=()):
         """Start a brz server subprocess using the --inet option.

=== modified file 'breezy/tests/per_branch/test_update.py'
--- breezy/tests/per_branch/test_update.py	2021-12-25 14:55:24 +0000
+++ breezy/tests/per_branch/test_update.py	2022-11-15 21:31:51 +0000
@@ -32,8 +32,7 @@
     def test_update_unbound_works(self):
         b = self.make_branch('.')
         b.update()
-        self.assertEqual(_mod_revision.NULL_REVISION,
-                         _mod_revision.ensure_null(b.last_revision()))
+        self.assertEqual(_mod_revision.NULL_REVISION, b.last_revision())
 
     def test_update_prefix_returns_none(self):
         # update in a branch when its a prefix of the master should

=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2022-07-02 13:44:01 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2022-11-15 21:31:51 +0000
@@ -263,8 +263,7 @@
             return
         committed_id = tree.commit('foo', local=True)
         self.assertFalse(master.repository.has_revision(committed_id))
-        self.assertEqual(_mod_revision.NULL_REVISION,
-                         (_mod_revision.ensure_null(master.last_revision())))
+        self.assertEqual(_mod_revision.NULL_REVISION, master.last_revision())
 
     def test_record_initial_ghost(self):
         """The working tree needs to record ghosts during commit."""

=== modified file 'breezy/tests/per_workingtree/test_parents.py'
--- breezy/tests/per_workingtree/test_parents.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/per_workingtree/test_parents.py	2022-11-15 21:31:51 +0000
@@ -51,8 +51,7 @@
         """
         self.assertEqual(expected, tree.get_parent_ids())
         if expected == []:
-            self.assertEqual(_mod_revision.NULL_REVISION,
-                             _mod_revision.ensure_null(tree.last_revision()))
+            self.assertEqual(_mod_revision.NULL_REVISION, tree.last_revision())
         else:
             self.assertEqual(expected[0], tree.last_revision())
 

=== modified file 'breezy/transactions.py'
--- breezy/transactions.py	2020-02-18 01:57:45 +0000
+++ breezy/transactions.py	2022-11-15 21:31:51 +0000
@@ -98,8 +98,12 @@
             # the map backwards
             # _clean_objects
             # _clean_queue
-            # 1 missing ?
-            if (sys.getrefcount(self._clean_queue[offset]) <= 7
+            if sys.version_info >= (3, 11):
+                ref_threshold = 6
+            else:
+                # 1 missing on Python < 3.11
+                ref_threshold = 7
+            if (sys.getrefcount(self._clean_queue[offset]) <= ref_threshold
                     and not self._clean_queue[offset] in self._precious_objects):
                 removed = self._clean_queue[offset]
                 self._clean_objects.remove(removed)

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-10-30 14:30:21 +0000
+++ breezy/workingtree.py	2022-11-15 21:31:51 +0000
@@ -403,7 +403,7 @@
         This implementation reads the pending merges list and last_revision
         value and uses that to decide what the parents list should be.
         """
-        last_rev = _mod_revision.ensure_null(self._last_revision())
+        last_rev = self._last_revision()
         if _mod_revision.NULL_REVISION == last_rev:
             parents = []
         else:
@@ -646,7 +646,7 @@
             if not force and self.has_changes():
                 raise errors.UncommittedChanges(self)
             if to_revision is None:
-                to_revision = _mod_revision.ensure_null(branch.last_revision())
+                to_revision = branch.last_revision()
             merger.other_rev_id = to_revision
             if _mod_revision.is_null(merger.other_rev_id):
                 raise errors.NoCommits(branch)
@@ -928,7 +928,7 @@
     def _last_revision(self):
         """helper for get_parent_ids."""
         with self.lock_read():
-            return _mod_revision.ensure_null(self.branch.last_revision())
+            return self.branch.last_revision()
 
     def is_locked(self):
         """Check if this tree is locked."""

=== modified file 'setup.cfg'
--- setup.cfg	2022-10-30 01:37:08 +0000
+++ setup.cfg	2022-11-15 21:31:51 +0000
@@ -119,6 +119,7 @@
     tests/ssl_certs/server_without_pass.key
     tests/ssl_certs/server_with_pass.key
     tests/ssl_certs/server.crt
+    py.typed
 
 [mypy]
 ignore_missing_imports = True