Merge lp:~jelmer/brz/python3-more into lp:brz

[Jelmer Vernooij]

Some random Python3 fixes.

In particular:
 * Make format strings bytestrings
 * Allow a $PYTHON variable to be set when calling testr

This adds another ~400 tests to the "known passing" list.

[Martin Packman (gz)]

The main tricky bit that jumps out at me with these changes is I was trying to avoid putting bytes into the format registry. The issue then is there's not a clear point to then start treating the magic strings as bytes when detecting formats.

[Jelmer Vernooij (jelmer)]

> The main tricky bit that jumps out at me with these changes is I was trying to
> avoid putting bytes into the format registry. The issue then is there's not a
> clear point to then start treating the magic strings as bytes when detecting
> formats.
I think format strings should always be bytes - the user never interacts with them.

We currently have two kinds of format registries:

* Those with bzrdir-style format strings (e.g. "Bazaar-NG 1.9 (rich root)\n"
* Those for use by the user in e.g. UIs ("git", "2a")

They should be less interwoven; for the first it makes sense for strings to be bytes, for the second it should definitely be unicode.

[Martin Packman (gz)]

Okay, am not sure we should lets the bytesyness of file headers propagate so far out, but can re-rearrange later, and most of the changes here are sane regardless.

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/79/

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2018-03-24 03:35:53 +0000
+++ breezy/branch.py	2018-03-24 18:03:06 +0000
@@ -1885,22 +1885,22 @@
 # formats which have no format string are not discoverable
 # and not independently creatable, so are not registered.
 format_registry.register_lazy(
-    "Bazaar-NG branch format 5\n", "breezy.bzr.fullhistory",
+    b"Bazaar-NG branch format 5\n", "breezy.bzr.fullhistory",
     "BzrBranchFormat5")
 format_registry.register_lazy(
-    "Bazaar Branch Format 6 (bzr 0.15)\n",
+    b"Bazaar Branch Format 6 (bzr 0.15)\n",
     "breezy.bzr.branch", "BzrBranchFormat6")
 format_registry.register_lazy(
-    "Bazaar Branch Format 7 (needs bzr 1.6)\n",
+    b"Bazaar Branch Format 7 (needs bzr 1.6)\n",
     "breezy.bzr.branch", "BzrBranchFormat7")
 format_registry.register_lazy(
-    "Bazaar Branch Format 8 (needs bzr 1.15)\n",
+    b"Bazaar Branch Format 8 (needs bzr 1.15)\n",
     "breezy.bzr.branch", "BzrBranchFormat8")
 format_registry.register_lazy(
-    "Bazaar-NG Branch Reference Format 1\n",
+    b"Bazaar-NG Branch Reference Format 1\n",
     "breezy.bzr.branch", "BranchReferenceFormat")
 
-format_registry.set_default_key("Bazaar Branch Format 7 (needs bzr 1.6)\n")
+format_registry.set_default_key(b"Bazaar Branch Format 7 (needs bzr 1.6)\n")
 
 
 class BranchWriteLockResult(LogicalLockResult):
 
=== modified file 'breezy/bzr/__init__.py'
--- breezy/bzr/__init__.py	2017-06-14 22:34:05 +0000
+++ breezy/bzr/__init__.py	2018-03-24 18:03:06 +0000
@@ -35,19 +35,17 @@
         """Return the .bzrdir style format present in a directory."""
         try:
             format_string = transport.get_bytes(".bzr/branch-format")
-            # GZ 2017-06-09: Where should format strings get decoded...
-            format_text = format_string.decode("ascii")
         except errors.NoSuchFile:
             raise errors.NotBranchError(path=transport.base)
         try:
-            first_line = format_text[:format_text.index("\n")+1]
+            first_line = format_string[:format_string.index(b"\n")+1]
         except ValueError:
-            first_line = format_text
+            first_line = format_string
         try:
             cls = klass.formats.get(first_line)
         except KeyError:
             raise errors.UnknownFormatError(format=first_line, kind='bzrdir')
-        return cls.from_string(format_text)
+        return cls.from_string(format_string)
 
     @classmethod
     def known_formats(cls):
@@ -100,10 +98,10 @@
 
 # Register bzr formats
 BzrProber.formats.register_lazy(
-    "Bazaar-NG meta directory, format 1\n",
+    b"Bazaar-NG meta directory, format 1\n",
     __name__ + '.bzrdir', 'BzrDirMetaFormat1')
 BzrProber.formats.register_lazy(
-    "Bazaar meta directory, format 1 (with colocated branches)\n",
+    b"Bazaar meta directory, format 1 (with colocated branches)\n",
     __name__ + '.bzrdir', 'BzrDirMetaFormat1Colo')
 
 
 
=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2018-03-05 21:59:31 +0000
+++ breezy/bzr/branch.py	2018-03-24 18:03:06 +0000
@@ -707,12 +707,10 @@
             raise errors.NotBranchError(path=name, controldir=controldir)
         try:
             format_string = transport.get_bytes("format")
-            # GZ 2017-06-09: Where should format strings get decoded...
-            format_text = format_string.decode("ascii")
         except errors.NoSuchFile:
             raise errors.NotBranchError(
                 path=transport.base, controldir=controldir)
-        return klass._find_format(format_registry, 'branch', format_text)
+        return klass._find_format(format_registry, 'branch', format_string)
 
     def _branch_class(self):
         """What class to instantiate on open calls."""
@@ -821,7 +819,7 @@
     @classmethod
     def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar Branch Format 6 (bzr 0.15)\n"
+        return b"Bazaar Branch Format 6 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
@@ -830,10 +828,10 @@
     def initialize(self, a_controldir, name=None, repository=None,
                    append_revisions_only=None):
         """Create a branch of this format in a_controldir."""
-        utf8_files = [('last-revision', '0 null:\n'),
+        utf8_files = [('last-revision', b'0 null:\n'),
                       ('branch.conf',
                           self._get_initial_config(append_revisions_only)),
-                      ('tags', ''),
+                      ('tags', b''),
                       ]
         return self._initialize_helper(a_controldir, utf8_files, name, repository)
 
@@ -854,7 +852,7 @@
     @classmethod
     def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
+        return b"Bazaar Branch Format 8 (needs bzr 1.15)\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
@@ -863,11 +861,11 @@
     def initialize(self, a_controldir, name=None, repository=None,
                    append_revisions_only=None):
         """Create a branch of this format in a_controldir."""
-        utf8_files = [('last-revision', '0 null:\n'),
+        utf8_files = [('last-revision', b'0 null:\n'),
                       ('branch.conf',
                           self._get_initial_config(append_revisions_only)),
-                      ('tags', ''),
-                      ('references', '')
+                      ('tags', b''),
+                      ('references', b'')
                       ]
         return self._initialize_helper(a_controldir, utf8_files, name, repository)
 
@@ -909,7 +907,7 @@
     @classmethod
     def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
+        return b"Bazaar Branch Format 7 (needs bzr 1.6)\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
@@ -942,7 +940,7 @@
     @classmethod
     def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar-NG Branch Reference Format 1\n"
+        return b"Bazaar-NG Branch Reference Format 1\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-02-24 15:50:23 +0000
+++ breezy/bzr/bzrdir.py	2018-03-24 18:03:06 +0000
@@ -1144,7 +1144,7 @@
 
         :param name: Name of the feature
         """
-        if " " in name:
+        if b" " in name:
             raise ValueError("spaces are not allowed in feature names")
         if name in cls._present_features:
             raise FeatureAlreadyRegistered(name)
@@ -1160,10 +1160,10 @@
         for name, necessity in self.features.items():
             if name in self._present_features:
                 continue
-            if necessity == "optional":
+            if necessity == b"optional":
                 mutter("ignoring optional missing feature %s", name)
                 continue
-            elif necessity == "required":
+            elif necessity == b"required":
                 raise MissingFeature(name)
             else:
                 mutter("treating unknown necessity as require for %s",
@@ -1184,7 +1184,7 @@
         ret = cls()
         for lineno, line in enumerate(lines):
             try:
-                (necessity, feature) = line.split(" ", 1)
+                (necessity, feature) = line.split(b" ", 1)
             except ValueError:
                 raise errors.ParseFormatError(format=cls, lineno=lineno+2,
                     line=line, text=text)
@@ -1195,15 +1195,14 @@
         """Return the string representation of this format.
         """
         lines = [self.get_format_string()]
-        lines.extend([("%s %s\n" % (item[1], item[0])) for item in
-            self.features.items()])
-        # GZ 2016-07-09: Should push byte-ness up a level perhaps?
-        return "".join(lines).encode('ascii')
+        lines.extend([(item[1] + b" " + item[0] + b"\n")
+                      for item in self.features.items()])
+        return b"".join(lines)
 
     @classmethod
     def _find_format(klass, registry, kind, format_string):
         try:
-            first_line = format_string[:format_string.index("\n")+1]
+            first_line = format_string[:format_string.index(b"\n")+1]
         except ValueError:
             first_line = format_string
         try:
@@ -1622,7 +1621,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
-        return "Bazaar-NG meta directory, format 1\n"
+        return b"Bazaar-NG meta directory, format 1\n"
 
     def get_format_description(self):
         """See BzrDirFormat.get_format_description()."""
@@ -1696,7 +1695,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
-        return "Bazaar meta directory, format 1 (with colocated branches)\n"
+        return b"Bazaar meta directory, format 1 (with colocated branches)\n"
 
     def get_format_description(self):
         """See BzrDirFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/chk_serializer.py'
--- breezy/bzr/chk_serializer.py	2017-06-10 18:34:12 +0000
+++ breezy/bzr/chk_serializer.py	2018-03-24 18:03:06 +0000
@@ -84,23 +84,23 @@
         # This lets us control the ordering, so that we are able to create
         # smaller deltas
         ret = [
-            ("format", 10),
-            ("committer", encode_utf8(rev.committer)[0]),
+            (b"format", 10),
+            (b"committer", encode_utf8(rev.committer)[0]),
         ]
         if rev.timezone is not None:
-            ret.append(("timezone", rev.timezone))
+            ret.append((b"timezone", rev.timezone))
         # For bzr revisions, the most common property is just 'branch-nick'
         # which changes infrequently.
         revprops = {}
         for key, value in rev.properties.items():
             revprops[key] = encode_utf8(value)[0]
-        ret.append(('properties', revprops))
+        ret.append((b'properties', revprops))
         ret.extend([
-            ("timestamp", "%.3f" % rev.timestamp),
-            ("revision-id", rev.revision_id),
-            ("parent-ids", rev.parent_ids),
-            ("inventory-sha1", rev.inventory_sha1),
-            ("message", encode_utf8(rev.message)[0]),
+            (b"timestamp", b"%.3f" % rev.timestamp),
+            (b"revision-id", rev.revision_id),
+            (b"parent-ids", rev.parent_ids),
+            (b"inventory-sha1", rev.inventory_sha1),
+            (b"message", encode_utf8(rev.message)[0]),
         ])
         return bencode.bencode(ret)
 
 
=== modified file 'breezy/bzr/fullhistory.py'
--- breezy/bzr/fullhistory.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/fullhistory.py	2018-03-24 18:03:06 +0000
@@ -86,12 +86,12 @@
         This performs the actual writing to disk.
         It is intended to be called by set_revision_history."""
         self._transport.put_bytes(
-            'revision-history', '\n'.join(history),
+            'revision-history', b'\n'.join(history),
             mode=self.controldir._get_file_mode())
 
     def _gen_revision_history(self):
-        history = self._transport.get_bytes('revision-history').split('\n')
-        if history[-1:] == ['']:
+        history = self._transport.get_bytes('revision-history').split(b'\n')
+        if history[-1:] == [b'']:
             # There shouldn't be a trailing newline, but just in case.
             history.pop()
         return history
@@ -154,7 +154,7 @@
     @classmethod
     def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar-NG branch format 5\n"
+        return b"Bazaar-NG branch format 5\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""
@@ -165,8 +165,8 @@
         """Create a branch of this format in a_controldir."""
         if append_revisions_only:
             raise errors.UpgradeRequired(a_controldir.user_url)
-        utf8_files = [('revision-history', ''),
-                      ('branch-name', ''),
+        utf8_files = [('revision-history', b''),
+                      ('branch-name', b''),
                       ]
         return self._initialize_helper(a_controldir, utf8_files, name, repository)
 
 
=== modified file 'breezy/bzr/groupcompress_repo.py'
--- breezy/bzr/groupcompress_repo.py	2018-02-24 15:50:23 +0000
+++ breezy/bzr/groupcompress_repo.py	2018-03-24 18:03:06 +0000
@@ -1384,7 +1384,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')
+        return b'Bazaar repository format 2a (needs bzr 1.16 or later)\n'
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -1407,7 +1407,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return ('Bazaar development format 8\n')
+        return b'Bazaar development format 8\n'
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2018-03-24 00:56:34 +0000
+++ breezy/bzr/inventory.py	2018-03-24 18:03:06 +0000
@@ -903,7 +903,7 @@
         entries = self.iter_entries()
         if self.root is None:
             return Inventory(root_id=None)
-        other = Inventory(entries.next()[1].file_id)
+        other = Inventory(next(entries)[1].file_id)
         other.root.revision = self.root.revision
         other.revision_id = self.revision_id
         directories_to_expand = set()
@@ -1105,7 +1105,7 @@
         entries = self.iter_entries()
         if self.root is None:
             return Inventory(root_id=None)
-        other = Inventory(entries.next()[1].file_id)
+        other = Inventory(next(entries)[1].file_id)
         other.root.revision = self.root.revision
         # copy recursively so we know directories will be added before
         # their children.  There are more efficient ways than this...
 
=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2017-12-04 23:25:45 +0000
+++ breezy/bzr/knit.py	2018-03-24 18:03:06 +0000
@@ -990,7 +990,7 @@
             # indexes can't directly store that, so we give them
             # an empty tuple instead.
             parents = ()
-        line_bytes = ''.join(lines)
+        line_bytes = b''.join(lines)
         return self._add(key, lines, parents,
             parent_texts, left_matching_blocks, nostore_sha, random_id,
             line_bytes=line_bytes)
@@ -2053,7 +2053,7 @@
                     'data must be plain bytes was %s' % type(chunk))
         if lines and lines[-1][-1] != '\n':
             raise ValueError('corrupt lines value %r' % lines)
-        compressed_bytes = tuned_gzip.chunks_to_gzip(chunks)
+        compressed_bytes = b''.join(tuned_gzip.chunks_to_gzip(chunks))
         return len(compressed_bytes), compressed_bytes
 
     def _split_header(self, line):
 
=== modified file 'breezy/bzr/knitpack_repo.py'
--- breezy/bzr/knitpack_repo.py	2018-02-24 15:50:23 +0000
+++ breezy/bzr/knitpack_repo.py	2018-03-24 18:03:06 +0000
@@ -170,7 +170,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
+        return b"Bazaar pack repository format 1 (needs bzr 0.92)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -211,7 +211,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
+        return b"Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -250,8 +250,8 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return ("Bazaar pack repository format 1 with rich root"
-                " (needs bzr 1.0)\n")
+        return (b"Bazaar pack repository format 1 with rich root"
+                b" (needs bzr 1.0)\n")
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -289,7 +289,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
+        return b"Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -330,7 +330,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
+        return b"Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
 
     def get_format_description(self):
         return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
@@ -377,7 +377,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
+        return b"Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
 
     def get_format_description(self):
         return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
@@ -416,7 +416,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
+        return b"Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -454,7 +454,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
+        return b"Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
 
     def get_format_description(self):
         return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
@@ -495,8 +495,8 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return ("Bazaar development format 2 with subtree support "
-            "(needs bzr.dev from before 1.8)\n")
+        return (b"Bazaar development format 2 with subtree support "
+                b"(needs bzr.dev from before 1.8)\n")
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/knitrepo.py'
--- breezy/bzr/knitrepo.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/knitrepo.py	2018-03-24 18:03:06 +0000
@@ -374,7 +374,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar-NG Knit Repository Format 1"
+        return b"Bazaar-NG Knit Repository Format 1"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -417,7 +417,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
+        return b"Bazaar Knit Repository Format 3 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -459,7 +459,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
+        return b'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/pack_repo.py'
--- breezy/bzr/pack_repo.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/pack_repo.py	2018-03-24 18:03:06 +0000
@@ -1914,8 +1914,7 @@
         dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
         builder = self.index_builder_class()
         files = [('pack-names', builder.finish())]
-        # GZ 2017-06-09: Where should format strings get decoded...
-        utf8_files = [('format', self.get_format_string().encode('ascii'))]
+        utf8_files = [('format', self.get_format_string())]
 
         self._upload_blank_content(a_controldir, dirs, files, utf8_files, shared)
         repository = self.open(a_controldir=a_controldir, _found=True)
 
=== modified file 'breezy/bzr/repository.py'
--- breezy/bzr/repository.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/repository.py	2018-03-24 18:03:06 +0000
@@ -158,11 +158,9 @@
         try:
             transport = a_bzrdir.get_repository_transport(None)
             format_string = transport.get_bytes("format")
-            # GZ 2017-06-17: Where should format strings get decoded...
-            format_text = format_string.decode("ascii")
         except errors.NoSuchFile:
             raise errors.NoRepositoryPresent(a_bzrdir)
-        return klass._find_format(format_registry, 'repository', format_text)
+        return klass._find_format(format_registry, 'repository', format_string)
 
     def check_support_status(self, allow_unsupported, recommend_upgrade=True,
             basedir=None):
 
=== modified file 'breezy/bzr/weavefile.py'
--- breezy/bzr/weavefile.py	2017-06-08 23:30:31 +0000
+++ breezy/bzr/weavefile.py	2018-03-24 18:03:06 +0000
@@ -40,7 +40,7 @@
 # an iterator returning the weave lines...  We don't really need to
 # deserialize it into memory.
 
-FORMAT_1 = '# bzr weave file v5\n'
+FORMAT_1 = b'# bzr weave file v5\n'
 
 
 def write_weave(weave, f, format=None):
@@ -58,32 +58,32 @@
         if included:
             # mininc = weave.minimal_parents(version)
             mininc = included
-            f.write('i ')
-            f.write(' '.join(str(i) for i in mininc))
-            f.write('\n')
+            f.write(b'i ')
+            f.write(b' '.join(str(i).encode('ascii') for i in mininc))
+            f.write(b'\n')
         else:
-            f.write('i\n')
-        f.write('1 ' + weave._sha1s[version] + '\n')
-        f.write('n ' + weave._names[version] + '\n')
+            f.write(b'i\n')
+        f.write(b'1 ' + weave._sha1s[version] + b'\n')
+        f.write(b'n ' + weave._names[version] + b'\n')
         f.write('\n')
 
-    f.write('w\n')
+    f.write(b'w\n')
 
     for l in weave._weave:
         if isinstance(l, tuple):
             if l[0] == '}':
-                f.write('}\n')
+                f.write(b'}\n')
             else:
-                f.write('%s %d\n' % l)
+                f.write(b'%s %d\n' % l)
         else: # text line
             if not l:
-                f.write(', \n')
+                f.write(b', \n')
             elif l[-1] == '\n':
-                f.write('. ' + l)
+                f.write(b'. ' + l)
             else:
-                f.write(', ' + l + '\n')
+                f.write(b', ' + l + b'\n')
 
-    f.write('W\n')
+    f.write(b'W\n')
 
 
 
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-03-24 13:36:42 +0000
+++ breezy/bzr/workingtree.py	2018-03-24 18:03:06 +0000
@@ -1723,8 +1723,7 @@
         """Return format name for the working tree object in controldir."""
         try:
             transport = controldir.get_workingtree_transport(None)
-            # GZ 2017-06-09: When do decode format strings?
-            return transport.get_bytes("format").decode('ascii')
+            return transport.get_bytes("format")
         except errors.NoSuchFile:
             raise errors.NoWorkingTree(base=transport.base)
 
 
=== modified file 'breezy/bzr/workingtree_3.py'
--- breezy/bzr/workingtree_3.py	2017-11-13 18:40:41 +0000
+++ breezy/bzr/workingtree_3.py	2018-03-24 18:03:06 +0000
@@ -161,7 +161,7 @@
     @classmethod
     def get_format_string(cls):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Bazaar-NG Working Tree format 3"
+        return b"Bazaar-NG Working Tree format 3"
 
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2018-03-24 10:24:48 +0000
+++ breezy/bzr/workingtree_4.py	2018-03-24 18:03:06 +0000
@@ -1627,7 +1627,7 @@
     @classmethod
     def get_format_string(cls):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
+        return b"Bazaar Working Tree Format 4 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""
@@ -1645,7 +1645,7 @@
     @classmethod
     def get_format_string(cls):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
+        return b"Bazaar Working Tree Format 5 (bzr 1.11)\n"
 
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""
@@ -1666,7 +1666,7 @@
     @classmethod
     def get_format_string(cls):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
+        return b"Bazaar Working Tree Format 6 (bzr 1.14)\n"
 
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""
 
=== modified file 'breezy/plugins/weave_fmt/branch.py'
--- breezy/plugins/weave_fmt/branch.py	2017-08-29 13:46:58 +0000
+++ breezy/plugins/weave_fmt/branch.py	2018-03-24 18:03:06 +0000
@@ -148,8 +148,8 @@
         if not [isinstance(a_controldir._format, format) for format in
                 self._compatible_bzrdirs]:
             raise errors.IncompatibleFormat(self, a_controldir._format)
-        utf8_files = [('revision-history', ''),
-                      ('branch-name', ''),
+        utf8_files = [('revision-history', b''),
+                      ('branch-name', b''),
                       ]
         mutter('creating branch %r in %s', self, a_controldir.user_url)
         branch_transport = a_controldir.get_branch_transport(self, name=name)
 
=== modified file 'breezy/plugins/weave_fmt/bzrdir.py'
--- breezy/plugins/weave_fmt/bzrdir.py	2018-03-01 01:45:44 +0000
+++ breezy/plugins/weave_fmt/bzrdir.py	2018-03-24 18:03:06 +0000
@@ -116,7 +116,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
-        return "Bazaar-NG branch, format 5\n"
+        return b"Bazaar-NG branch, format 5\n"
 
     def get_branch_format(self):
         from .branch import BzrBranchFormat4
@@ -180,7 +180,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
-        return "Bazaar-NG branch, format 6\n"
+        return b"Bazaar-NG branch, format 6\n"
 
     def get_format_description(self):
         """See ControlDirFormat.get_format_description()."""
@@ -683,7 +683,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
-        return "Bazaar-NG branch, format 0.0.4\n"
+        return b"Bazaar-NG branch, format 0.0.4\n"
 
     def get_format_description(self):
         """See ControlDirFormat.get_format_description()."""
 
=== modified file 'breezy/plugins/weave_fmt/repository.py'
--- breezy/plugins/weave_fmt/repository.py	2018-02-24 15:50:23 +0000
+++ breezy/plugins/weave_fmt/repository.py	2018-03-24 18:03:06 +0000
@@ -510,7 +510,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar-NG Repository format 7"
+        return b"Bazaar-NG Repository format 7"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
 
=== modified file 'breezy/repository.py'
--- breezy/repository.py	2018-03-11 23:35:42 +0000
+++ breezy/repository.py	2018-03-24 18:03:06 +0000
@@ -1392,19 +1392,19 @@
 # the repository is not separately opened are similar.
 
 format_registry.register_lazy(
-    'Bazaar-NG Knit Repository Format 1',
+    b'Bazaar-NG Knit Repository Format 1',
     'breezy.bzr.knitrepo',
     'RepositoryFormatKnit1',
     )
 
 format_registry.register_lazy(
-    'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
+    b'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
     'breezy.bzr.knitrepo',
     'RepositoryFormatKnit3',
     )
 
 format_registry.register_lazy(
-    'Bazaar Knit Repository Format 4 (bzr 1.0)\n',
+    b'Bazaar Knit Repository Format 4 (bzr 1.0)\n',
     'breezy.bzr.knitrepo',
     'RepositoryFormatKnit4',
     )
@@ -1413,47 +1413,47 @@
 # post-subtrees to allow ease of testing.
 # NOTE: These are experimental in 0.92. Stable in 1.0 and above
 format_registry.register_lazy(
-    'Bazaar pack repository format 1 (needs bzr 0.92)\n',
+    b'Bazaar pack repository format 1 (needs bzr 0.92)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack1',
     )
 format_registry.register_lazy(
-    'Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n',
+    b'Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack3',
     )
 format_registry.register_lazy(
-    'Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n',
+    b'Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack4',
     )
 format_registry.register_lazy(
-    'Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n',
+    b'Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack5',
     )
 format_registry.register_lazy(
-    'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n',
+    b'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack5RichRoot',
     )
 format_registry.register_lazy(
-    'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n',
+    b'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack5RichRootBroken',
     )
 format_registry.register_lazy(
-    'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n',
+    b'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack6',
     )
 format_registry.register_lazy(
-    'Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n',
+    b'Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n',
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatKnitPack6RichRoot',
     )
 format_registry.register_lazy(
-    'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
+    b'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
     'breezy.bzr.groupcompress_repo',
     'RepositoryFormat2a',
     )
@@ -1461,13 +1461,13 @@
 # Development formats.
 # Check their docstrings to see if/when they are obsolete.
 format_registry.register_lazy(
-    ("Bazaar development format 2 with subtree support "
-        "(needs bzr.dev from before 1.8)\n"),
+    (b"Bazaar development format 2 with subtree support "
+        b"(needs bzr.dev from before 1.8)\n"),
     'breezy.bzr.knitpack_repo',
     'RepositoryFormatPackDevelopment2Subtree',
     )
 format_registry.register_lazy(
-    'Bazaar development format 8\n',
+    b'Bazaar development format 8\n',
     'breezy.bzr.groupcompress_repo',
     'RepositoryFormat2aSubtree',
     )
 
=== modified file 'breezy/tests/blackbox/test_exceptions.py'
--- breezy/tests/blackbox/test_exceptions.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_exceptions.py	2018-03-24 18:03:06 +0000
@@ -81,7 +81,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "Test Obsolete Repository Format"
+        return b"Test Obsolete Repository Format"
 
     def is_deprecated(self):
         return True
 
=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py	2017-06-19 20:34:29 +0000
+++ breezy/tests/blackbox/test_upgrade.py	2018-03-24 18:03:06 +0000
@@ -64,7 +64,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "Ancient Test Format"
+        return b"Ancient Test Format"
 
     def _open(self, transport):
         return OldBzrDir(transport, self)
 
=== modified file 'breezy/tests/per_bzrdir/test_bzrdir.py'
--- breezy/tests/per_bzrdir/test_bzrdir.py	2017-08-26 13:58:53 +0000
+++ breezy/tests/per_bzrdir/test_bzrdir.py	2018-03-24 18:03:06 +0000
@@ -53,7 +53,7 @@
     """An identifable branch format (has a format string)"""
 
     def get_format_string(self):
-        return "I have an identity"
+        return b"I have an identity"
 
 
 class AnonymousTestRepositoryFormat(repository.RepositoryFormat):
@@ -67,7 +67,7 @@
     """An identifable branch format (has a format string)"""
 
     def get_format_string(self):
-        return "I have an identity"
+        return b"I have an identity"
 
 
 class AnonymousTestWorkingTreeFormat(workingtree.WorkingTreeFormat):
@@ -81,7 +81,7 @@
     """An identifable branch format (has a format string)"""
 
     def get_format_string(self):
-        return "I have an identity"
+        return b"I have an identity"
 
 
 class TestBzrDir(TestCaseWithBzrDir):
 
=== modified file 'breezy/tests/per_inventory/basics.py'
--- breezy/tests/per_inventory/basics.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/per_inventory/basics.py	2018-03-24 18:03:06 +0000
@@ -72,8 +72,8 @@
                      ('Makefile', 'file', 'makefile-id')]:
             ie = inv.add_path(*args)
             if args[1] == 'file':
-                ie.text_sha1 = osutils.sha_string('content\n')
-                ie.text_size = len('content\n')
+                ie.text_sha1 = osutils.sha_string(b'content\n')
+                ie.text_size = len(b'content\n')
         return self.inv_to_test_inv(inv)
 
 
 
=== modified file 'breezy/tests/per_transport.py'
--- breezy/tests/per_transport.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/per_transport.py	2018-03-24 18:03:06 +0000
@@ -292,19 +292,19 @@
 
         if t.is_readonly():
             self.assertRaises(TransportNotPossible,
-                    t.put_bytes, 'a', 'some text for a\n')
+                    t.put_bytes, 'a', b'some text for a\n')
             return
 
-        t.put_bytes('a', 'some text for a\n')
+        t.put_bytes('a', b'some text for a\n')
         self.assertTrue(t.has('a'))
         self.check_transport_contents('some text for a\n', t, 'a')
 
         # The contents should be overwritten
-        t.put_bytes('a', 'new text for a\n')
+        t.put_bytes('a', b'new text for a\n')
         self.check_transport_contents('new text for a\n', t, 'a')
 
         self.assertRaises(NoSuchFile,
-                          t.put_bytes, 'path/doesnt/exist/c', 'contents')
+                          t.put_bytes, 'path/doesnt/exist/c', b'contents')
 
     def test_put_bytes_non_atomic(self):
         t = self.get_transport()
@@ -352,19 +352,19 @@
         if not t._can_roundtrip_unix_modebits():
             # Can't roundtrip, so no need to run this test
             return
-        t.put_bytes('mode644', 'test text\n', mode=0o644)
+        t.put_bytes('mode644', b'test text\n', mode=0o644)
         self.assertTransportMode(t, 'mode644', 0o644)
-        t.put_bytes('mode666', 'test text\n', mode=0o666)
+        t.put_bytes('mode666', b'test text\n', mode=0o666)
         self.assertTransportMode(t, 'mode666', 0o666)
-        t.put_bytes('mode600', 'test text\n', mode=0o600)
+        t.put_bytes('mode600', b'test text\n', mode=0o600)
         self.assertTransportMode(t, 'mode600', 0o600)
         # Yes, you can put_bytes a file such that it becomes readonly
-        t.put_bytes('mode400', 'test text\n', mode=0o400)
+        t.put_bytes('mode400', b'test text\n', mode=0o400)
         self.assertTransportMode(t, 'mode400', 0o400)
 
         # The default permissions should be based on the current umask
         umask = osutils.get_umask()
-        t.put_bytes('nomode', 'test text\n', mode=None)
+        t.put_bytes('nomode', b'test text\n', mode=None)
         self.assertTransportMode(t, 'nomode', 0o666 & ~umask)
 
     def test_put_bytes_non_atomic_permissions(self):
@@ -564,7 +564,7 @@
         self.assertRaises(FileExists, t.mkdir, 'dir_g')
 
         # Test get/put in sub-directories
-        t.put_bytes('dir_a/a', 'contents of dir_a/a')
+        t.put_bytes('dir_a/a', b'contents of dir_a/a')
         t.put_file('dir_b/b', BytesIO(b'contents of dir_b/b'))
         self.check_transport_contents('contents of dir_a/a', t, 'dir_a/a')
         self.check_transport_contents('contents of dir_b/b', t, 'dir_b/b')
@@ -657,7 +657,7 @@
             self.build_tree(['e/', 'e/f'])
         else:
             t.mkdir('e')
-            t.put_bytes('e/f', 'contents of e')
+            t.put_bytes('e/f', b'contents of e')
         self.assertRaises(NoSuchFile, t.copy_to, ['e/f'], temp_transport)
         temp_transport.mkdir('e')
         t.copy_to(['e/f'], temp_transport)
@@ -695,8 +695,8 @@
             self.assertRaises(TransportNotPossible,
                     t.append_file, 'a', 'add\nsome\nmore\ncontents\n')
             return
-        t.put_bytes('a', 'diff\ncontents for\na\n')
-        t.put_bytes('b', 'contents\nfor b\n')
+        t.put_bytes('a', b'diff\ncontents for\na\n')
+        t.put_bytes('b', b'contents\nfor b\n')
 
         self.assertEqual(20,
             t.append_file('a', BytesIO(b'add\nsome\nmore\ncontents\n')))
@@ -742,9 +742,9 @@
 
         if t.is_readonly():
             return
-        t.put_bytes('a', 'diff\ncontents for\na\n'
-                         'add\nsome\nmore\ncontents\n')
-        t.put_bytes('b', 'contents\nfor b\n')
+        t.put_bytes('a', b'diff\ncontents for\na\n'
+                         b'add\nsome\nmore\ncontents\n')
+        t.put_bytes('b', b'contents\nfor b\n')
 
         self.assertEqual((43, 15),
             t.append_multi([('a', BytesIO(b'and\nthen\nsome\nmore\n')),
@@ -816,16 +816,16 @@
             self.assertRaises(TransportNotPossible, t.delete, 'missing')
             return
 
-        t.put_bytes('a', 'a little bit of text\n')
+        t.put_bytes('a', b'a little bit of text\n')
         self.assertTrue(t.has('a'))
         t.delete('a')
         self.assertFalse(t.has('a'))
 
         self.assertRaises(NoSuchFile, t.delete, 'a')
 
-        t.put_bytes('a', 'a text\n')
-        t.put_bytes('b', 'b text\n')
-        t.put_bytes('c', 'c text\n')
+        t.put_bytes('a', b'a text\n')
+        t.put_bytes('b', b'b text\n')
+        t.put_bytes('c', b'c text\n')
         self.assertEqual([True, True, True],
                 list(t.has_multi(['a', 'b', 'c'])))
         t.delete_multi(['a', 'c'])
@@ -841,8 +841,8 @@
         self.assertRaises(NoSuchFile,
                 t.delete_multi, iter(['a', 'b', 'c']))
 
-        t.put_bytes('a', 'another a text\n')
-        t.put_bytes('c', 'another c text\n')
+        t.put_bytes('a', b'another a text\n')
+        t.put_bytes('c', b'another c text\n')
         t.delete_multi(iter(['a', 'b', 'c']))
 
         # We should have deleted everything
@@ -896,7 +896,7 @@
         if t.is_readonly():
             return
         t.mkdir('foo')
-        t.put_bytes('foo-bar', '')
+        t.put_bytes('foo-bar', b'')
         t.mkdir('foo-baz')
         t.rmdir('foo')
         self.assertRaises((NoSuchFile, PathError), t.rmdir, 'foo')
@@ -941,7 +941,7 @@
         t.mkdir('b')
         ta = t.clone('a')
         tb = t.clone('b')
-        ta.put_bytes('f', 'aoeu')
+        ta.put_bytes('f', b'aoeu')
         ta.rename('f', '../b/f')
         self.assertTrue(tb.has('f'))
         self.assertFalse(ta.has('f'))
@@ -989,7 +989,7 @@
         # creates control files in the working directory
         # perhaps all of this could be done in a subdirectory
 
-        t.put_bytes('a', 'a first file\n')
+        t.put_bytes('a', b'a first file\n')
         self.assertEqual([True, False], list(t.has_multi(['a', 'b'])))
 
         t.move('a', 'b')
@@ -1000,7 +1000,7 @@
         self.assertEqual([False, True], list(t.has_multi(['a', 'b'])))
 
         # Overwrite a file
-        t.put_bytes('c', 'c this file\n')
+        t.put_bytes('c', b'c this file\n')
         t.move('c', 'b')
         self.assertFalse(t.has('c'))
         self.check_transport_contents('c this file\n', t, 'b')
@@ -1015,7 +1015,7 @@
         if t.is_readonly():
             return
 
-        t.put_bytes('a', 'a file\n')
+        t.put_bytes('a', b'a file\n')
         t.copy('a', 'b')
         self.check_transport_contents('a file\n', t, 'b')
 
@@ -1024,7 +1024,7 @@
         # What should the assert be if you try to copy a
         # file over a directory?
         #self.assertRaises(Something, t.copy, 'a', 'c')
-        t.put_bytes('d', 'text in d\n')
+        t.put_bytes('d', b'text in d\n')
         t.copy('d', 'b')
         self.check_transport_contents('text in d\n', t, 'b')
 
@@ -1312,7 +1312,7 @@
         if t1.is_readonly():
             self.build_tree_contents([('b/d', 'newfile\n')])
         else:
-            t2.put_bytes('d', 'newfile\n')
+            t2.put_bytes('d', b'newfile\n')
 
         self.assertTrue(t1.has('b/d'))
         self.assertTrue(t2.has('d'))
@@ -1566,7 +1566,7 @@
         transport = self.get_transport()
         if transport.is_readonly():
             return
-        transport.put_bytes('foo', 'bar')
+        transport.put_bytes('foo', b'bar')
         transport3 = self.get_transport()
         self.check_transport_contents('bar', transport3, 'foo')
 
@@ -1585,7 +1585,7 @@
         if transport.is_readonly():
             self.assertRaises(TransportNotPossible, transport.lock_write, 'foo')
             return
-        transport.put_bytes('lock', '')
+        transport.put_bytes('lock', b'')
         try:
             lock = transport.lock_write('lock')
         except TransportNotPossible:
@@ -1603,7 +1603,7 @@
         if transport.is_readonly():
             file('lock', 'w').close()
         else:
-            transport.put_bytes('lock', '')
+            transport.put_bytes('lock', b'')
         try:
             lock = transport.lock_read('lock')
         except TransportNotPossible:
@@ -1617,7 +1617,7 @@
         if transport.is_readonly():
             with file('a', 'w') as f: f.write('0123456789')
         else:
-            transport.put_bytes('a', '0123456789')
+            transport.put_bytes('a', b'0123456789')
 
         d = list(transport.readv('a', ((0, 1),)))
         self.assertEqual(d[0], (0, '0'))
@@ -1633,7 +1633,7 @@
         if transport.is_readonly():
             with file('a', 'w') as f: f.write('0123456789')
         else:
-            transport.put_bytes('a', '01234567890')
+            transport.put_bytes('a', b'01234567890')
 
         d = list(transport.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
         self.assertEqual(d[0], (1, '1'))
@@ -1711,7 +1711,7 @@
         if transport.is_readonly():
             with file('a', 'w') as f: f.write('a'*1024*1024)
         else:
-            transport.put_bytes('a', 'a'*1024*1024)
+            transport.put_bytes('a', b'a'*1024*1024)
         broken_vector = [(465219, 800), (225221, 800), (445548, 800),
             (225037, 800), (221357, 800), (437077, 800), (947670, 800),
             (465373, 800), (947422, 800)]
@@ -1751,7 +1751,7 @@
         if transport.is_readonly():
             with file('a', 'w') as f: f.write('0123456789')
         else:
-            transport.put_bytes('a', '01234567890')
+            transport.put_bytes('a', b'01234567890')
 
         # This is intentionally reading off the end of the file
         # since we are sure that it cannot get there
 
=== modified file 'breezy/tests/stub_sftp.py'
--- breezy/tests/stub_sftp.py	2017-06-05 22:09:44 +0000
+++ breezy/tests/stub_sftp.py	2018-03-24 18:03:06 +0000
@@ -489,8 +489,7 @@
             # Normalize the path or it will be wrongly escaped
             self._homedir = osutils.normpath(self._homedir)
         else:
-            # But unix SFTP servers should just deal in bytestreams
-            self._homedir = self._homedir.encode('utf-8')
+            self._homedir = self._homedir
         if self._server_homedir is None:
             self._server_homedir = self._homedir
         self._root = '/'
 
=== modified file 'breezy/tests/test_branch.py'
--- breezy/tests/test_branch.py	2017-08-05 01:03:53 +0000
+++ breezy/tests/test_branch.py	2018-03-24 18:03:06 +0000
@@ -132,7 +132,7 @@
     @classmethod
     def get_format_string(cls):
         """See BzrBranchFormat.get_format_string()."""
-        return "Sample branch format."
+        return b"Sample branch format."
 
     def initialize(self, a_controldir, name=None, repository=None,
                    append_revisions_only=None):
@@ -151,7 +151,7 @@
 
 # Demonstrating how lazy loading is often implemented:
 # A constant string is created.
-SampleSupportedBranchFormatString = "Sample supported branch format."
+SampleSupportedBranchFormatString = b"Sample supported branch format."
 
 # And the format class can then reference the constant to avoid skew.
 class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
@@ -209,10 +209,10 @@
 
     def test_from_string(self):
         self.assertIsInstance(
-            SampleBranchFormat.from_string("Sample branch format."),
+            SampleBranchFormat.from_string(b"Sample branch format."),
             SampleBranchFormat)
         self.assertRaises(AssertionError,
-            SampleBranchFormat.from_string, "Different branch format.")
+            SampleBranchFormat.from_string, b"Different branch format.")
 
     def test_find_format_not_branch(self):
         dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
@@ -229,11 +229,11 @@
 
     def test_find_format_with_features(self):
         tree = self.make_branch_and_tree('.', format='2a')
-        tree.branch.update_feature_flags({"name": "optional"})
+        tree.branch.update_feature_flags({b"name": b"optional"})
         found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(tree.controldir)
         self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
-        self.assertEqual(found_format.features.get("name"), "optional")
-        tree.branch.update_feature_flags({"name": None})
+        self.assertEqual(found_format.features.get(b"name"), b"optional")
+        tree.branch.update_feature_flags({b"name": None})
         branch = _mod_branch.Branch.open('.')
         self.assertEqual(branch._format.features, {})
 
@@ -254,10 +254,10 @@
         format = SampleBranchFormat()
         self.registry.register(format)
         self.assertEqual(format,
-            self.registry.get("Sample branch format."))
+            self.registry.get(b"Sample branch format."))
         self.registry.remove(format)
         self.assertRaises(KeyError, self.registry.get,
-            "Sample branch format.")
+            b"Sample branch format.")
 
     def test_get_all(self):
         format = SampleBranchFormat()
 
=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2018-03-10 13:52:14 +0000
+++ breezy/tests/test_bzrdir.py	2018-03-24 18:03:06 +0000
@@ -243,7 +243,7 @@
 
     def get_format_string(self):
         """See BzrDirFormat.get_format_string()."""
-        return "Sample .bzr dir format."
+        return b"Sample .bzr dir format."
 
     def initialize_on_transport(self, t):
         """Create a bzr dir."""
@@ -266,14 +266,14 @@
 
     @staticmethod
     def get_format_string():
-        return "Test format 1"
+        return b"Test format 1"
 
 
 class BzrDirFormatTest2(bzrdir.BzrDirMetaFormat1):
 
     @staticmethod
     def get_format_string():
-        return "Test format 2"
+        return b"Test format 2"
 
 
 class TestBzrDirFormat(TestCaseWithTransport):
@@ -1033,13 +1033,15 @@
 
     def test_with_features(self):
         tree = self.make_branch_and_tree('tree', format='2a')
-        tree.controldir.update_feature_flags({"bar": "required"})
+        tree.controldir.update_feature_flags({b"bar": b"required"})
         self.assertRaises(bzrdir.MissingFeature, bzrdir.BzrDir.open, 'tree')
-        bzrdir.BzrDirMetaFormat1.register_feature('bar')
-        self.addCleanup(bzrdir.BzrDirMetaFormat1.unregister_feature, 'bar')
+        bzrdir.BzrDirMetaFormat1.register_feature(b'bar')
+        self.addCleanup(bzrdir.BzrDirMetaFormat1.unregister_feature, b'bar')
         dir = bzrdir.BzrDir.open('tree')
-        self.assertEqual("required", dir._format.features.get("bar"))
-        tree.controldir.update_feature_flags({"bar": None, "nonexistant": None})
+        self.assertEqual(b"required", dir._format.features.get(b"bar"))
+        tree.controldir.update_feature_flags({
+            b"bar": None,
+            b"nonexistant": None})
         dir = bzrdir.BzrDir.open('tree')
         self.assertEqual({}, dir._format.features)
 
@@ -1461,7 +1463,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "First line\n"
+        return b"First line\n"
 
 
 class TestBzrFormat(TestCase):
@@ -1469,57 +1471,57 @@
 
     def test_as_string(self):
         format = SampleBzrFormat()
-        format.features = {"foo": "required"}
+        format.features = {b"foo": b"required"}
         self.assertEqual(format.as_string(),
-            "First line\n"
-            "required foo\n")
+            b"First line\n"
+            b"required foo\n")
         format.features["another"] = "optional"
         self.assertEqual(format.as_string(),
-            "First line\n"
-            "required foo\n"
-            "optional another\n")
+            b"First line\n"
+            b"required foo\n"
+            b"optional another\n")
 
     def test_network_name(self):
         # The network string should include the feature info
         format = SampleBzrFormat()
-        format.features = {"foo": "required"}
+        format.features = {b"foo": b"required"}
         self.assertEqual(
-            "First line\nrequired foo\n",
+            b"First line\nrequired foo\n",
             format.network_name())
 
     def test_from_string_no_features(self):
         # No features
         format = SampleBzrFormat.from_string(
-            "First line\n")
+            b"First line\n")
         self.assertEqual({}, format.features)
 
     def test_from_string_with_feature(self):
         # Proper feature
         format = SampleBzrFormat.from_string(
-            "First line\nrequired foo\n")
-        self.assertEqual("required", format.features.get("foo"))
+            b"First line\nrequired foo\n")
+        self.assertEqual(b"required", format.features.get(b"foo"))
 
     def test_from_string_format_string_mismatch(self):
         # The first line has to match the format string
         self.assertRaises(AssertionError, SampleBzrFormat.from_string,
-            "Second line\nrequired foo\n")
+            b"Second line\nrequired foo\n")
 
     def test_from_string_missing_space(self):
         # At least one space is required in the feature lines
         self.assertRaises(errors.ParseFormatError, SampleBzrFormat.from_string,
-            "First line\nfoo\n")
+            b"First line\nfoo\n")
 
     def test_from_string_with_spaces(self):
         # Feature with spaces (in case we add stuff like this in the future)
         format = SampleBzrFormat.from_string(
-            "First line\nrequired foo with spaces\n")
-        self.assertEqual("required", format.features.get("foo with spaces"))
+            b"First line\nrequired foo with spaces\n")
+        self.assertEqual(b"required", format.features.get(b"foo with spaces"))
 
     def test_eq(self):
         format1 = SampleBzrFormat()
-        format1.features = {"nested-trees": "optional"}
+        format1.features = {b"nested-trees": b"optional"}
         format2 = SampleBzrFormat()
-        format2.features = {"nested-trees": "optional"}
+        format2.features = {b"nested-trees": b"optional"}
         self.assertEqual(format1, format1)
         self.assertEqual(format1, format2)
         format3 = SampleBzrFormat()
@@ -1528,40 +1530,40 @@
     def test_check_support_status_optional(self):
         # Optional, so silently ignore
         format = SampleBzrFormat()
-        format.features = {"nested-trees": "optional"}
+        format.features = {b"nested-trees": b"optional"}
         format.check_support_status(True)
-        self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
-        SampleBzrFormat.register_feature("nested-trees")
+        self.addCleanup(SampleBzrFormat.unregister_feature, b"nested-trees")
+        SampleBzrFormat.register_feature(b"nested-trees")
         format.check_support_status(True)
 
     def test_check_support_status_required(self):
         # Optional, so trigger an exception
         format = SampleBzrFormat()
-        format.features = {"nested-trees": "required"}
+        format.features = {b"nested-trees": b"required"}
         self.assertRaises(bzrdir.MissingFeature, format.check_support_status,
             True)
-        self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
-        SampleBzrFormat.register_feature("nested-trees")
+        self.addCleanup(SampleBzrFormat.unregister_feature, b"nested-trees")
+        SampleBzrFormat.register_feature(b"nested-trees")
         format.check_support_status(True)
 
     def test_check_support_status_unknown(self):
         # treat unknown necessity as required
         format = SampleBzrFormat()
-        format.features = {"nested-trees": "unknown"}
+        format.features = {b"nested-trees": b"unknown"}
         self.assertRaises(bzrdir.MissingFeature, format.check_support_status,
             True)
-        self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
-        SampleBzrFormat.register_feature("nested-trees")
+        self.addCleanup(SampleBzrFormat.unregister_feature, b"nested-trees")
+        SampleBzrFormat.register_feature(b"nested-trees")
         format.check_support_status(True)
 
     def test_feature_already_registered(self):
         # a feature can only be registered once
-        self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
-        SampleBzrFormat.register_feature("nested-trees")
+        self.addCleanup(SampleBzrFormat.unregister_feature, b"nested-trees")
+        SampleBzrFormat.register_feature(b"nested-trees")
         self.assertRaises(bzrdir.FeatureAlreadyRegistered,
-            SampleBzrFormat.register_feature, "nested-trees")
+            SampleBzrFormat.register_feature, b"nested-trees")
 
     def test_feature_with_space(self):
         # spaces are not allowed in feature names
         self.assertRaises(ValueError, SampleBzrFormat.register_feature,
-            "nested trees")
+            b"nested trees")
 
=== modified file 'breezy/tests/test_controldir.py'
--- breezy/tests/test_controldir.py	2017-07-30 21:23:44 +0000
+++ breezy/tests/test_controldir.py	2018-03-24 18:03:06 +0000
@@ -42,7 +42,7 @@
 class SampleComponentFormat(controldir.ControlComponentFormat):
 
     def get_format_string(self):
-        return "Example component format."
+        return b"Example component format."
 
 
 class SampleExtraComponentFormat(controldir.ControlComponentFormat):
@@ -59,10 +59,10 @@
         format = SampleComponentFormat()
         self.registry.register(format)
         self.assertEqual(format,
-            self.registry.get("Example component format."))
+            self.registry.get(b"Example component format."))
         self.registry.remove(format)
         self.assertRaises(KeyError, self.registry.get,
-            "Example component format.")
+            b"Example component format.")
 
     def test_get_all(self):
         format = SampleComponentFormat()
 
=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2017-11-24 09:25:13 +0000
+++ breezy/tests/test_foreign.py	2018-03-24 18:03:06 +0000
@@ -151,7 +151,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "Dummy Foreign Vcs Repository"
+        return b"Dummy Foreign Vcs Repository"
 
     def get_format_description(self):
         return "Dummy Foreign Vcs Repository"
@@ -234,7 +234,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "Branch for Testing"
+        return b"Branch for Testing"
 
     @property
     def _matchingcontroldir(self):
@@ -266,7 +266,7 @@
 
     @classmethod
     def get_format_string(cls):
-        return "A Dummy VCS Dir"
+        return b"A Dummy VCS Dir"
 
     @classmethod
     def get_format_description(cls):
 
=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2018-02-24 15:50:23 +0000
+++ breezy/tests/test_repository.py	2018-03-24 18:03:06 +0000
@@ -105,7 +105,7 @@
     @classmethod
     def get_format_string(cls):
         """See RepositoryFormat.get_format_string()."""
-        return "Sample .bzr repository format."
+        return b"Sample .bzr repository format."
 
     def initialize(self, a_controldir, shared=False):
         """Initialize a repository in a BzrDir"""
@@ -154,11 +154,11 @@
     def test_from_string(self):
         self.assertIsInstance(
             SampleRepositoryFormat.from_string(
-                "Sample .bzr repository format."),
+                b"Sample .bzr repository format."),
             SampleRepositoryFormat)
         self.assertRaises(AssertionError,
             SampleRepositoryFormat.from_string,
-                "Different .bzr repository format.")
+                b"Different .bzr repository format.")
 
     def test_find_format_unknown_format(self):
         dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
@@ -169,15 +169,15 @@
 
     def test_find_format_with_features(self):
         tree = self.make_branch_and_tree('.', format='2a')
-        tree.branch.repository.update_feature_flags({"name": "necessity"})
+        tree.branch.repository.update_feature_flags({b"name": b"necessity"})
         found_format = bzrrepository.RepositoryFormatMetaDir.find_format(tree.controldir)
         self.assertIsInstance(found_format, bzrrepository.RepositoryFormatMetaDir)
-        self.assertEqual(found_format.features.get("name"), "necessity")
+        self.assertEqual(found_format.features.get(b"name"), b"necessity")
         self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
             True)
         self.addCleanup(bzrrepository.RepositoryFormatMetaDir.unregister_feature,
-            "name")
-        bzrrepository.RepositoryFormatMetaDir.register_feature("name")
+            b"name")
+        bzrrepository.RepositoryFormatMetaDir.register_feature(b"name")
         found_format.check_support_status(True)
 
 
@@ -190,9 +190,9 @@
     def test_register_unregister_format(self):
         format = SampleRepositoryFormat()
         self.registry.register(format)
-        self.assertEqual(format, self.registry.get("Sample .bzr repository format."))
+        self.assertEqual(format, self.registry.get(b"Sample .bzr repository format."))
         self.registry.remove(format)
-        self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
+        self.assertRaises(KeyError, self.registry.get, b"Sample .bzr repository format.")
 
     def test_get_all(self):
         format = SampleRepositoryFormat()
@@ -447,14 +447,14 @@
 
     @classmethod
     def get_format_string(cls):
-        return "Test Format 1"
+        return b"Test Format 1"
 
 
 class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
 
     @classmethod
     def get_format_string(cls):
-        return "Test Format 2"
+        return b"Test Format 2"
 
 
 class TestRepositoryConverter(TestCaseWithTransport):
@@ -1719,18 +1719,18 @@
     def test_open_with_present_feature(self):
         self.addCleanup(
             bzrrepository.RepositoryFormatMetaDir.unregister_feature,
-            "makes-cheese-sandwich")
+            b"makes-cheese-sandwich")
         bzrrepository.RepositoryFormatMetaDir.register_feature(
-            "makes-cheese-sandwich")
+            b"makes-cheese-sandwich")
         repo = self.make_repository('.')
         repo.lock_write()
-        repo._format.features["makes-cheese-sandwich"] = "required"
+        repo._format.features[b"makes-cheese-sandwich"] = b"required"
         repo._format.check_support_status(False)
         repo.unlock()
 
     def test_open_with_missing_required_feature(self):
         repo = self.make_repository('.')
         repo.lock_write()
-        repo._format.features["makes-cheese-sandwich"] = "required"
+        repo._format.features[b"makes-cheese-sandwich"] = b"required"
         self.assertRaises(bzrdir.MissingFeature,
             repo._format.check_support_status, False)
 
=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_selftest.py	2018-03-24 18:03:06 +0000
@@ -106,7 +106,7 @@
         self.requireFeature(features.UnicodeFilenameFeature)
 
         filename = u'hell\u00d8'
-        self.build_tree_contents([(filename, 'contents of hello')])
+        self.build_tree_contents([(filename, b'contents of hello')])
         self.assertPathExists(filename)
 
 
@@ -235,7 +235,7 @@
         from .per_repository import formats_to_scenarios
         formats = [("(c)", remote.RemoteRepositoryFormat()),
                    ("(d)", repository.format_registry.get(
-                    'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
+                    b'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
         no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
             None)
         vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
@@ -2172,7 +2172,7 @@
 
     def test_load_list(self):
         # Provide a list with one test - this test.
-        test_id_line = '%s\n' % self.id()
+        test_id_line = b'%s\n' % self.id()
         self.build_tree_contents([('test.list', test_id_line)])
         # And generate a list of the tests in  the suite.
         stream = self.run_selftest(load_list='test.list', list_only=True)
 
=== modified file 'breezy/tests/test_sftp_transport.py'
--- breezy/tests/test_sftp_transport.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_sftp_transport.py	2018-03-24 18:03:06 +0000
@@ -239,7 +239,7 @@
         self.vfs_transport_server = create_server
         f = open('a_file', 'wb')
         try:
-            f.write('foobar\n')
+            f.write(b'foobar\n')
         finally:
             f.close()
 
 
=== modified file 'breezy/tests/test_workingtree.py'
--- breezy/tests/test_workingtree.py	2018-03-22 02:21:11 +0000
+++ breezy/tests/test_workingtree.py	2018-03-24 18:03:06 +0000
@@ -84,10 +84,10 @@
 
     def test_from_string(self):
         self.assertIsInstance(
-            SampleTreeFormat.from_string("Sample tree format."),
+            SampleTreeFormat.from_string(b"Sample tree format."),
             SampleTreeFormat)
         self.assertRaises(AssertionError,
-            SampleTreeFormat.from_string, "Different format string.")
+            SampleTreeFormat.from_string, b"Different format string.")
 
     def test_get_set_default_format_by_key(self):
         old_format = workingtree.format_registry.get_default()
@@ -140,7 +140,7 @@
     @classmethod
     def get_format_string(cls):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Sample tree format."
+        return b"Sample tree format."
 
     def initialize(self, a_controldir, revision_id=None, from_branch=None,
                    accelerator_tree=None, hardlink=False):
@@ -223,16 +223,16 @@
 
     def test_find_format_with_features(self):
         tree = self.make_branch_and_tree('.', format='2a')
-        tree.update_feature_flags({"name": "necessity"})
+        tree.update_feature_flags({b"name": b"necessity"})
         found_format = bzrworkingtree.WorkingTreeFormatMetaDir.find_format(
             tree.controldir)
         self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
-        self.assertEqual(found_format.features.get("name"), "necessity")
+        self.assertEqual(found_format.features.get(b"name"), b"necessity")
         self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
             True)
         self.addCleanup(bzrworkingtree.WorkingTreeFormatMetaDir.unregister_feature,
-            "name")
-        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature("name")
+            b"name")
+        bzrworkingtree.WorkingTreeFormatMetaDir.register_feature(b"name")
         found_format.check_support_status(True)
 
 
@@ -287,9 +287,9 @@
     def test_register_unregister_format(self):
         format = SampleTreeFormat()
         self.registry.register(format)
-        self.assertEqual(format, self.registry.get("Sample tree format."))
+        self.assertEqual(format, self.registry.get(b"Sample tree format."))
         self.registry.remove(format)
-        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
+        self.assertRaises(KeyError, self.registry.get, b"Sample tree format.")
 
     def test_get_all(self):
         format = SampleTreeFormat()
@@ -327,13 +327,13 @@
         # stat-cache = ??
         # no inventory.basis yet
         t = control.get_workingtree_transport(None)
-        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
+        self.assertEqualDiff(b'Bazaar-NG Working Tree format 3',
                              t.get('format').read())
         self.assertEqualDiff(t.get('inventory').read(),
-                              '<inventory format="5">\n'
-                              '</inventory>\n',
+                              b'<inventory format="5">\n'
+                              b'</inventory>\n',
                              )
-        self.assertEqualDiff('### bzr hashcache v5\n',
+        self.assertEqualDiff(b'### bzr hashcache v5\n',
                              t.get('stat-cache').read())
         self.assertFalse(t.has('inventory.basis'))
         # no last-revision file means 'None' or 'NULLREVISION'
@@ -380,7 +380,7 @@
     def test_revert_conflicts_recursive(self):
         this_tree = self.make_branch_and_tree('this-tree')
         self.build_tree_contents([('this-tree/foo/',),
-                                  ('this-tree/foo/bar', 'bar')])
+                                  ('this-tree/foo/bar', b'bar')])
         this_tree.add(['foo', 'foo/bar'])
         this_tree.commit('created foo/bar')
         other_tree = this_tree.controldir.sprout('other-tree').open_workingtree()
@@ -398,15 +398,15 @@
 
     def test_auto_resolve(self):
         base = self.make_branch_and_tree('base')
-        self.build_tree_contents([('base/hello', 'Hello')])
+        self.build_tree_contents([('base/hello', b'Hello')])
         base.add('hello', 'hello_id')
         base.commit('Hello')
         other = base.controldir.sprout('other').open_workingtree()
-        self.build_tree_contents([('other/hello', 'hELLO')])
+        self.build_tree_contents([('other/hello', b'hELLO')])
         other.commit('Case switch')
         this = base.controldir.sprout('this').open_workingtree()
         self.assertPathExists('this/hello')
-        self.build_tree_contents([('this/hello', 'Hello World')])
+        self.build_tree_contents([('this/hello', b'Hello World')])
         this.commit('Add World')
         this.merge_from_branch(other.branch)
         self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
@@ -414,20 +414,20 @@
         this.auto_resolve()
         self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
                          this.conflicts())
-        self.build_tree_contents([('this/hello', '<<<<<<<')])
-        this.auto_resolve()
-        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
-                         this.conflicts())
-        self.build_tree_contents([('this/hello', '=======')])
-        this.auto_resolve()
-        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
-                         this.conflicts())
-        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
+        self.build_tree_contents([('this/hello', b'<<<<<<<')])
+        this.auto_resolve()
+        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
+                         this.conflicts())
+        self.build_tree_contents([('this/hello', b'=======')])
+        this.auto_resolve()
+        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
+                         this.conflicts())
+        self.build_tree_contents([('this/hello', b'\n>>>>>>>')])
         remaining, resolved = this.auto_resolve()
         self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
                          this.conflicts())
         self.assertEqual([], resolved)
-        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
+        self.build_tree_contents([('this/hello', b'hELLO wORLD')])
         remaining, resolved = this.auto_resolve()
         self.assertEqual([], this.conflicts())
         self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-03-24 10:24:48 +0000
+++ breezy/transform.py	2018-03-24 18:03:06 +0000
@@ -1946,8 +1946,8 @@
             path = self._tree_id_paths[parent_id]
         except KeyError:
             return
-        entry = self._tree.iter_entries_by_dir(
-                specific_files=[path]).next()[1]
+        entry = next(self._tree.iter_entries_by_dir(
+                specific_files=[path]))[1]
         children = getattr(entry, 'children', {})
         for child in children:
             childpath = joinpath(path, child)
 
=== modified file 'breezy/tuned_gzip.py'
--- breezy/tuned_gzip.py	2017-12-04 23:01:39 +0000
+++ breezy/tuned_gzip.py	2018-03-24 18:03:06 +0000
@@ -77,4 +77,4 @@
     result.append(compress.flush())
     # size may exceed 2GB, or even 4GB
     result.append(struct.pack("<LL", LOWU32(crc), LOWU32(total_len)))
-    return b''.join(result)
+    return result
 
=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2018-03-24 10:24:48 +0000
+++ breezy/workingtree.py	2018-03-24 18:03:06 +0000
@@ -1480,12 +1480,12 @@
         return self._matchingcontroldir
 
 
-format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
+format_registry.register_lazy(b"Bazaar Working Tree Format 4 (bzr 0.15)\n",
     "breezy.bzr.workingtree_4", "WorkingTreeFormat4")
-format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
+format_registry.register_lazy(b"Bazaar Working Tree Format 5 (bzr 1.11)\n",
     "breezy.bzr.workingtree_4", "WorkingTreeFormat5")
-format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
+format_registry.register_lazy(b"Bazaar Working Tree Format 6 (bzr 1.14)\n",
     "breezy.bzr.workingtree_4", "WorkingTreeFormat6")
-format_registry.register_lazy("Bazaar-NG Working Tree format 3",
+format_registry.register_lazy(b"Bazaar-NG Working Tree format 3",
     "breezy.bzr.workingtree_3", "WorkingTreeFormat3")
-format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
+format_registry.set_default_key(b"Bazaar Working Tree Format 6 (bzr 1.14)\n")
 
=== modified file 'python3.passing'
--- python3.passing	2018-02-16 00:30:12 +0000
+++ python3.passing	2018-03-24 18:03:06 +0000
@@ -55,13 +55,27 @@
 breezy.plugins.stats.test_stats.TestCollapseByPerson.test_different_name_case
 breezy.plugins.stats.test_stats.TestCollapseByPerson.test_no_conflicts
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat5)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat7)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_push_location_exact(BzrBranchFormat8)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat5)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat7)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_get_upload_location_unset(BzrBranchFormat8)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BranchReferenceFormat)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat5)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat6)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat7)
+breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(BzrBranchFormat8)
 breezy.plugins.weave_fmt.test_bzrdir.SFTPBranchTest.test_lock_file
 breezy.plugins.weave_fmt.test_bzrdir.TestBranchFormat4.test_no_metadir_support
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_order
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_reconcile
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_attribute__fetch_uses_deltas
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_creates_lockdir
+breezy.plugins.weave_fmt.test_repository.TestFormat7.test_supports_external_lookups
 breezy.plugins.weave_fmt.test_repository.TestInterWeaveRepo.test_is_compatible_and_registered
 breezy.plugins.weave_fmt.test_repository.TestSerializer.test_registry
 breezy.plugins.weave_fmt.test_store.TestCompressedTextStore.test_multiple_add
@@ -107,29 +121,58 @@
 breezy.tests.commands.test_update.TestUpdate.test_update
 breezy.tests.multiply_tests
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_diverged(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBound.test_bind_unbind(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBound.test_old_bound_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBound.test_set_bound_location_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBound.test_unbind_clears_cached_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranchControlComponent.test_urls(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_branch_format_network_name(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranchFormat.test_get_config_calls(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_exact(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_get_push_location_unset(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranchPushLocations.test_set_push_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_bad_revision(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_nickname(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_nickname(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_nickname(BzrBranchFormat5)
@@ -145,7 +188,9 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_append_revisions_only(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat5)
@@ -153,82 +198,176 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_colocated(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_fetch_revisions(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_format_description(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_format_description(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_format_description(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_format_description(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_format_description(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_generate_revision_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_generate_revision_history_NULL_REVISION(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_commit_builder(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_get_set_append_revisions_only(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_heads_to_fetch_not_null_revision(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_nicks_bzr(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_public_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_initial_ghost(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_revision_ids_are_utf8(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_submit_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestChildSubmitFormats.test_get_child_submit_format_default(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestFormat.test_format_initialize_find_open(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestFormat.test_get_reference(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestFormat.test_set_reference(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_are_opened(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestIgnoreFallbacksParameter.test_fallbacks_not_opened(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_branch_relative_reference_location(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_clone_copies_reference_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_copied_locations_are_rebased(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_get_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_merge_updates_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_pull_updates_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_push_updates_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_accepts_possible_transports(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_accepts_possible_transports(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_accepts_possible_transports(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_accepts_possible_transports(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_accepts_possible_transports(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_reference_parent_from_reference_info_(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_get_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_reference_info_when_null(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_null_requires_two_nones(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_set_reference_info(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_sprout_copies_reference_location(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_known_references(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_retains_old_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestReferenceLocation.test_update_references_skips_known_references(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestStrict.test_strict_history(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestStrict.test_strict_history(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(BzrBranchFormat4)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(BzrBranchFormat5)
@@ -238,7 +377,10 @@
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_branch_format_matches_bzrdir_branch_format(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestTestCaseWithBranch.test_make_branch_gets_expected_format(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_get_unshelver_bound(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_get_unshelver(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_store_uncommitted_already_stored(BranchReferenceFormat)
@@ -246,15 +388,29 @@
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_store_uncommitted(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestUncommittedChanges.test_store_uncommitted_none(BranchReferenceFormat)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat5)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat7)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat5)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat7)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat5)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat7)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocked_repo_locked(BzrBranchFormat8)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BranchReferenceFormat)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat5)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat6)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat7)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(BzrBranchFormat8)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BranchReferenceFormat)
 breezy.tests.per_branch.test_check.TestBranchCheck.test__get_check_refs(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_post_commit_bound(BranchReferenceFormat)
@@ -265,9 +421,15 @@
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_passes(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommit.test_commit_nicks(BranchReferenceFormat)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BranchReferenceFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat5)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat6)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat7)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_submit_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BranchReferenceFormat)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat5)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat6)
 breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat7)
+breezy.tests.per_branch.test_config.TestGetConfig.test_set_user_option_with_dict(BzrBranchFormat8)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_checkout_format_heavyweight(BranchReferenceFormat)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_checkout_format_lightweight(BranchReferenceFormat)
 breezy.tests.per_branch.test_create_checkout.TestCreateCheckout.test_create_checkout_exists(BranchReferenceFormat)
@@ -371,53 +533,125 @@
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BzrBranchFormat7)
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_01_lock_read(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_02_lock_write(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_03_lock_fail_unlock_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_04_lock_fail_unlock_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_05_lock_read_fail_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_06_lock_write_fail_repo(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_07_lock_read_fail_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_08_lock_write_fail_control(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_dont_leave_lock_in_place(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_leave_lock_in_place(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_and_unlock_leaves_repo_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_context_manager(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_returns_unlockable(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_read_then_unlock(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_locks_repo_too(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_raises_in_lock_read(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_reenter_with_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_None_refuses_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_returns_unlockable(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_matching_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_nonmatching_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_lock_write_with_token_fails_when_unlocked(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_reentering_lock_write_raises_on_token_mismatch(BzrBranchFormat8)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BranchReferenceFormat)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat5)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat6)
 breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat7)
+breezy.tests.per_branch.test_locking.TestBranchLocking.test_unlock_after_lock_write_with_token(BzrBranchFormat8)
 breezy.tests.per_branch.test_parent.TestParent.test_get_invalid_parent(BranchReferenceFormat)
 breezy.tests.per_branch.test_parent.TestParent.test_get_invalid_parent(BzrBranchFormat4)
 breezy.tests.per_branch.test_parent.TestParent.test_get_invalid_parent(BzrBranchFormat5)
@@ -464,6 +698,7 @@
 breezy.tests.per_branch.test_permissions.TestPermissions.test_new_branch(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_bound_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BranchReferenceFormat)
+breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_empty_history(BzrBranchFormat5)
 breezy.tests.per_branch.test_pull.TestPullHook.test_post_pull_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_pull.TestPull.test_pull_convergence_simple(BranchReferenceFormat)
 breezy.tests.per_branch.test_pull.TestPull.test_pull_local_raises_LocalRequiresBoundBranch_on_unbound(BranchReferenceFormat)
@@ -481,9 +716,13 @@
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_push.EmptyPushSmartEffortTests.test_empty_branch_command(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat5)
+breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat6)
 breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat7)
+breezy.tests.per_branch.test_push.TestLossyPush.test_lossy_push_raises_same_vcs(BzrBranchFormat8)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_bound_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BranchReferenceFormat)
+breezy.tests.per_branch.test_push.TestPushHook.test_post_push_empty_history(BzrBranchFormat5)
 breezy.tests.per_branch.test_push.TestPushHook.test_post_push_nonempty_history(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_convergence_simple(BranchReferenceFormat)
 breezy.tests.per_branch.test_push.TestPush.test_push_merged_indirect(BranchReferenceFormat)
@@ -507,9 +746,15 @@
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_fixes_invalid_revhistory(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_handles_ghosts_in_revhistory(BranchReferenceFormat)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BranchReferenceFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat5)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat6)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat7)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_returns_reconciler(BzrBranchFormat8)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BranchReferenceFormat)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat5)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat6)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat7)
+breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat8)
 breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BranchReferenceFormat)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_empty(BranchReferenceFormat)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_mainline_ghost(BranchReferenceFormat)
@@ -548,6 +793,8 @@
 breezy.tests.per_branch.test_stacking.TestStackingConnections.test_open_stacked(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_stacking.TestStackingConnections.test_open_stacked(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_stacking.TestStacking.test_autopack_when_stacked(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_autopack_when_stacked(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_autopack_when_stacked(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_clone_from_branch_stacked_on_relative_url_preserve_stacking(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_clone_from_stacked_branch_no_preserve_stacking(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_clone_from_stacked_branch_preserve_stacking(BranchReferenceFormat)
@@ -558,7 +805,11 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_fetch_revisions_with_file_changes(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_graph_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_relative(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_get_set_stacked_on_url(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_no_op_preserve_stacking(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_pull_delta_when_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_pull_delta_when_stacked(BzrBranchFormat4)
@@ -566,8 +817,13 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_pull_delta_when_stacked(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_revision_history_of_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_after_being_stacked_raises(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat7)
+breezy.tests.per_branch.test_stacking.TestStacking.test_set_stacked_on_same_branch_raises(BzrBranchFormat8)
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_stacked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_stacked_from_smart_server(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_stacking_policy_handling(BranchReferenceFormat)
@@ -578,6 +834,8 @@
 breezy.tests.per_branch.test_stacking.TestStacking.test_sprout_to_smart_server_stacking_policy_handling(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_stacking.TestStacking.test_stack_on_repository_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BranchReferenceFormat)
+breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat5)
+breezy.tests.per_branch.test_stacking.TestStacking.test_transform_fallback_location_hook(BzrBranchFormat6)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_already_locked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_already_multiple_locked(BranchReferenceFormat)
 breezy.tests.per_branch.test_stacking.TestStacking.test_unstack_fetches(BranchReferenceFormat)
@@ -586,33 +844,63 @@
 breezy.tests.per_branch.test_tags.AutomaticTagNameTests.test_returns_tag_name(BranchReferenceFormat)
 breezy.tests.per_branch.test_tags.AutomaticTagNameTests.test_uses_first_return(BranchReferenceFormat)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_cached_tag_dict_not_accidentally_mutable(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_cached_tag_dict_not_accidentally_mutable(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_delete_tag_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_ghost_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_make_and_lookup_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_make_and_lookup_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_empty_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_empty_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_to_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_merge_to_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_no_such_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_no_such_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_read_lock_caches_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_read_lock_caches_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_rename_revisions_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_rename_revisions_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_reverse_tag_dict(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_reverse_tag_dict(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_set_tag_invalides_cache(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_set_tag_invalides_cache(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_tags_initially_empty(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_tags_initially_empty(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unicode_tag(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_unicode_tag(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestBranchTags.test_unlocked_does_not_cache_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestBranchTags.test_unlocked_does_not_cache_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_ignore_master_disables_tag_propagation(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_ignore_master_disables_tag_propagation(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_child_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_child_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_master_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_conflict_in_master_only(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_different_conflict_in_master_and_child(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_different_conflict_in_master_and_child(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_child_and_master(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_child_and_master(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_master(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_overwrite_conflict_in_master(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_propagates_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_propagates_tags(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_same_conflict_in_master_and_child(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestTagsMergeToInCheckouts.test_merge_to_same_conflict_in_master_and_child(BzrBranchFormat5)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat5)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat6)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat7)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_merge_empty_tags(BzrBranchFormat8)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BranchReferenceFormat)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat5)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat6)
 breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat7)
+breezy.tests.per_branch.test_tags.TestUnsupportedTags.test_tag_methods_raise(BzrBranchFormat8)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_bound(BranchReferenceFormat)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_not_to_origin(BranchReferenceFormat)
 breezy.tests.per_branch.test_uncommit.TestUncommitHook.test_post_uncommit_to_origin(BranchReferenceFormat)
@@ -620,7 +908,10 @@
 breezy.tests.per_branch.test_update.TestUpdate.test_update_local_commits_returns_old_tip(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_prefix_returns_none(BranchReferenceFormat)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BranchReferenceFormat)
+breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat5)
+breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat6)
 breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat7)
+breezy.tests.per_branch.test_update.TestUpdate.test_update_unbound_works(BzrBranchFormat8)
 breezy.tests.per_interbranch.test_copy_content_into.TestCopyContentInto.test_inter_is_used(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interbranch.test_get.TestInterBranchGet.test_gets_right_inter(GenericInterBranch,BzrBranchFormat7,BzrBranchFormat7)
 breezy.tests.per_interrepository.test_fetch.TestFetchDependentData.test_reference(InterDifferingSerializer,RepositoryFormat2a,RepositoryFormatKnitPack6RichRoot)
@@ -731,6 +1022,14 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterDirStateTree(C))
+breezy.tests.per_inventory.basics.TestInventoryFiltering.test_inv_filter_dirs(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryFiltering.test_inv_filter_empty(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryFiltering.test_inv_filter_entry_not_present(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryFiltering.test_inv_filter_files_and_dirs(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryFiltering.test_inv_filter_files(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryReads.test_iter_entries_by_dir(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryReads.test_iter_entries(Inventory)
+breezy.tests.per_inventory.basics.TestInventoryReads.test_iter_just_entries(Inventory)
 breezy.tests.per_lock.test_lock.TestLock.test_multiple_read_locks(fcntl)
 breezy.tests.per_lock.test_lock.TestLock.test_multiple_write_locks_exclude(fcntl)
 breezy.tests.per_lock.test_lock.TestLock.test_readonly_file(fcntl)
@@ -2216,6 +2515,9 @@
 breezy.tests.per_transport.TransportTests.test_base_url(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_base_url(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_base_url(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_clone(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_clone(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_clone(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_clone_from_root(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_clone_from_root(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_clone_from_root(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2229,6 +2531,10 @@
 breezy.tests.per_transport.TransportTests.test_clone_from_root(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_clone_from_root(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_clone(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_clone(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_clone(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_clone(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_clone(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_clone_preserve_info(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_clone_preserve_info(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_clone_preserve_info(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2253,6 +2559,9 @@
 breezy.tests.per_transport.TransportTests.test_clone_to_root(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_clone_to_root(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_clone_to_root(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_clone(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_clone(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_clone(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_clone_url_unquote_unreserved(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_clone_url_unquote_unreserved(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_clone_url_unquote_unreserved(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2297,8 +2606,18 @@
 breezy.tests.per_transport.TransportTests.test_copy(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_copy(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_copy(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_copy_to(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2339,10 +2658,19 @@
 breezy.tests.per_transport.TransportTests.test_create_prefix(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_create_prefix(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_create_prefix(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_delete(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_delete(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_delete(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_delete(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_delete(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_delete(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_delete(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_delete(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_delete(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_delete(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_delete(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_delete(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_delete(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_delete_tree(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_delete_tree(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_delete_tree(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2355,6 +2683,7 @@
 breezy.tests.per_transport.TransportTests.test_delete_tree(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_delete_tree(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_delete_tree(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_delete(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_ensure_base_exists(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_ensure_base_exists(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_ensure_base_exists(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2587,11 +2916,31 @@
 breezy.tests.per_transport.TransportTests.test_local_abspath(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_local_abspath(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_local_abspath(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_lock_read(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(PathFilteringTransport,TestingPathFilteringServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_lock_read(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_lock_write(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_lock_write(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_lock_write(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_lock_write(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_lock_write(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_lock_write(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_mkdir(HttpTransport_urllib,HttpServer_urllib)
@@ -2647,6 +2996,8 @@
 breezy.tests.per_transport.TransportTests.test_opening_a_file_stream_creates_file(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_opening_a_file_stream_creates_file(ReadonlyTransportDecorator,ReadonlyServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(HTTPS_urllib_transport,HTTPSServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_bytes(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(FtpTransport,UnavailableFTPTestServer)
@@ -2654,12 +3005,20 @@
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(MemoryTransport,MemoryServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(LocalTransport,LocalURLServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(ReadonlyTransportDecorator,ReadonlyServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(FakeNFSTransportDecorator,FakeNFSServer)
@@ -2713,7 +3072,17 @@
 breezy.tests.per_transport.TransportTests.test_put_file(ReadonlyTransportDecorator,ReadonlyServer)
 breezy.tests.per_transport.TransportTests.test_readv(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_readv_out_of_order(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_readv_short_read(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(PathFilteringTransport,TestingPathFilteringServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_readv_short_read(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_readv_with_adjust_for_latency(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_readv_with_adjust_for_latency_with_big_file(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_recommended_page_size(ChrootTransport,TestingChrootServer)
@@ -2756,10 +3125,20 @@
 breezy.tests.per_transport.TransportTests.test_relpath(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_relpath(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_relpath(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_rename_across_subdirs(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_rename_dir_nonempty(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_rename_dir_nonempty(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_rename_dir_nonempty(FakeVFATTransportDecorator,FakeVFATServer)
@@ -2815,10 +3194,20 @@
 breezy.tests.per_transport.TransportTests.test__reuse_for(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test__reuse_for(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_rmdir(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_rmdir_empty_but_similar_prefix(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_rmdir(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_rmdir(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_rmdir(FtpTransport,UnavailableFTPTestServer)
@@ -2944,9 +3333,11 @@
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat4)
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_root_id.TestGetRootID.test_get_root_id_default(WorkingTreeFormat6)
+breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(PreviewTree)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat4)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_symlink_target(WorkingTreeFormat6)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTreePost)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat4)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat5)
@@ -2970,6 +3361,7 @@
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_not_versioned(WorkingTreeFormat4)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_not_versioned(WorkingTreeFormat5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_not_versioned(WorkingTreeFormat6)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_missing_content_summary(PreviewTree)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_missing_content_summary(PreviewTreePost)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_missing_content_summary(WorkingTreeFormat4)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_missing_content_summary(WorkingTreeFormat5)
@@ -3008,6 +3400,7 @@
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat6)
+breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_versioned_kind(PreviewTree)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_versioned_kind(PreviewTreePost)
 breezy.tests.per_uifactory.TestCannedInputUIFactory.test_be_quiet
 breezy.tests.per_uifactory.TestCannedInputUIFactory.test_confirm_action
@@ -3067,6 +3460,7 @@
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-graph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(named-nograph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(plain-knit-pack)
+breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(weave-named)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_check_progressbar_parameter(weave-prefix)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_clear_cache(annotated-knit-escape)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_clear_cache(groupcompress)
@@ -3126,11 +3520,21 @@
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-graph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(named-nograph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(plain-knit-pack)
+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(weave-named)
+breezy.tests.per_versionedfile.TestVersionedFiles.test_insert_record_stream_missing_keys(weave-prefix)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_known_graph_with_fallbacks(groupcompress-nograph)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_known_graph_with_fallbacks(named-nograph-nodelta-knit-pack)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_known_graph_with_fallbacks(weave-named)
 breezy.tests.per_versionedfile.TestVersionedFiles.test_known_graph_with_fallbacks(weave-prefix)
 breezy.tests.per_versionedfile.TestWeaveMerge.testDeleteAndModify
+breezy.tests.per_versionedfile.TestWeaveMerge.test_weave_merge_conflicts
+breezy.tests.per_versionedfile.TestWeave.test_add_follows_left_matching_blocks
+breezy.tests.per_versionedfile.TestWeave.test_add_lines_with_ghosts
+breezy.tests.per_versionedfile.TestWeave.test_add_lines_with_ghosts_after_normal_revs
+breezy.tests.per_versionedfile.TestWeave.test_add_unicode_content
+breezy.tests.per_versionedfile.TestWeave.test_get_suffixes
+breezy.tests.per_versionedfile.TestWeave.test_make_mpdiffs_with_ghosts
+breezy.tests.per_versionedfile.TestWeave.test_mutate_after_finish
 breezy.tests.per_versionedfile.TestWeave.test_no_implicit_create
 breezy.tests.per_versionedfile.VirtualVersionedFilesTests.test_add_lines
 breezy.tests.per_versionedfile.VirtualVersionedFilesTests.test_add_mpdiffs
@@ -3468,6 +3872,9 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_branch_builder(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_case_sensitive(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_tree_revision(WorkingTreeFormat4)
@@ -3581,7 +3988,13 @@
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_lookup_no_keys_no_calls
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_lookup_when_a_key_is_missing_continues
 breezy.tests.test_bisect_multi.TestBisectMultiBytes.test_searches_different_keys_in_different_directions
+breezy.tests.test_branch.BzrBranch8.test_reference_info_caches_cleared
+breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_read_locked
+breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_read_unlocked
+breezy.tests.test_branch.BzrBranch8.test_reference_info_caching_write_locked
+breezy.tests.test_branch.TestBranch7.test_creation
 breezy.tests.test_branch.TestBranch7.test_layout
+breezy.tests.test_branch.TestBranchFormat5.test_branch_format_5_uses_lockdir
 breezy.tests.test_branch.TestBranchFormatRegistry.test_default
 breezy.tests.test_branch.TestBranchFormatRegistry.test_get_all
 breezy.tests.test_branch.TestBranchFormatRegistry.test_register_extra
@@ -3592,11 +4005,14 @@
 breezy.tests.test_branch.TestBranchOptions.test_set_from_config_stack_get_from_config
 breezy.tests.test_branch.TestBranchOptions.test_use_fresh_values
 breezy.tests.test_branch.TestBranchOptions.test_valid_append_revisions_only
+breezy.tests.test_branch.TestBzrBranchFormat.test_find_format
 breezy.tests.test_branch.TestBzrBranchFormat.test_find_format_not_branch
+breezy.tests.test_branch.TestBzrBranchFormat.test_find_format_unknown_format
 breezy.tests.test_branch.TestBzrBranchFormat.test_find_format_with_features
 breezy.tests.test_branch.TestBzrBranchFormat.test_from_string
 breezy.tests.test_branch.TestDefaultFormat.test_default_format
 breezy.tests.test_branch.TestDefaultFormat.test_default_format_is_same_as_bzrdir_default
+breezy.tests.test_branch.TestDefaultFormat.test_get_set_default_format
 breezy.tests.test_branch.TestErrors.test_unstackable_branch_format
 breezy.tests.test_branch.TestHooks.test_constructor
 breezy.tests.test_branch.TestHooks.test_installed_hooks_are_BranchHooks
@@ -3745,8 +4161,11 @@
 breezy.tests.test_bzrdir.ChrootedTests.test_open_from_transport_bzrdir_in_parent
 breezy.tests.test_bzrdir.ChrootedTests.test_open_from_transport_no_bzrdir
 breezy.tests.test_bzrdir.NonLocalTests.test_create_branch_convenience_force_tree_not_local_fails
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_branch_and_repo_uses_default
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_create_standalone_working_tree
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_find_format
 breezy.tests.test_bzrdir.TestBzrDirFormat.test_find_format_nothing_there
+breezy.tests.test_bzrdir.TestBzrDirFormat.test_register_unregister_format
 breezy.tests.test_bzrdir.TestBzrDirHooks.test_post_repo_init
 breezy.tests.test_bzrdir.TestBzrDirHooks.test_post_repo_init_hook_repr
 breezy.tests.test_bzrdir.TestBzrDirHooks.test_pre_open_actual_exceptions_raised
@@ -3761,6 +4180,8 @@
 breezy.tests.test_bzrdir.TestBzrFormat.test_from_string_no_features
 breezy.tests.test_bzrdir.TestBzrFormat.test_from_string_with_feature
 breezy.tests.test_bzrdir.TestBzrFormat.test_from_string_with_spaces
+breezy.tests.test_bzrdir.TestBzrFormat.test_network_name
+breezy.tests.test_bzrdir.TestDefaultFormat.test_get_set_default_format
 breezy.tests.test_bzrdir.TestFormatRegistry.test_aliases
 breezy.tests.test_bzrdir.TestFormatRegistry.test_format_registry
 breezy.tests.test_bzrdir.TestFormatRegistry.test_get_help
@@ -3778,6 +4199,7 @@
 breezy.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_add_fallback_repo_handles_relative_urls
 breezy.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_determine_stacking_policy
 breezy.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_determine_stacking_policy_relative
+breezy.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_format_initialize_on_transport_ex_stacked_on
 breezy.tests.test_cache_utf8.TestEncodeCache.test_ascii
 breezy.tests.test_cache_utf8.TestEncodeCache.test_cached_unicode
 breezy.tests.test_cache_utf8.TestEncodeCache.test_cached_utf8
@@ -5068,6 +5490,7 @@
 breezy.tests.test_index.TestInMemoryGraphIndex.test_iter_nothing_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_key_count_empty
 breezy.tests.test_index.TestInMemoryGraphIndex.test_validate_empty
+breezy.tests.test_info.TestInfo.test_describe_branch_format
 breezy.tests.test_info.TestInfo.test_gather_location_bound
 breezy.tests.test_info.TestInfo.test_gather_location_controldir_only
 breezy.tests.test_info.TestInfo.test_gather_location_repo
@@ -5260,6 +5683,8 @@
 breezy.tests.test_inv.TestInventoryUpdates.test_add_path
 breezy.tests.test_inv.TestInventoryUpdates.test_add_path_of_root
 breezy.tests.test_inv.TestInventoryUpdates.test_add_recursive
+breezy.tests.test_inv.TestInventoryUpdates.test_copy
+breezy.tests.test_inv.TestInventoryUpdates.test_copy_copies_root_revision
 breezy.tests.test_inv.TestInventoryUpdates.test_copy_empty
 breezy.tests.test_inv.TestInventoryUpdates.test_create_tree_reference
 breezy.tests.test_inv.TestInventoryUpdates.test_creation_from_root_id
@@ -5627,6 +6052,7 @@
 breezy.tests.test_merge.TestLCAMultiWay.test_this_in_lca
 breezy.tests.test_merge.TestMerge.test_merge_inner_conflicts
 breezy.tests.test_merge.TestMerge.test_merge_type_registry
+breezy.tests.test_merge.TestMerge.test_merge_unrelated_retains_root
 breezy.tests.test_merge.TestPlanMerge.test__prune_tails
 breezy.tests.test_merge.TestPlanMerge.test__remove_external_references
 breezy.tests.test_merge.TestPlanMerge.test_subtract_plans
@@ -5988,14 +6414,37 @@
 breezy.tests.test_registry.TestRegistryWithDirs.test_lazy_import_get_module
 breezy.tests.test_registry.TestRegistryWithDirs.test_lazy_import_registry_foo
 breezy.tests.test_registry.TestRegistryWithDirs.test_normal_get_module
+breezy.tests.test_remote.TestBranchBreakLock.test_break_lock
+breezy.tests.test_remote.TestBranchFormat.test_get_format_description
+breezy.tests.test_remote.TestBranchGetParent.test_no_parent
+breezy.tests.test_remote.TestBranchGetParent.test_parent_absolute
+breezy.tests.test_remote.TestBranchGetParent.test_parent_relative
+breezy.tests.test_remote.TestBranchGetPhysicalLockStatus.test_get_physical_lock_status_no
+breezy.tests.test_remote.TestBranchGetPhysicalLockStatus.test_get_physical_lock_status_yes
+breezy.tests.test_remote.TestBranchGetTagsBytes.test_trivial
+breezy.tests.test_remote.TestBranchHeadsToFetch.test_uses_rpc_for_formats_with_non_default_heads_to_fetch
+breezy.tests.test_remote.TestBranchLastRevisionInfo.test_non_empty_branch
+breezy.tests.test_remote.TestBranchLockWrite.test_lock_write_unlockable
+breezy.tests.test_remote.TestBranchRevisionIdToRevno.test_dotted
+breezy.tests.test_remote.TestBranchRevisionIdToRevno.test_simple
+breezy.tests.test_remote.TestBranchSetLastRevisionInfo.test_no_such_revision
+breezy.tests.test_remote.TestBranchSetLastRevisionInfo.test_unexpected_error
+breezy.tests.test_remote.TestBranchSetParentLocation.test_no_parent
+breezy.tests.test_remote.TestBranchSetParentLocation.test_parent
+breezy.tests.test_remote.TestBranchSetTagsBytes.test_backwards_compatible
+breezy.tests.test_remote.TestBranchSetTagsBytes.test_trivial
+breezy.tests.test_remote.TestBzrDirCheckoutMetaDir.test__get_checkout_format
 breezy.tests.test_remote.TestBzrDirCheckoutMetaDir.test_unknown_format
+breezy.tests.test_remote.TestBzrDirCloningMetaDir.test_current_server
 breezy.tests.test_remote.TestBzrDirCloningMetaDir.test_unknown
+breezy.tests.test_remote.TestBzrDirCreateBranch.test_current_server
 breezy.tests.test_remote.TestBzrDirDestroyBranch.test_destroy_default
 breezy.tests.test_remote.TestBzrDirDestroyRepository.test_destroy_repository
 breezy.tests.test_remote.TestBzrDirFormatInitializeEx.test_error
 breezy.tests.test_remote.TestBzrDirFormatInitializeEx.test_success
 breezy.tests.test_remote.TestBzrDirHasWorkingTree.test_has_workingtree
 breezy.tests.test_remote.TestBzrDirHasWorkingTree.test_no_workingtree
+breezy.tests.test_remote.TestBzrDirOpenBranch.test_branch_present
 breezy.tests.test_remote.TestBzrDirOpenBranch.test__get_tree_branch
 breezy.tests.test_remote.TestBzrDirOpenBranch.test_old_server
 breezy.tests.test_remote.TestBzrDirOpenBranch.test_open_repository_sets_format_attributes
@@ -6038,9 +6487,12 @@
 breezy.tests.test_remote.TestRemoteSSHTransportAuthentication.test_uses_authentication_config
 breezy.tests.test_remote.TestRepositoryAddSignatureText.test_add_signature_text
 breezy.tests.test_remote.TestRepositoryBreakLock.test_break_lock
+breezy.tests.test_remote.TestRepositoryFormat.test_fast_delta
+breezy.tests.test_remote.TestRepositoryFormat.test_get_format_description
 breezy.tests.test_remote.TestRepositoryGetGraph.test_get_graph
 breezy.tests.test_remote.TestRepositoryGetParentMap.test_get_parent_map_unexpected_response
 breezy.tests.test_remote.TestRepositoryGetRevIdForRevno.test_history_incomplete
+breezy.tests.test_remote.TestRepositoryGetRevIdForRevno.test_history_incomplete_with_fallback
 breezy.tests.test_remote.TestRepositoryGetRevIdForRevno.test_nosuchrevision
 breezy.tests.test_remote.TestRepositoryGetRevIdForRevno.test_ok
 breezy.tests.test_remote.TestRepositoryGetRevisionGraph.test_no_such_revision
@@ -6085,6 +6537,8 @@
 breezy.tests.test_remote.TestTransportIsReadonly.test_false
 breezy.tests.test_remote.TestTransportIsReadonly.test_true
 breezy.tests.test_remote.TestTransportMkdir.test_permissiondenied
+breezy.tests.test_remote.TestWithCustomErrorHandler.test_no_context
+breezy.tests.test_remote.TestWithCustomErrorHandler.test_with_context
 breezy.tests.test_rename_map.TestRenameMap.test_add_edge_hashes
 breezy.tests.test_rename_map.TestRenameMap.test_find_directory_renames
 breezy.tests.test_rename_map.TestRenameMap.test_hitcounts
@@ -6093,6 +6547,7 @@
 breezy.tests.test_repository.Test2a.test_inconsistency_fatal
 breezy.tests.test_repository.Test2a.test_stream_source_to_gc
 breezy.tests.test_repository.Test2a.test_stream_source_to_non_gc
+breezy.tests.test_repository.TestDefaultFormat.test_get_set_default_format
 breezy.tests.test_repository.TestFeatures.test_open_with_missing_required_feature
 breezy.tests.test_repository.TestFeatures.test_open_with_present_feature
 breezy.tests.test_repository.TestInterRepository.test_get_default_inter_repository
@@ -6114,6 +6569,7 @@
 breezy.tests.test_repository.TestRepositoryFormatRegistry.test_register_unregister_format
 breezy.tests.test_repository.TestRepositoryFormat.test_find_format
 breezy.tests.test_repository.TestRepositoryFormat.test_find_format_no_repository
+breezy.tests.test_repository.TestRepositoryFormat.test_find_format_unknown_format
 breezy.tests.test_repository.TestRepositoryFormat.test_find_format_with_features
 breezy.tests.test_repository.TestRepositoryFormat.test_from_string
 breezy.tests.test_repository.TestRepositoryPackCollection.test_ensure_loaded_unlocked
@@ -6405,6 +6861,7 @@
 breezy.tests.test_selftest.TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree
 breezy.tests.test_selftest.TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format
 breezy.tests.test_selftest.TestTestCaseWithMemoryTransport.test_make_branch_builder
+breezy.tests.test_selftest.TestTestCaseWithMemoryTransport.test_make_branch_builder_with_format
 breezy.tests.test_selftest.TestTestCaseWithTransport.test_get_readonly_url_none
 breezy.tests.test_selftest.TestTestCaseWithTransport.test_is_directory
 breezy.tests.test_selftest.TestTestCloning.test_cloned_testcase_does_not_share_details
@@ -6450,6 +6907,7 @@
 breezy.tests.test_selftest.TestTransportScenarios.test_get_transport_permutations
 breezy.tests.test_selftest.TestTransportScenarios.test_scenarios_include_transport_class
 breezy.tests.test_selftest.TestTreeScenarios.test_scenarios
+breezy.tests.test_selftest.TestTreeShape.test_unicode_paths
 breezy.tests.test_selftest.TestUncollectedWarningsForked.test_additonal_decorator
 breezy.tests.test_selftest.TestUncollectedWarningsForked.test_exclude_pattern
 breezy.tests.test_selftest.TestUncollectedWarningsForked.test_matching_tests_first
@@ -6554,6 +7012,8 @@
 breezy.tests.test_smart.TestSmartServerRepositoryGetPhysicalLockStatus.test_with_write_lock
 breezy.tests.test_smart.TestSmartServerRepositoryIterFilesBytes.test_missing
 breezy.tests.test_smart.TestSmartServerRepositoryReconcile.test_reconcile
+breezy.tests.test_smart.TestSmartServerRequestBzrDirInitializeEx.test_initialized_dir
+breezy.tests.test_smart.TestSmartServerRequestBzrDirInitializeEx.test_missing_dir
 breezy.tests.test_smart.TestSmartServerRequestInitializeBzrDir.test_initialized_dir
 breezy.tests.test_smart.TestSmartServerRequestInitializeBzrDir.test_missing_dir
 breezy.tests.test_smart.TestSmartServerRequestOpenBzrDir_2_1.test_outside_root_client_path
@@ -7196,6 +7656,8 @@
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_uses_lockdir
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_with_subtree_supports_tree_references
 breezy.tests.test_workingtree.TestDefaultFormat.test_from_string
+breezy.tests.test_workingtree.TestDefaultFormat.test_get_set_default_format
+breezy.tests.test_workingtree.TestDefaultFormat.test_get_set_default_format_by_key
 breezy.tests.test_workingtree.TestDefaultFormat.test_open
 breezy.tests.test_workingtree.TestDefaultFormat.test_open_containing
 breezy.tests.test_workingtree.TestFindTrees.test_find_trees
@@ -7209,6 +7671,7 @@
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_extra_lazy
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_unregister_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_no_tree
+breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_unknown_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_with_features
 breezy.tests.test_wsgi.TestWSGI.test_construct
 breezy.tests.test_wsgi.TestWSGI.test_http_get_rejected