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

[Jelmer Vernooij]

Fix some more tests on Python 3.

Fix some more tests on Python 3.

This gets the number of failing tests on Python 3 to below 1000.

[Martin Packman (gz)]

Thanks! Couple of inline comments but nothing big.

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/land-brz/366/

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

Merging failed
https://ci.breezy-vcs.org/job/land-brz/369/

=== modified file 'breezy/archive/tar.py'
--- breezy/archive/tar.py	2018-07-02 00:47:32 +0000
+++ breezy/archive/tar.py	2018-08-01 02:20:36 +0000
@@ -190,7 +190,12 @@
         compressor = lzma.LZMACompressor(
                 options={"format": compression_format})
     else:
-        compressor = lzma.LZMACompressor(format=compression_format)
+        compressor = lzma.LZMACompressor(
+                format={
+                    'xz': lzma.FORMAT_XZ,
+                    'raw': lzma.FORMAT_RAW,
+                    'alone': lzma.FORMAT_ALONE,
+                }[compression_format])
 
     for chunk in tarball_generator(
             tree, root, subdir, force_mtime=force_mtime):
 
=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-07-24 20:32:24 +0000
+++ breezy/builtins.py	2018-08-01 02:20:36 +0000
@@ -3662,6 +3662,9 @@
                 my_message = set_commit_message(commit_obj)
                 if my_message is None:
                     start_message = generate_commit_message_template(commit_obj)
+                    if start_message is not None:
+                        start_message = start_message.encode(
+                                osutils.get_user_encoding())
                     my_message = edit_commit_message_encoded(text,
                         start_message=start_message)
                 if my_message is None:
@@ -4277,7 +4280,8 @@
         graph = branch1.repository.get_graph(branch2.repository)
         base_rev_id = graph.find_unique_lca(last1, last2)
 
-        self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
+        self.outf.write(gettext('merge base is revision %s\n') %
+                base_rev_id.decode('utf-8'))
 
 
 class cmd_merge(Command):
 
=== modified file 'breezy/bzr/debug_commands.py'
--- breezy/bzr/debug_commands.py	2018-03-30 14:10:12 +0000
+++ breezy/bzr/debug_commands.py	2018-08-01 02:20:36 +0000
@@ -28,6 +28,7 @@
     )
 from ..commands import Command
 from ..option import Option
+from ..sixish import PY3
 from . import (
     btree_index,
     )
@@ -113,5 +114,15 @@
                 refs_as_tuples = None
             else:
                 refs_as_tuples = static_tuple.as_tuples(refs)
-            as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
+            if PY3:
+                if refs_as_tuples is not None:
+                    refs_as_tuples = tuple(
+                        tuple(tuple(r.decode('utf-8') for r in t1) for t1 in t2)
+                        for t2 in refs_as_tuples)
+                as_tuple = (
+                        tuple([r.decode('utf-8') for r in node[1]]),
+                        node[2].decode('utf-8'),
+                        refs_as_tuples)
+            else:
+                as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
             self.outf.write('%s\n' % (as_tuple,))
 
=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2018-07-01 21:08:28 +0000
+++ breezy/bzr/dirstate.py	2018-08-01 02:20:36 +0000
@@ -1543,7 +1543,7 @@
         # expanding them recursively as needed.
         # At the same time, to reduce interface friction we convert the input
         # inventory entries to dirstate.
-        root_only = (b'', b'')
+        root_only = ('', '')
         # Accumulate parent references (path_utf8, id), to check for parentless
         # items or items placed under files/links/tree-references. We get
         # references from every item in the delta that is not a deletion and
 
=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2018-07-24 20:32:24 +0000
+++ breezy/bzr/inventory.py	2018-08-01 02:20:36 +0000
@@ -93,9 +93,9 @@
     >>> i = Inventory()
     >>> i.path2id('')
     'TREE_ROOT'
-    >>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
+    >>> i.add(InventoryDirectory(b'123', 'src', ROOT_ID))
     InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
-    >>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
+    >>> i.add(InventoryFile(b'2323', 'hello.c', parent_id='123'))
     InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None, revision=None)
     >>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
     >>> for ix, j in enumerate(i.iter_entries()):
@@ -216,12 +216,12 @@
         The filename must be a single component, relative to the
         parent directory; it cannot be a whole path or relative name.
 
-        >>> e = InventoryFile('123', 'hello.c', ROOT_ID)
+        >>> e = InventoryFile(b'123', 'hello.c', ROOT_ID)
         >>> e.name
         'hello.c'
         >>> e.file_id
         '123'
-        >>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
+        >>> e = InventoryFile(b'123', 'src/hello.c', ROOT_ID)
         Traceback (most recent call last):
         InvalidEntryName: Invalid entry name: src/hello.c
         """
 
=== modified file 'breezy/bzr/smart/branch.py'
--- breezy/bzr/smart/branch.py	2018-07-15 18:45:17 +0000
+++ breezy/bzr/smart/branch.py	2018-08-01 02:20:36 +0000
@@ -398,7 +398,8 @@
         except errors.UnlockableTransport:
             return FailedSmartServerResponse((b'UnlockableTransport',))
         except errors.LockFailed as e:
-            return FailedSmartServerResponse((b'LockFailed', str(e.lock), str(e.why)))
+            return FailedSmartServerResponse((b'LockFailed',
+                str(e.lock).encode('utf-8'), str(e.why).encode('utf-8')))
         if repo_token is None:
             repo_token = b''
         else:
 
=== modified file 'breezy/bzr/smart/repository.py'
--- breezy/bzr/smart/repository.py	2018-07-24 19:02:16 +0000
+++ breezy/bzr/smart/repository.py	2018-08-01 02:20:36 +0000
@@ -1030,7 +1030,8 @@
                 repository.resume_write_group([token.decode('utf-8') for token in write_group_tokens])
             except errors.UnresumableWriteGroup as e:
                 return FailedSmartServerResponse(
-                    (b'UnresumableWriteGroup', [token.encode('utf-8') for token in e.write_groups], e.reason))
+                    (b'UnresumableWriteGroup', [token.encode('utf-8') for token
+                        in e.write_groups], e.reason.encode('utf-8')))
             try:
                 repository.commit_write_group()
             except:
@@ -1056,7 +1057,7 @@
                 return FailedSmartServerResponse(
                     (b'UnresumableWriteGroup',
                         [token.encode('utf-8') for token in e.write_groups],
-                        e.reason))
+                        e.reason.encode('utf-8')))
                 repository.abort_write_group()
         return SuccessfulSmartServerResponse((b'ok', ))
 
@@ -1077,7 +1078,7 @@
                 return FailedSmartServerResponse(
                     (b'UnresumableWriteGroup',
                         [token.encode('utf-8') for token in e.write_groups],
-                        e.reason))
+                        e.reason.encode('utf-8')))
             else:
                 repository.suspend_write_group()
         return SuccessfulSmartServerResponse((b'ok', ))
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-06-29 16:08:03 +0000
+++ breezy/bzr/workingtree.py	2018-08-01 02:20:36 +0000
@@ -888,7 +888,7 @@
                     file_id = cache_utf8.encode(s.get("file_id"))
                     if not self.has_id(file_id):
                         continue
-                    text_hash = s.get("hash")
+                    text_hash = s.get("hash").encode('ascii')
                     path = self.id2path(file_id)
                     if text_hash == self.get_file_sha1(path, file_id):
                         merge_hashes[file_id] = text_hash
@@ -1342,7 +1342,7 @@
             # inv and file system)
             if after:
                 if not self.has_filename(to_rel):
-                    raise errors.BzrMoveFailedError(from_id, to_rel,
+                    raise errors.BzrMoveFailedError(from_rel, to_rel,
                         errors.NoSuchFile(path=to_rel,
                         extra="New file has not been created yet"))
                 only_change_inv = True
@@ -1391,7 +1391,7 @@
                     entry.from_tail, entry.from_parent_id,
                     entry.only_change_inv))
             except errors.BzrMoveFailedError as e:
-                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
+                raise errors.BzrMoveFailedError('', '', "Rollback failed."
                         " The working tree is in an inconsistent state."
                         " Please consider doing a 'bzr revert'."
                         " Error message is: %s" % e)
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2018-07-22 17:06:14 +0000
+++ breezy/bzr/workingtree_4.py	2018-08-01 02:20:36 +0000
@@ -685,7 +685,7 @@
                 raise errors.BzrMoveFailedError('', to_dir,
                     errors.NotADirectory(to_abs))
 
-            if to_entry[1][0][0] != 'd':
+            if to_entry[1][0][0] != b'd':
                 raise errors.BzrMoveFailedError('', to_dir,
                     errors.NotADirectory(to_abs))
 
 
=== modified file 'breezy/commands.py'
--- breezy/commands.py	2018-05-07 17:17:22 +0000
+++ breezy/commands.py	2018-08-01 02:20:36 +0000
@@ -26,6 +26,12 @@
 import os
 import sys
 
+from . import (
+    i18n,
+    option,
+    osutils,
+    )
+
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import errno
@@ -37,9 +43,6 @@
     cleanup,
     cmdline,
     debug,
-    i18n,
-    option,
-    osutils,
     trace,
     ui,
     )
@@ -54,6 +57,7 @@
 from .sixish import (
     string_types,
     text_type,
+    viewvalues,
     )
 
 
@@ -581,7 +585,7 @@
         # XXX: optparse implicitly rewraps the help, and not always perfectly,
         # so we get <https://bugs.launchpad.net/bzr/+bug/249908>.  -- mbp
         # 20090319
-        parser = option.get_optparser(self.options())
+        parser = option.get_optparser([v for k, v in sorted(self.options().items())])
         options = parser.format_option_help()
         # FIXME: According to the spec, ReST option lists actually don't
         # support options like --1.14 so that causes syntax errors (in Sphinx
@@ -890,7 +894,8 @@
     they take, and which commands will accept them.
     """
     # TODO: make it a method of the Command?
-    parser = option.get_optparser(command.options())
+    parser = option.get_optparser(
+            [v for k, v in sorted(command.options().items())])
     if alias_argv is not None:
         args = alias_argv + argv
     else:
 
=== modified file 'breezy/msgeditor.py'
--- breezy/msgeditor.py	2018-06-17 11:15:04 +0000
+++ breezy/msgeditor.py	2018-08-01 02:20:36 +0000
@@ -34,6 +34,7 @@
 from .errors import BzrError
 from .hooks import Hooks
 from .sixish import (
+    BytesIO,
     StringIO,
     )
 
@@ -171,12 +172,9 @@
         started = False
         msg = []
         lastline, nlines = 0, 0
-        # codecs.open() ALWAYS opens file in binary mode but we need text mode
-        # 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
-        f = open(msgfilename, 'rU')
-        try:
+        with codecs.open(msgfilename, mode='rb', encoding=osutils.get_user_encoding()) as f:
             try:
-                for line in codecs.getreader(osutils.get_user_encoding())(f):
+                for line in f:
                     stripped_line = line.strip()
                     # strip empty line before the log message starts
                     if not started:
@@ -195,8 +193,6 @@
                     msg.append(line)
             except UnicodeDecodeError:
                 raise BadCommitMessageEncoding()
-        finally:
-            f.close()
 
         if len(msg) == 0:
             return ""
@@ -238,18 +234,17 @@
     import tempfile
     tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
                                                dir=tmpdir, text=True)
-    msgfile = os.fdopen(tmp_fileno, 'w')
-    try:
+    with os.fdopen(tmp_fileno, 'wb') as msgfile:
         if start_message is not None:
-            msgfile.write("%s\n" % start_message)
+            msgfile.write(b"%s\n" % start_message)
 
         if infotext is not None and infotext != "":
             hasinfo = True
-            msgfile.write("\n\n%s\n\n%s" %(ignoreline, infotext))
+            trailer = b"\n\n%s\n\n%s" % (
+                ignoreline.encode(osutils.get_user_encoding()), infotext)
+            msgfile.write(trailer)
         else:
             hasinfo = False
-    finally:
-        msgfile.close()
 
     return (msgfilename, hasinfo)
 
@@ -288,11 +283,11 @@
     template = template.encode(output_encoding, "replace")
 
     if diff:
-        stream = StringIO()
+        stream = BytesIO()
         show_diff_trees(working_tree.basis_tree(),
                         working_tree, stream, specific_files,
                         path_encoding=output_encoding)
-        template = template + '\n' + stream.getvalue()
+        template = template + b'\n' + stream.getvalue()
 
     return template
 
 
=== modified file 'breezy/option.py'
--- breezy/option.py	2018-03-30 02:26:53 +0000
+++ breezy/option.py	2018-08-01 02:20:36 +0000
@@ -477,7 +477,7 @@
 
     parser = OptionParser()
     parser.remove_option('--help')
-    for option in options.values():
+    for option in options:
         option.add_option(parser, option.short_name())
     return parser
 
 
=== modified file 'breezy/plugins/bash_completion/bashcomp.py'
--- breezy/plugins/bash_completion/bashcomp.py	2018-07-14 19:22:44 +0000
+++ breezy/plugins/bash_completion/bashcomp.py	2018-08-01 02:20:36 +0000
@@ -369,7 +369,7 @@
 
     def option(self, opt):
         optswitches = {}
-        parser = option.get_optparser({opt.name: opt})
+        parser = option.get_optparser([opt])
         parser = self.wrap_parser(optswitches, parser)
         optswitches.clear()
         opt.add_option(parser, opt.short_name())
 
=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2018-07-27 19:05:18 +0000
+++ breezy/tests/__init__.py	2018-08-01 02:20:36 +0000
@@ -1286,9 +1286,9 @@
 
         A trailing newline is added if missing to make the strings
         print properly."""
-        if b and b[-1] != '\n':
+        if b and not b.endswith('\n'):
             b += '\n'
-        if a and a[-1] != '\n':
+        if a and not a.endswith('\n'):
             a += '\n'
         difflines = difflib.ndiff(a.splitlines(True),
                                   b.splitlines(True),
@@ -1325,9 +1325,9 @@
             return
         if message is None:
             message = "texts not equal:\n"
-        if a + '\n' == b:
+        if a + ('\n' if isinstance(a, text_type) else b'\n') == b:
             message = 'first string is missing a final newline.\n'
-        if a == b + '\n':
+        if a == b + ('\n' if isinstance(b, text_type) else b'\n'):
             message = 'second string is missing a final newline.\n'
         raise AssertionError(message +
                              self._ndiff_strings(a, b))
 
=== modified file 'breezy/tests/blackbox/test_cat_revision.py'
--- breezy/tests/blackbox/test_cat_revision.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/blackbox/test_cat_revision.py	2018-08-01 02:20:36 +0000
@@ -47,11 +47,11 @@
 
         for i in [1, 2, 3]:
             self.assertEqual(revs[i],
-                self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0])
-            self.assertEqual(revs[i],
-                self.run_bzr('cat-revision a@r-0-%d' % i)[0])
-            self.assertEqual(revs[i],
-                self.run_bzr('cat-revision -r %d' % i)[0])
+                self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0].encode('utf-8'))
+            self.assertEqual(revs[i],
+                self.run_bzr('cat-revision a@r-0-%d' % i)[0].encode('utf-8'))
+            self.assertEqual(revs[i],
+                self.run_bzr('cat-revision -r %d' % i)[0].encode('utf-8'))
 
     def test_cat_no_such_revid(self):
         tree = self.make_branch_and_tree('.')
 
=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2018-07-16 22:59:06 +0000
+++ breezy/tests/blackbox/test_commit.py	2018-08-01 02:20:36 +0000
@@ -810,7 +810,7 @@
         out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
             stdin="y\n")
         self.assertContainsRe(err,
-            b"brz: ERROR: Empty commit message specified")
+            "brz: ERROR: Empty commit message specified")
 
     def test_commit_hook_template_accepted(self):
         tree = self.setup_commit_with_template()
 
=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/blackbox/test_log.py	2018-08-01 02:20:36 +0000
@@ -485,7 +485,7 @@
         tree = self.make_linear_branch(format='dirstate-tags')
 
         log = self.run_bzr("log --signatures")[0]
-        self.assertTrue(b'signature: no signature' in log)
+        self.assertTrue('signature: no signature' in log)
 
     def test_log_without_signatures(self):
         self.requireFeature(features.gpg)
@@ -493,7 +493,7 @@
         tree = self.make_linear_branch(format='dirstate-tags')
 
         log = self.run_bzr("log")[0]
-        self.assertFalse(b'signature: no signature' in log)
+        self.assertFalse('signature: no signature' in log)
 
 
 class TestLogVerbose(TestLog):
 
=== modified file 'breezy/tests/blackbox/test_status.py'
--- breezy/tests/blackbox/test_status.py	2018-07-24 20:32:24 +0000
+++ breezy/tests/blackbox/test_status.py	2018-08-01 02:20:36 +0000
@@ -371,15 +371,15 @@
         out, err = self.run_bzr('status NONEXISTENT', retcode=3)
         self.assertEqual(expected, out.splitlines(True))
         self.assertContainsRe(err,
-                              br'.*ERROR: Path\(s\) do not exist: '
-                              b'NONEXISTENT.*')
+                              r'.*ERROR: Path\(s\) do not exist: '
+                              'NONEXISTENT.*')
         expected = [
           'X:   NONEXISTENT\n',
           ]
         out, err = self.run_bzr('status --short NONEXISTENT', retcode=3)
         self.assertContainsRe(err,
-                              br'.*ERROR: Path\(s\) do not exist: '
-                              b'NONEXISTENT.*')
+                              r'.*ERROR: Path\(s\) do not exist: '
+                              'NONEXISTENT.*')
 
     def test_status_nonexistent_file_with_others(self):
         # brz st [--short] NONEXISTENT ...others..
@@ -565,9 +565,9 @@
         self.build_tree(['bye.c'])
         wt.add('bye.c')
         self.assertStatus([
-                b'added:\n',
-                b'  bye.c\n',
-                b'1 shelf exists. See "brz shelve --list" for details.\n',
+                'added:\n',
+                '  bye.c\n',
+                '1 shelf exists. See "brz shelve --list" for details.\n',
             ],
             wt)
         self.run_bzr(['shelve', '--all', '-m', 'bar'])
@@ -575,15 +575,15 @@
         wt.add('eggs.c')
         wt.add('spam.c')
         self.assertStatus([
-                b'added:\n',
-                b'  eggs.c\n',
-                b'  spam.c\n',
-                b'2 shelves exist. See "brz shelve --list" for details.\n',
+                'added:\n',
+                '  eggs.c\n',
+                '  spam.c\n',
+                '2 shelves exist. See "brz shelve --list" for details.\n',
             ],
             wt)
         self.assertStatus([
-                b'added:\n',
-                b'  spam.c\n',
+                'added:\n',
+                '  spam.c\n',
             ],
             wt,
             specific_files=['spam.c'])
 
=== modified file 'breezy/tests/blackbox/test_testament.py'
--- breezy/tests/blackbox/test_testament.py	2018-07-17 23:40:50 +0000
+++ breezy/tests/blackbox/test_testament.py	2018-08-01 02:20:36 +0000
@@ -18,6 +18,7 @@
 
 import re
 
+from breezy.sixish import PY3
 from breezy.tests.test_testament import (
     osutils,
     REV_1_SHORT,
@@ -56,4 +57,6 @@
         self.assertEqualDiff(err, '')
         sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
         sha1 = sha1_re.search(short_out).group('sha1')
-        self.assertEqual(sha1, osutils.sha_string(long_out))
+        self.assertEqual(
+                sha1.encode('ascii'),
+                osutils.sha_string(long_out.encode('utf-8') if PY3 else long_out))
 
=== modified file 'breezy/tests/blackbox/test_version.py'
--- breezy/tests/blackbox/test_version.py	2018-07-24 20:32:24 +0000
+++ breezy/tests/blackbox/test_version.py	2018-08-01 02:20:36 +0000
@@ -21,6 +21,7 @@
 
 import breezy
 from breezy import osutils, trace
+from breezy.sixish import PY3
 from breezy.tests import (
     probe_unicode_in_user_encoding,
     TestCase,
@@ -95,7 +96,10 @@
             raise TestSkipped('Cannot find a unicode character that works in'
                               ' encoding %s' % (osutils.get_user_encoding(),))
 
-        self.overrideEnv('BRZ_HOME', str_val)
+        if PY3:
+            self.overrideEnv('BRZ_HOME', uni_val)
+        else:
+            self.overrideEnv('BRZ_HOME', str_val)
         self.permit_source_tree_branch_repo()
         out = self.run_bzr("version")[0]
         self.assertTrue(len(out) > 0)
 
=== modified file 'breezy/tests/per_branch/test_commit.py'
--- breezy/tests/per_branch/test_commit.py	2018-06-16 11:29:34 +0000
+++ breezy/tests/per_branch/test_commit.py	2018-08-01 02:20:36 +0000
@@ -150,7 +150,10 @@
         tree.lock_write()
         tree.add('')
         root_delta.added = [('', tree.path2id(''), 'directory')]
-        class PreCommitException(Exception): pass
+        class PreCommitException(Exception):
+            
+            def __init__(self, revid):
+                self.revid = revid
         def hook_func(local, master,
                       old_revno, old_revid, new_revno, new_revid,
                       tree_delta, future_tree):
@@ -163,7 +166,7 @@
         # so the commit is rolled back and revno unchanged
         err = self.assertRaises(PreCommitException, tree.commit, 'message')
         # we have to record the revid to use in assertEqual later
-        revids[0] = str(err)
+        revids[0] = err.revid
         # unregister all pre_commit hooks
         branch.Branch.hooks["pre_commit"] = []
         # and re-register the capture hook
 
=== modified file 'breezy/tests/per_branch/test_revision_id_to_revno.py'
--- breezy/tests/per_branch/test_revision_id_to_revno.py	2018-07-17 23:40:50 +0000
+++ breezy/tests/per_branch/test_revision_id_to_revno.py	2018-08-01 02:20:36 +0000
@@ -34,7 +34,7 @@
         self.assertEqual(3, the_branch.revision_id_to_revno(revmap['3']))
 
         self.assertRaises(errors.NoSuchRevision,
-                          the_branch.revision_id_to_revno, 'rev-none')
+                          the_branch.revision_id_to_revno, b'rev-none')
         # revision_id_to_revno is defined as returning only integer revision
         # numbers, so non-mainline revisions get NoSuchRevision raised
         self.assertRaises(errors.NoSuchRevision,
 
=== modified file 'breezy/tests/per_merger.py'
--- breezy/tests/per_merger.py	2018-06-24 13:18:43 +0000
+++ breezy/tests/per_merger.py	2018-08-01 02:20:36 +0000
@@ -238,7 +238,7 @@
         class HookSuccess(_mod_merge.AbstractPerFileMerger):
             def merge_contents(self, merge_params):
                 test.hook_log.append(('success',))
-                if merge_params.file_id == '1':
+                if merge_params.file_id == b'1':
                     return 'success', [b'text-merged-by-hook']
                 return 'not_applicable', None
         def hook_success_factory(merger):
@@ -251,7 +251,7 @@
         class HookConflict(_mod_merge.AbstractPerFileMerger):
             def merge_contents(self, merge_params):
                 test.hook_log.append(('conflict',))
-                if merge_params.file_id == '1':
+                if merge_params.file_id == b'1':
                     return ('conflicted',
                         [b'text-with-conflict-markers-from-hook'])
                 return 'not_applicable', None
@@ -265,7 +265,7 @@
         class HookDelete(_mod_merge.AbstractPerFileMerger):
             def merge_contents(self, merge_params):
                 test.hook_log.append(('delete',))
-                if merge_params.file_id == '1':
+                if merge_params.file_id == b'1':
                     return 'delete', None
                 return 'not_applicable', None
         def hook_delete_factory(merger):
@@ -310,8 +310,8 @@
         builder.change_contents(b"1", other=b"text4", this=b"text3")
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(conflicts, [])
-        self.assertEqual(
-            builder.this.get_file('name1').read(), b'text-merged-by-hook')
+        with builder.this.get_file('name1') as f:
+            self.assertEqual(f.read(), b'text-merged-by-hook')
 
     def test_change_vs_deleted(self):
         """Hook is used for (changed, deleted)"""
@@ -322,8 +322,8 @@
         builder.remove_file(b"1", other=True)
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(conflicts, [])
-        self.assertEqual(
-            builder.this.get_file('name1').read(), b'text-merged-by-hook')
+        with builder.this.get_file('name1') as f:
+            self.assertEqual(f.read(), b'text-merged-by-hook')
 
     def test_result_can_be_delete(self):
         """A hook's result can be the deletion of a file."""
@@ -344,9 +344,8 @@
         self.assertEqual(conflicts, [TextConflict('name1', file_id=b'1')])
         # The hook still gets to set the file contents in this case, so that it
         # can insert custom conflict markers.
-        self.assertEqual(
-            builder.this.get_file('name1').read(),
-            b'text-with-conflict-markers-from-hook')
+        with builder.this.get_file('name1') as f:
+            self.assertEqual(f.read(), b'text-with-conflict-markers-from-hook')
 
     def test_can_access_this_other_and_base_versions(self):
         """The hook function can call params.merger.get_lines to access the
@@ -368,8 +367,8 @@
         self.create_file_needing_contents_merge(builder, b"1")
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(conflicts, [])
-        self.assertEqual(
-            builder.this.get_file('name1').read(), b'text-merged-by-hook')
+        with builder.this.get_file('name1') as f:
+            self.assertEqual(f.read(), b'text-merged-by-hook')
         self.assertEqual([('inactive',), ('success',)], self.hook_log)
 
     def test_chain_when_not_applicable(self):
@@ -382,8 +381,8 @@
         self.create_file_needing_contents_merge(builder, b"1")
         conflicts = builder.merge(self.merge_type)
         self.assertEqual(conflicts, [])
-        self.assertEqual(
-            builder.this.get_file('name1').read(), b'text-merged-by-hook')
+        with builder.this.get_file('name1') as f:
+            self.assertEqual(f.read(), b'text-merged-by-hook')
         self.assertEqual([('no-op',), ('success',)], self.hook_log)
 
     def test_chain_stops_after_success(self):
 
=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2018-07-19 23:34:35 +0000
+++ breezy/tests/per_repository/test_repository.py	2018-08-01 02:20:36 +0000
@@ -543,9 +543,9 @@
         tree.add_parent_tree_id(b'ghost')
         rev2 = tree.commit('commit-with-ghost')
         graph = tree.branch.repository.get_graph()
-        parents = graph.get_parent_map(['ghost', rev2])
-        self.assertTrue('ghost' not in parents)
-        self.assertEqual(parents[rev2], (rev1, 'ghost'))
+        parents = graph.get_parent_map([b'ghost', rev2])
+        self.assertTrue(b'ghost' not in parents)
+        self.assertEqual(parents[rev2], (rev1, b'ghost'))
 
     def test_get_known_graph_ancestry(self):
         tree = self.make_branch_and_tree('here')
 
=== modified file 'breezy/tests/per_repository_reference/test_graph.py'
--- breezy/tests/per_repository_reference/test_graph.py	2018-06-16 11:29:34 +0000
+++ breezy/tests/per_repository_reference/test_graph.py	2018-08-01 02:20:36 +0000
@@ -57,7 +57,7 @@
         builder = self.make_branch_builder('source')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'directory', b'root-id', None))],
+            ('add', ('', b'root-id', 'directory', None))],
             revision_id=b'A')
         builder.build_snapshot([b'A'], [], revision_id=b'B')
         builder.build_snapshot([b'B'], [], revision_id=b'C')
@@ -101,18 +101,18 @@
         self.addCleanup(target_b.lock_write().unlock)
         self.setup_smart_server_with_call_log()
         res = target_b.repository.search_missing_revision_ids(
-                stacked_b.repository, revision_ids=['F'],
+                stacked_b.repository, revision_ids=[b'F'],
                 find_ghosts=False)
         self.assertParentMapCalls([
             # One call to stacked to start, which returns F=>E, and that E
             # itself is missing, so when we step, we won't look for it.
-            ('extra/stacked/', ['F']),
+            ('extra/stacked/', [b'F']),
             # One fallback call to extra/master, which will return the rest of
             # the history.
-            ('extra/master/', ['E']),
+            ('extra/master/', [b'E']),
             # And then one get_parent_map call to the target, to see if it
             # already has any of these revisions.
-            ('extra/target_repo/branch/', ['A', 'B', 'C', 'D', 'E', 'F']),
+            ('extra/target_repo/branch/', [b'A', b'B', b'C', b'D', b'E', b'F']),
             ])
         # Before bug #388269 was fixed, there would be a bunch of extra calls
         # to 'extra/stacked', ['D'] then ['C'], then ['B'], then ['A'].
 
=== modified file 'breezy/tests/per_tree/test_path_content_summary.py'
--- breezy/tests/per_tree/test_path_content_summary.py	2018-07-24 21:21:21 +0000
+++ breezy/tests/per_tree/test_path_content_summary.py	2018-08-01 02:20:36 +0000
@@ -122,7 +122,7 @@
             self.check_content_summary_size(tree, summary, 22)
             self.assertEqual(False, summary[2])
         self.assertSubset((summary[3],),
-            (None, '0c352290ae1c26ca7f97d5b2906c4624784abd60'))
+            (None, b'0c352290ae1c26ca7f97d5b2906c4624784abd60'))
 
     def test_file_content_summary_non_exec(self):
         tree = self.make_branch_and_tree('tree')
@@ -136,7 +136,7 @@
         self.assertEqual(False, summary[2])
         # may have hash,
         self.assertSubset((summary[3],),
-            (None, '0c352290ae1c26ca7f97d5b2906c4624784abd60'))
+            (None, b'0c352290ae1c26ca7f97d5b2906c4624784abd60'))
 
     def test_dir_content_summary(self):
         tree = self.make_branch_and_tree('tree')
 
=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2018-07-24 21:21:21 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2018-08-01 02:20:36 +0000
@@ -321,13 +321,13 @@
             self.assertEqual(expected[0], path) # Paths should match
             self.assertIsInstance(path, text_type)
             self.assertEqual(expected[1], ie.file_id)
-            self.assertIsInstance(ie.file_id, str)
+            self.assertIsInstance(ie.file_id, bytes)
             self.assertEqual(expected[2], ie.parent_id)
             if expected[2] is not None:
-                self.assertIsInstance(ie.parent_id, str)
+                self.assertIsInstance(ie.parent_id, bytes)
             # WorkingTree's return None for the last modified revision
             if ie.revision is not None:
-                self.assertIsInstance(ie.revision, str)
+                self.assertIsInstance(ie.revision, bytes)
                 if expected[0] != '':
                     # Some trees will preserve the revision id of the tree root,
                     # but not all will
@@ -335,10 +335,10 @@
         self.assertEqual(len(path_and_ids), len(path_entries))
         get_revision_id = getattr(tree, 'get_revision_id', None)
         if get_revision_id is not None:
-            self.assertIsInstance(get_revision_id(), str)
+            self.assertIsInstance(get_revision_id(), bytes)
         last_revision = getattr(tree, 'last_revision', None)
         if last_revision is not None:
-            self.assertIsInstance(last_revision(), str)
+            self.assertIsInstance(last_revision(), bytes)
 
     def test_tree_with_merged_utf8(self):
         wt = self.make_branch_and_tree('.')
 
=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2018-07-23 22:25:11 +0000
+++ breezy/tests/per_tree/test_tree.py	2018-08-01 02:20:36 +0000
@@ -358,7 +358,7 @@
             tree.get_file_verifier('file1'),
             tree.get_file_verifier('file2'))
         if kind == "SHA1":
-            expected = osutils.sha_strings(b'file content')
+            expected = osutils.sha_string(b'file content')
             self.assertEqual(expected, data)
 
 
 
=== modified file 'breezy/tests/per_workingtree/test_rename_one.py'
--- breezy/tests/per_workingtree/test_rename_one.py	2018-07-02 23:41:13 +0000
+++ breezy/tests/per_workingtree/test_rename_one.py	2018-08-01 02:20:36 +0000
@@ -86,7 +86,7 @@
                 tree.basis_tree(), tree,
                 [('', ''), ('b/', 'b/'), ('foo', 'a')])
         self.assertPathDoesNotExist('a')
-        self.assertFileEqual(a_contents, b'foo')
+        self.assertFileEqual(a_contents, 'foo')
 
     def test_rename_one_not_localdir(self):
         tree = self.make_branch_and_tree('tree')
@@ -100,7 +100,7 @@
                 tree.basis_tree(), tree,
                 [('', ''), ('b/', 'b/'), ('b/foo', 'a')])
         self.assertPathDoesNotExist('tree/a')
-        self.assertFileEqual(a_contents, b'tree/b/foo')
+        self.assertFileEqual(a_contents, 'tree/b/foo')
 
     def test_rename_one_subdir(self):
         tree = self.make_branch_and_tree('.')
@@ -116,7 +116,7 @@
                 tree.basis_tree(), tree,
                 [('', ''), ('b/', 'b/'), ('b/c', 'b/c'), ('b/d', 'a')])
         self.assertPathDoesNotExist('a')
-        self.assertFileEqual(a_contents, b'b/d')
+        self.assertFileEqual(a_contents, 'b/d')
 
     def test_rename_one_parent_dir(self):
         tree = self.make_branch_and_tree('.')
 
=== modified file 'breezy/tests/test_branch.py'
--- breezy/tests/test_branch.py	2018-06-29 15:36:29 +0000
+++ breezy/tests/test_branch.py	2018-08-01 02:20:36 +0000
@@ -40,7 +40,7 @@
     BzrBranchFormat5,
     )
 from ..sixish import (
-    BytesIO,
+    StringIO,
     )
 
 
@@ -115,7 +115,7 @@
         self.assertFileEqual(b"# comment\n"
                              b"[%s]\n"
                              b"push_location = foo\n"
-                             b"push_location:policy = norecurse\n" % local_path,
+                             b"push_location:policy = norecurse\n" % local_path.encode('utf-8'),
                              config.locations_config_filename())
 
     # TODO RBC 20051029 test getting a push location from a branch in a
@@ -688,15 +688,14 @@
         r.old_revno = 10
         r.new_revid = b"new-revid"
         r.new_revno = 20
-        f = BytesIO()
+        f = StringIO()
         r.report(f)
-        self.assertEqual(b"Now on revision 20.\n", f.getvalue())
-        self.assertEqual(b"Now on revision 20.\n", f.getvalue())
+        self.assertEqual("Now on revision 20.\n", f.getvalue())
 
     def test_report_unchanged(self):
         r = _mod_branch.PullResult()
         r.old_revid = b"same-revid"
         r.new_revid = b"same-revid"
-        f = BytesIO()
+        f = StringIO()
         r.report(f)
-        self.assertEqual(b"No revisions or tags to pull.\n", f.getvalue())
+        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
 
=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2018-06-22 02:21:40 +0000
+++ breezy/tests/test_conflicts.py	2018-08-01 02:20:36 +0000
@@ -1185,8 +1185,7 @@
     def setUp(self):
         super(TestResolveActionOption, self).setUp()
         self.options = [conflicts.ResolveActionOption()]
-        self.parser = option.get_optparser(dict((o.name, o)
-                                                for o in self.options))
+        self.parser = option.get_optparser(self.options)
 
     def parse(self, args):
         return self.parser.parse_args(args)
 
=== modified file 'breezy/tests/test_help.py'
--- breezy/tests/test_help.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_help.py	2018-08-01 02:20:36 +0000
@@ -58,10 +58,10 @@
 Usage:   brz WithSeeAlso
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 See also: bar, foo
 ''',
@@ -76,10 +76,10 @@
 Usage:   brz Demo
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 ''',
                            cmd_Demo())
@@ -89,7 +89,7 @@
             'Purpose: A sample command.\n'
             'Usage:   brz Demo')
         self.assertEndsWith(helptext,
-            '  -h, --help     Show help message.\n\n')
+            '  -v, --verbose  Display more information.\n\n')
 
     def test_command_with_additional_see_also(self):
         class cmd_WithSeeAlso(commands.Command):
@@ -99,9 +99,10 @@
         helptext = cmd.get_help_text(['gam'])
         self.assertEndsWith(
             helptext,
+            '  -h, --help     Show help message.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
+            '  --usage        Show usage message and options.\n'
             '  -v, --verbose  Display more information.\n'
-            '  -h, --help     Show help message.\n'
             '\n'
             'See also: bar, foo, gam\n')
 
@@ -112,9 +113,7 @@
         helptext = cmd.get_help_text(['gam'])
         self.assertEndsWith(
             helptext,
-            '  -q, --quiet    Only display errors and warnings.\n'
             '  -v, --verbose  Display more information.\n'
-            '  -h, --help     Show help message.\n'
             '\n'
             'See also: gam\n')
 
@@ -152,10 +151,10 @@
 Usage:   brz Demo
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 Examples:
     Example 1:
@@ -178,10 +177,10 @@
 :Usage:   brz Demo
 
 :Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 :Examples:
     Example 1::
@@ -220,10 +219,10 @@
 Usage:   brz Demo
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 Description:
   Blah blah blah.
@@ -241,10 +240,10 @@
 Usage:   brz Demo
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 See brz help Demo for more details and examples.
 
@@ -277,10 +276,10 @@
 Usage:   brz Demo
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 Description:
   Blah blah blah.
@@ -322,10 +321,10 @@
 
 
 Options:
+  -h, --help     Show help message.
+  -q, --quiet    Only display errors and warnings.
   --usage        Show usage message and options.
-  -q, --quiet    Only display errors and warnings.
   -v, --verbose  Display more information.
-  -h, --help     Show help message.
 
 Description:
   Blah blah blah.
@@ -367,10 +366,10 @@
 }}zz{{:Usage:   brz WithSeeAlso
 }}
 zz{{:Options:
+  -h, --help     zz{{Show help message.}}
+  -q, --quiet    zz{{Only display errors and warnings.}}
   --usage        zz{{Show usage message and options.}}
-  -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 zz{{:See also: bar, foo}}
 ''',
@@ -385,10 +384,10 @@
 }}zz{{:Usage:   brz Demo
 }}
 zz{{:Options:
+  -h, --help     zz{{Show help message.}}
+  -q, --quiet    zz{{Only display errors and warnings.}}
   --usage        zz{{Show usage message and options.}}
-  -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 ''',
                            cmd_Demo())
@@ -401,9 +400,10 @@
         helptext = cmd.get_help_text(['gam'])
         self.assertEndsWith(
             helptext, '''\
+  -h, --help     zz{{Show help message.}}
   -q, --quiet    zz{{Only display errors and warnings.}}
+  --usage        zz{{Show usage message and options.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 zz{{:See also: bar, foo, gam}}
 ''')
@@ -416,10 +416,10 @@
         self.assertEndsWith(
             helptext, '''\
 zz{{:Options:
+  -h, --help     zz{{Show help message.}}
+  -q, --quiet    zz{{Only display errors and warnings.}}
   --usage        zz{{Show usage message and options.}}
-  -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 zz{{:See also: gam}}
 ''')
@@ -449,10 +449,10 @@
 }}zz{{:Usage:   brz Demo
 }}
 zz{{:Options:
+  -h, --help     zz{{Show help message.}}
+  -q, --quiet    zz{{Only display errors and warnings.}}
   --usage        zz{{Show usage message and options.}}
-  -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 Description:
   zz{{zz{{Blah blah blah.}}
@@ -492,10 +492,10 @@
 
 }}
 zz{{:Options:
+  -h, --help     zz{{Show help message.}}
+  -q, --quiet    zz{{Only display errors and warnings.}}
   --usage        zz{{Show usage message and options.}}
-  -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
-  -h, --help     zz{{Show help message.}}
 }}
 Description:
   zz{{zz{{Blah blah blah.}}
 
=== modified file 'breezy/tests/test_https_urllib.py'
--- breezy/tests/test_https_urllib.py	2017-07-21 13:20:17 +0000
+++ breezy/tests/test_https_urllib.py	2018-08-01 02:20:36 +0000
@@ -65,15 +65,15 @@
 class CertReqsConfigTests(tests.TestCaseInTempDir):
 
     def test_default(self):
-        stack = config.MemoryStack("")
+        stack = config.MemoryStack(b"")
         self.assertEqual(ssl.CERT_REQUIRED, stack.get("ssl.cert_reqs"))
 
     def test_from_string(self):
-        stack = config.MemoryStack("ssl.cert_reqs = none\n")
+        stack = config.MemoryStack(b"ssl.cert_reqs = none\n")
         self.assertEqual(ssl.CERT_NONE, stack.get("ssl.cert_reqs"))
-        stack = config.MemoryStack("ssl.cert_reqs = required\n")
+        stack = config.MemoryStack(b"ssl.cert_reqs = required\n")
         self.assertEqual(ssl.CERT_REQUIRED, stack.get("ssl.cert_reqs"))
-        stack = config.MemoryStack("ssl.cert_reqs = invalid\n")
+        stack = config.MemoryStack(b"ssl.cert_reqs = invalid\n")
         self.assertRaises(config.ConfigOptionValueError, stack.get,
                           "ssl.cert_reqs")
 
 
=== modified file 'breezy/tests/test_matchers.py'
--- breezy/tests/test_matchers.py	2018-06-14 12:13:00 +0000
+++ breezy/tests/test_matchers.py	2018-08-01 02:20:36 +0000
@@ -19,6 +19,7 @@
 from testtools.matchers import *
 
 from ..bzr.smart.client import CallHookParams
+from ..sixish import PY3
 
 from . import (
     CapturedCall,
@@ -132,9 +133,14 @@
         t.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
         mismatch = HasLayout(['a']).match(t)
         self.assertIsNot(None, mismatch)
-        self.assertEqual(
-            set(("[u'', u'a', u'b/', u'b/c']", "['a']")),
-            set(mismatch.describe().split(" != ")))
+        if PY3:
+            self.assertEqual(
+                set(("['', 'a', 'b/', 'b/c']", "['a']")),
+                set(mismatch.describe().split(" != ")))
+        else:
+            self.assertEqual(
+                set(("[u'', u'a', u'b/', u'b/c']", "['a']")),
+                set(mismatch.describe().split(" != ")))
 
     def test_no_dirs(self):
         # Some tree/repository formats do not support versioned directories
@@ -146,9 +152,14 @@
         self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c', 'd/']).match(t))
         mismatch = HasLayout([u'', u'a', u'd/']).match(t)
         self.assertIsNot(None, mismatch)
-        self.assertEqual(
-            set(("[u'', u'a', u'b/', u'b/c']", "[u'', u'a']")),
-            set(mismatch.describe().split(" != ")))
+        if PY3:
+            self.assertEqual(
+                set(("['', 'a', 'b/', 'b/c']", "['', 'a']")),
+                set(mismatch.describe().split(" != ")))
+        else:
+            self.assertEqual(
+                set(("[u'', u'a', u'b/', u'b/c']", "[u'', u'a']")),
+                set(mismatch.describe().split(" != ")))
 
 
 class TestHasPathRelations(TestCaseWithTransport):
@@ -196,13 +207,14 @@
         self.assertIs(None, ContainsNoVfsCalls().match(calls))
 
     def test_match(self):
-        calls = [self._make_call("append", ["file"]),
-                 self._make_call("Branch.get_config_file", [])]
+        calls = [self._make_call(b"append", [b"file"]),
+                 self._make_call(b"Branch.get_config_file", [])]
         mismatch = ContainsNoVfsCalls().match(calls)
         self.assertIsNot(None, mismatch)
         self.assertEqual([calls[0].call], mismatch.vfs_calls)
-        self.assertEqual("no VFS calls expected, got: append('file')""",
-                mismatch.describe())
+        self.assertIn(mismatch.describe(), [
+                "no VFS calls expected, got: b'append'(b'file')",
+                "no VFS calls expected, got: append('file')"])
 
 
 class TestRevisionHistoryMatches(TestCaseWithTransport):
@@ -216,14 +228,19 @@
         tree = self.make_branch_and_tree('.')
         tree.commit('msg1', rev_id=b'a')
         tree.commit('msg2', rev_id=b'b')
-        matcher = RevisionHistoryMatches(['a', 'b'])
+        matcher = RevisionHistoryMatches([b'a', b'b'])
         self.assertIs(None, matcher.match(tree.branch))
 
     def test_mismatch(self):
         tree = self.make_branch_and_tree('.')
         tree.commit('msg1', rev_id=b'a')
         tree.commit('msg2', rev_id=b'b')
-        matcher = RevisionHistoryMatches(['a', 'b', 'c'])
-        self.assertEqual(
-            set(("['a', 'b']", "['a', 'b', 'c']")),
-            set(matcher.match(tree.branch).describe().split(" != ")))
+        matcher = RevisionHistoryMatches([b'a', b'b', b'c'])
+        if PY3:
+            self.assertEqual(
+                set(("[b'a', b'b']", "[b'a', b'b', b'c']")),
+                set(matcher.match(tree.branch).describe().split(" != ")))
+        else:
+            self.assertEqual(
+                set(("['a', 'b']", "['a', 'b', 'c']")),
+                set(matcher.match(tree.branch).describe().split(" != ")))
 
=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2018-07-15 18:45:17 +0000
+++ breezy/tests/test_memorytree.py	2018-08-01 02:20:36 +0000
@@ -48,8 +48,8 @@
         tree = MemoryTree.create_on_branch(branch)
         tree.lock_read()
         self.assertEqual([rev_id], tree.get_parent_ids())
-        self.assertEqual('contents of foo\n',
-            tree.get_file('foo').read())
+        with tree.get_file('foo') as f:
+            self.assertEqual(b'contents of foo\n', f.read())
         tree.unlock()
 
     def test_get_root_id(self):
 
=== modified file 'breezy/tests/test_msgeditor.py'
--- breezy/tests/test_msgeditor.py	2018-06-19 01:27:34 +0000
+++ breezy/tests/test_msgeditor.py	2018-08-01 02:20:36 +0000
@@ -130,7 +130,7 @@
                                                         diff=True,
                                                         output_encoding='utf8')
 
-        self.assertTrue("""\
+        self.assertTrue(b"""\
 @@ -0,0 +1,1 @@
 +contents of hello
 """ in template)
@@ -166,26 +166,26 @@
             '"%s"' % self.make_do_nothing_editor('name with spaces'))
         self.assertEqual(True, msgeditor._run_editor('a_filename'))    
 
-    def make_fake_editor(self, message='test message from fed\\n'):
+    def make_fake_editor(self, message='test message from fed\n'):
         """Set up environment so that an editor will be a known script.
 
         Sets up BRZ_EDITOR so that if an editor is spawned it will run a
         script that just adds a known message to the start of the file.
         """
-        with open('fed.py', 'wb') as f:
-            f.write(b'#!%s\n' % sys.executable)
-            f.write(b"""\
+        if not isinstance(message, bytes):
+            message = message.encode('utf-8')
+        with open('fed.py', 'w') as f:
+            f.write('#!%s\n' % sys.executable)
+            f.write("""\
 # coding=utf-8
 import sys
 if len(sys.argv) == 2:
     fn = sys.argv[1]
-    f = open(fn, 'rb')
-    s = f.read()
-    f.close()
-    f = open(fn, 'wb')
-    f.write('%s')
-    f.write(s)
-    f.close()
+    with open(fn, 'rb') as f:
+        s = f.read()
+    with open(fn, 'wb') as f:
+        f.write(%r)
+        f.write(s)
 """ % (message, ))
         if sys.platform == "win32":
             # [win32] make batch file and set BRZ_EDITOR
@@ -252,7 +252,8 @@
             editor = 'rm'
         self.overrideEnv('BRZ_EDITOR', editor)
 
-        self.assertRaises((IOError, OSError), msgeditor.edit_commit_message, '')
+        self.assertRaises((EnvironmentError, errors.NoSuchFile),
+                msgeditor.edit_commit_message, '')
 
     def test__get_editor(self):
         self.overrideEnv('BRZ_EDITOR', 'bzr_editor')
@@ -304,7 +305,7 @@
         # check that commit template written properly
         # and has platform native line-endings (CRLF on win32)
         create_file = msgeditor._create_temp_file_with_commit_template
-        msgfilename, hasinfo = create_file('infotext', '----', 'start message')
+        msgfilename, hasinfo = create_file(b'infotext', '----', b'start message')
         self.assertNotEqual(None, msgfilename)
         self.assertTrue(hasinfo)
         expected = os.linesep.join(['start message',
@@ -322,7 +323,7 @@
             os.mkdir(tmpdir)
             # Force the creation of temp file in a directory whose name
             # requires some encoding support
-            msgeditor._create_temp_file_with_commit_template('infotext',
+            msgeditor._create_temp_file_with_commit_template(b'infotext',
                                                              tmpdir=tmpdir)
         else:
             raise TestNotApplicable('Test run elsewhere with non-ascii data.')
 
=== modified file 'breezy/tests/test_options.py'
--- breezy/tests/test_options.py	2018-07-07 17:57:42 +0000
+++ breezy/tests/test_options.py	2018-08-01 02:20:36 +0000
@@ -31,7 +31,7 @@
 
 
 def parse(options, args):
-    parser = option.get_optparser(dict((o.name, o) for o in options))
+    parser = option.get_optparser(options)
     return parser.parse_args(args)
 
 
@@ -93,7 +93,7 @@
         self.assertEqual((['-']), parse_args(cmd_commit(), ['-'])[0])
 
     def parse(self, options, args):
-        parser = option.get_optparser(dict((o.name, o) for o in options))
+        parser = option.get_optparser(options)
         return parser.parse_args(args)
 
     def test_conversion(self):
@@ -198,7 +198,7 @@
         registry.set_default('one')
         options = [option.RegistryOption('format', 'format help', registry,
                    str, value_switches=True, title='Formats')]
-        parser = option.get_optparser(dict((o.name, o) for o in options))
+        parser = option.get_optparser(options)
         value = parser.format_option_help()
         self.assertContainsRe(value, 'format.*format help')
         self.assertContainsRe(value, 'one.*one help')
@@ -271,7 +271,7 @@
     """Tests for ListOption, used to specify lists on the command-line."""
 
     def parse(self, options, args):
-        parser = option.get_optparser(dict((o.name, o) for o in options))
+        parser = option.get_optparser(options)
         return parser.parse_args(args)
 
     def test_list_option(self):
@@ -421,7 +421,8 @@
         self.assertEqual(level, option._verbosity_level)
 
     def test_verbose_quiet_linkage(self):
-        parser = option.get_optparser(option.Option.STD_OPTIONS)
+        parser = option.get_optparser(
+                [v for k, v in sorted(option.Option.STD_OPTIONS.items())])
         self.check(parser, 0, [])
         self.check(parser, 1, ['-v'])
         self.check(parser, 2, ['-v', '-v'])
 
=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/test_remote.py	2018-08-01 02:20:36 +0000
@@ -3941,7 +3941,7 @@
         # the public implementation of get_parent_map obeys stacking
         _, branch = self.prepare_stacked_remote_branch()
         repo = branch.repository
-        self.assertEqual({'rev1'}, set(repo.get_parent_map([b'rev1'])))
+        self.assertEqual({b'rev1'}, set(repo.get_parent_map([b'rev1'])))
 
     def test_unstacked_get_parent_map(self):
         # _unstacked_provider.get_parent_map ignores stacking
 
=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2018-07-24 21:44:05 +0000
+++ breezy/tests/test_repository.py	2018-08-01 02:20:36 +0000
@@ -280,11 +280,12 @@
         # empty weaves directory
         # a 'shared-storage' marker file.
         t = control.get_repository_transport(None)
-        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
-                             t.get('format').read())
+        with t.get('format') as f:
+            self.assertEqualDiff(b'Bazaar-NG Knit Repository Format 1',
+                                 f.read())
         # XXX: no locks left when unlocked at the moment
         # self.assertEqualDiff('', t.get('lock').read())
-        self.assertEqualDiff('', t.get('shared-storage').read())
+        self.assertEqualDiff(b'', t.get('shared-storage').read())
         self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
         self.check_knits(t)
 
@@ -300,8 +301,9 @@
         # empty weaves directory
         # a 'shared-storage' marker file.
         t = control.get_repository_transport(None)
-        self.assertEqualDiff(b'Bazaar-NG Knit Repository Format 1',
-                             t.get('format').read())
+        with t.get('format') as f:
+            self.assertEqualDiff(b'Bazaar-NG Knit Repository Format 1',
+                                 f.read())
         # XXX: no locks left when unlocked at the moment
         # self.assertEqualDiff('', t.get('lock').read())
         self.assertEqualDiff(b'', t.get('shared-storage').read())
@@ -953,7 +955,7 @@
         repo.add_revision(revision_id, revision, inv)
 
     def add_file(self, repo, inv, filename, revision, parents):
-        file_id = filename + b'-id'
+        file_id = filename.encode('utf-8') + b'-id'
         entry = inventory.InventoryFile(file_id, filename, b'TREE_ROOT')
         entry.revision = revision
         entry.text_size = 0
@@ -1321,7 +1323,7 @@
         packs.pack_distribution = lambda x: [10]
         r.start_write_group()
         r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
-            ('bogus-rev',), (), None, 'bogus-content\n')])
+            (b'bogus-rev',), (), None, b'bogus-content\n')])
         # This should trigger an autopack, which will combine everything into a
         # single pack file.
         new_names = r.commit_write_group()
 
=== modified file 'breezy/tests/test_revisionspec.py'
--- breezy/tests/test_revisionspec.py	2018-07-07 19:27:38 +0000
+++ breezy/tests/test_revisionspec.py	2018-08-01 02:20:36 +0000
@@ -140,7 +140,7 @@
 
     def _match_on(self, branch, revs):
         if self.spec == "bork":
-            return RevisionInfo.from_revision_id(branch, "r1")
+            return RevisionInfo.from_revision_id(branch, b"r1")
         else:
             raise errors.InvalidRevisionSpec(self.spec, branch)
 
@@ -245,8 +245,9 @@
         try:
             int('X')
         except ValueError as e:
-            pass
-        self.assertInvalid('revno:X', extra='\n' + str(e))
+            self.assertInvalid('revno:X', extra='\n' + str(e))
+        else:
+            self.fail()
 
     def test_missing_number_and_branch(self):
         self.assertInvalid('revno::',
@@ -256,8 +257,9 @@
         try:
             int('X')
         except ValueError as e:
-            pass
-        self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
+            self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
+        else:
+            self.fail()
 
     def test_non_exact_branch(self):
         # It seems better to require an exact path to the branch
@@ -465,7 +467,7 @@
     def test_alt_no_parents(self):
         new_tree = self.make_branch_and_tree('new_tree')
         new_tree.commit('first', rev_id=b'new_r1')
-        self.tree.branch.fetch(new_tree.branch, 'new_r1')
+        self.tree.branch.fetch(new_tree.branch, b'new_r1')
         self.assertInHistoryIs(0, b'null:', 'before:revid:new_r1')
 
     def test_as_revision_id(self):
 
=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/test_smart.py	2018-08-01 02:20:36 +0000
@@ -184,11 +184,11 @@
     def test_translate_client_path_vfs(self):
         """VfsRequests receive escaped paths rather than raw UTF-8."""
         transport = self.get_transport()
-        request = vfs.VfsRequest(transport, b'foo/')
+        request = vfs.VfsRequest(transport, 'foo/')
         e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'
         escaped = urlutils.escape(u'foo/' + e_acute)
-        self.assertEqual(b'./' + urlutils.escape(e_acute).encode('utf-8'),
-                         request.translate_client_path(escaped))
+        self.assertEqual('./' + urlutils.escape(e_acute),
+                         request.translate_client_path(escaped.encode('ascii')))
 
     def test_transport_from_client_path(self):
         transport = self.get_transport()
@@ -272,7 +272,7 @@
         request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
         request = request_class(backing)
         expected = smart_req.SuccessfulSmartServerResponse((b'ok',))
-        self.assertEqual(expected, request.execute(b'', "branchname"))
+        self.assertEqual(expected, request.execute(b'', b"branchname"))
 
     def test_destroy_branch_missing(self):
         """An error is raised if the branch didn't exist."""
@@ -2470,7 +2470,7 @@
         request = vfs.GetRequest(backing)
         backing.put_bytes_non_atomic(filename_escaped, b'contents')
         self.assertEqual(smart_req.SmartServerResponse((b'ok', ), b'contents'),
-            request.execute(filename_escaped))
+            request.execute(filename_escaped.encode('ascii')))
 
 
 class TestHandlers(tests.TestCase):
@@ -2776,5 +2776,5 @@
         self.assertTrue(response.is_successful())
         self.assertEqual(response.args, (b"ok", ))
         self.assertEqual(
-                [['somerev', 'somecontents\n'], ['somerev', 'morecontents\n']],
+                [[b'somerev', b'somecontents\n'], [b'somerev', b'morecontents\n']],
                 bencode.bdecode(response.body))
 
=== modified file 'breezy/tests/test_smart_transport.py'
--- breezy/tests/test_smart_transport.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/test_smart_transport.py	2018-08-01 02:20:36 +0000
@@ -893,9 +893,9 @@
         utf8_filename = u'testfile\N{INTERROBANG}'.encode('utf-8')
         # VFS requests use filenames, not raw UTF-8.
         hpss_path = urlutils.quote_from_bytes(utf8_filename)
-        transport.put_bytes(utf8_filename, b'contents\nof\nfile\n')
+        transport.put_bytes(hpss_path, b'contents\nof\nfile\n')
         server, from_server = self.create_pipe_context(
-                b'get\001' + hpss_path + b'\n', transport)
+                b'get\001' + hpss_path.encode('ascii') + b'\n', transport)
         smart_protocol = protocol.SmartServerRequestProtocolOne(transport,
                 from_server.write)
         server._serve_one_request(smart_protocol)
 
=== modified file 'breezy/tests/test_symbol_versioning.py'
--- breezy/tests/test_symbol_versioning.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_symbol_versioning.py	2018-08-01 02:20:36 +0000
@@ -206,12 +206,18 @@
 
     def test_deprecation_string(self):
         """We can get a deprecation string for a method or function."""
-        self.assertEqual('breezy.tests.test_symbol_versioning.'
-            'TestDeprecationWarnings.test_deprecation_string was deprecated in '
-            'version 0.11.0.',
-            symbol_versioning.deprecation_string(
+        err_message = symbol_versioning.deprecation_string(
             self.test_deprecation_string,
-            deprecated_in((0, 11, 0))))
+            deprecated_in((0, 11, 0)))
+        self.assertIn(err_message,
+                ('breezy.tests.test_symbol_versioning.'
+                 'TestDeprecationWarnings.test_deprecation_string was deprecated in '
+                 'version 0.11.0.',
+                 'breezy.tests.test_symbol_versioning.TestDeprecationWarnings.'
+                 'test_deprecation_string was deprecated in '
+                 'version 0.11.0.')
+            )
+
         self.assertEqual('breezy.symbol_versioning.deprecated_function was '
             'deprecated in version 0.11.0.',
             symbol_versioning.deprecation_string(
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2018-07-24 20:54:31 +0000
+++ breezy/tests/test_transform.py	2018-08-01 02:20:36 +0000
@@ -14,6 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import codecs
 import errno
 import os
 import sys
@@ -1768,11 +1769,11 @@
         self.assertEqual(this.wt.get_file('i.OTHER').read(),
                          b'h\ni\nj\nk\n')
         self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
-        modified = ['a', 'b', 'c', 'h', 'i']
+        modified = [b'a', b'b', b'c', b'h', b'i']
         merge_modified = this.wt.merge_modified()
         self.assertSubset(merge_modified, modified)
         self.assertEqual(len(merge_modified), len(modified))
-        with open(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write(b'booga')
+        with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f: f.write(b'booga')
         modified.pop(0)
         merge_modified = this.wt.merge_modified()
         self.assertSubset(merge_modified, modified)
@@ -2188,7 +2189,8 @@
             filters._reset_registry(original_registry)
         self.addCleanup(restore_registry)
         def rot13(chunks, context=None):
-            return [b''.join(chunks).encode('rot13')]
+            return [codecs.encode(chunk.decode('ascii'), 'rot13').encode('ascii')
+                    for chunk in chunks]
         rot13filter = filters.ContentFilter(rot13, rot13)
         filters.filter_stacks_registry.register(
             'rot13', {'yes': [rot13filter]}.get)
 
=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2018-03-25 00:39:16 +0000
+++ breezy/tests/test_tree.py	2018-08-01 02:20:36 +0000
@@ -401,27 +401,27 @@
         self.assertWalkerNext(u'c/e', b'a-id', True, [u'a', u'a'], iterator)
         self.assertRaises(StopIteration, next, iterator)
 
-    def assertCmpByDirblock(self, cmp_val, path1, path2):
-        self.assertEqual(cmp_val,
-            _mod_tree.MultiWalker._cmp_path_by_dirblock(path1, path2))
+    def assertLtByDirblock(self, lt_val, path1, path2):
+        self.assertEqual(lt_val,
+            _mod_tree.MultiWalker._lt_path_by_dirblock(path1, path2))
 
-    def test__cmp_path_by_dirblock(self):
+    def test__lt_path_by_dirblock(self):
         # We only support Unicode strings at this point
         self.assertRaises(TypeError,
-            _mod_tree.MultiWalker._cmp_path_by_dirblock, '', 'b')
-        self.assertCmpByDirblock(0, u'', u'')
-        self.assertCmpByDirblock(0, u'a', u'a')
-        self.assertCmpByDirblock(0, u'a/b', u'a/b')
-        self.assertCmpByDirblock(0, u'a/b/c', u'a/b/c')
-        self.assertCmpByDirblock(1, u'a-a', u'a')
-        self.assertCmpByDirblock(-1, u'a-a', u'a/a')
-        self.assertCmpByDirblock(-1, u'a=a', u'a/a')
-        self.assertCmpByDirblock(1, u'a-a/a', u'a/a')
-        self.assertCmpByDirblock(1, u'a=a/a', u'a/a')
-        self.assertCmpByDirblock(1, u'a-a/a', u'a/a/a')
-        self.assertCmpByDirblock(1, u'a=a/a', u'a/a/a')
-        self.assertCmpByDirblock(1, u'a-a/a/a', u'a/a/a')
-        self.assertCmpByDirblock(1, u'a=a/a/a', u'a/a/a')
+            _mod_tree.MultiWalker._lt_path_by_dirblock, b'', b'b')
+        self.assertLtByDirblock(False, u'', u'')
+        self.assertLtByDirblock(False, u'a', u'a')
+        self.assertLtByDirblock(False, u'a/b', u'a/b')
+        self.assertLtByDirblock(False, u'a/b/c', u'a/b/c')
+        self.assertLtByDirblock(False, u'a-a', u'a')
+        self.assertLtByDirblock(True, u'a-a', u'a/a')
+        self.assertLtByDirblock(True, u'a=a', u'a/a')
+        self.assertLtByDirblock(False, u'a-a/a', u'a/a')
+        self.assertLtByDirblock(False, u'a=a/a', u'a/a')
+        self.assertLtByDirblock(False, u'a-a/a', u'a/a/a')
+        self.assertLtByDirblock(False, u'a=a/a', u'a/a/a')
+        self.assertLtByDirblock(False, u'a-a/a/a', u'a/a/a')
+        self.assertLtByDirblock(False, u'a=a/a/a', u'a/a/a')
 
     def assertPathToKey(self, expected, path):
         self.assertEqual(expected, _mod_tree.MultiWalker._path_to_key(path))
 
=== modified file 'breezy/tests/test_treeshape.py'
--- breezy/tests/test_treeshape.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/test_treeshape.py	2018-08-01 02:20:36 +0000
@@ -35,7 +35,7 @@
             ])
         self.assertPathExists('foo')
         self.assertPathExists('.bzr/README')
-        self.assertFileEqual('hello', b'.bzr/README')
+        self.assertFileEqual(b'hello', '.bzr/README')
 
     def test_build_tree_symlink(self):
         self.requireFeature(features.SymlinkFeature)
 
=== modified file 'breezy/tests/test_workingtree.py'
--- breezy/tests/test_workingtree.py	2018-05-20 14:22:26 +0000
+++ breezy/tests/test_workingtree.py	2018-08-01 02:20:36 +0000
@@ -186,10 +186,10 @@
             bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string, branch.controldir)
         transport = branch.controldir.get_workingtree_transport(None)
         transport.mkdir('.')
-        transport.put_bytes("format", "some format name")
+        transport.put_bytes("format", b"some format name")
         # The format does not have to be known by Bazaar,
         # find_format_string just retrieves the name
-        self.assertEqual("some format name",
+        self.assertEqual(b"some format name",
             bzrworkingtree.WorkingTreeFormatMetaDir.find_format_string(branch.controldir))
 
     def test_find_format(self):
 
=== modified file 'breezy/transport/remote.py'
--- breezy/transport/remote.py	2018-07-20 00:03:59 +0000
+++ breezy/transport/remote.py	2018-08-01 02:20:36 +0000
@@ -473,7 +473,7 @@
     def iter_files_recursive(self):
         resp = self._call2(b'iter_files_recursive', self._remote_path(''))
         if resp[0] == b'names':
-            return resp[1:]
+            return [name.decode('utf-8') if PY3 else name for name in resp[1:]]
         raise errors.UnexpectedSmartServerResponse(resp)
 
 
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-06-22 01:22:25 +0000
+++ breezy/tree.py	2018-08-01 02:20:36 +0000
@@ -1145,7 +1145,7 @@
             return True, path, ie
 
     @staticmethod
-    def _cmp_path_by_dirblock(path1, path2):
+    def _lt_path_by_dirblock(path1, path2):
         """Compare two paths based on what directory they are in.
 
         This generates a sort order, such that all children of a directory are
@@ -1160,7 +1160,7 @@
         """
         # Shortcut this special case
         if path1 == path2:
-            return 0
+            return False
         # This is stolen from _dirstate_helpers_py.py, only switching it to
         # Unicode objects. Consider using encode_utf8() and then using the
         # optimized versions, or maybe writing optimized unicode versions.
@@ -1170,8 +1170,8 @@
         if not isinstance(path2, text_type):
             raise TypeError("'path2' must be a unicode string, not %s: %r"
                             % (type(path2), path2))
-        return cmp(MultiWalker._path_to_key(path1),
-                   MultiWalker._path_to_key(path2))
+        return (MultiWalker._path_to_key(path1) <
+                MultiWalker._path_to_key(path2))
 
     @staticmethod
     def _path_to_key(path):
@@ -1267,7 +1267,7 @@
                     other_walker = other_walkers[idx]
                     other_extra = others_extra[idx]
                     while (other_has_more and
-                           self._cmp_path_by_dirblock(other_path, path) < 0):
+                           self._lt_path_by_dirblock(other_path, path)):
                         other_file_id = other_ie.file_id
                         if other_file_id not in out_of_order_processed:
                             other_extra[other_file_id] = (other_path, other_ie)
 
=== modified file 'python3.flapping'
--- python3.flapping	2018-07-26 21:50:18 +0000
+++ python3.flapping	2018-08-01 02:20:36 +0000
@@ -38,4 +38,5 @@
 breezy.tests.blackbox.test_status.BranchStatus.test_status_multiple_nonexistent_files
 breezy.tests.blackbox.test_status.BranchStatus.test_status_nonexistent_file_with_others
 breezy.tests.test_transform.TestSerializeTransform.test_serialize_creation
+breezy.tests.test_bundle.V4BundleTester.test_skip_file
 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
 
=== modified file 'python3.passing'
--- python3.passing	2018-07-31 17:40:51 +0000
+++ python3.passing	2018-08-01 02:20:36 +0000
@@ -1,5 +1,6 @@
 # This is the list of tests that are known to pass with Python3.
 # "make check-nodocs3" verifies that these pass.
+breezy.decorators.cachedproperty
 breezy.doc.api.DocFileTest(transport_txt)
 breezy._format_version_tuple
 breezy.iterablefile.IterableFile.close
@@ -1480,6 +1481,7 @@
 breezy.tests.blackbox.test_break_lock.TestSmartServerBreakLock.test_simple_branch_break_lock
 breezy.tests.blackbox.test_bundle_info.TestBundleInfo.test_bundle_info
 breezy.tests.blackbox.test_cat_revision.TestCatRevision.test_cat_no_such_revid
+breezy.tests.blackbox.test_cat_revision.TestCatRevision.test_cat_revision
 breezy.tests.blackbox.test_cat_revision.TestCatRevision.test_cat_revision_directory
 breezy.tests.blackbox.test_cat_revision.TestCatRevision.test_cat_tree_less_branch
 breezy.tests.blackbox.test_cat_revision.TestCatRevision.test_cat_unicode_revision
@@ -1534,7 +1536,6 @@
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_a_text_merge_in_a_checkout
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_exclude_excludes_modified_files
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_exclude_twice_uses_both_rules
-breezy.tests.blackbox.test_commit.TestCommit.test_commit_hook_template_rejected
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_lossy_foreign
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_lossy_native
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_merge_reports_all_modified_files
@@ -1548,6 +1549,7 @@
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_time_missing_tz
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_without_username
 breezy.tests.blackbox.test_commit.TestCommit.test_commit_with_path
+breezy.tests.blackbox.test_commit.TestCommit.test_edit_empty_message
 breezy.tests.blackbox.test_commit.TestCommit.test_empty_commit_message
 breezy.tests.blackbox.test_commit.TestCommit.test_fixes_bug_output
 breezy.tests.blackbox.test_commit.TestCommit.test_fixes_bug_sets_property
@@ -1681,6 +1683,7 @@
 breezy.tests.blackbox.test_diff.TestExternalDiff.test_external_diff_options_and_using
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_btree_no_refs_smoke
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_btree_raw_smoke
+breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_btree_smoke
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_raw_smoke
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_smoke
 breezy.tests.blackbox.test_exceptions.TestDeprecationWarning.test_repository_deprecation_warning
@@ -1745,6 +1748,7 @@
 breezy.tests.blackbox.test_filtered_view_ops.TestViewTreeOperations.test_view_on_pull
 breezy.tests.blackbox.test_filtered_view_ops.TestViewTreeOperations.test_view_on_update
 breezy.tests.blackbox.test_find_merge_base.TestFindMergeBase.test_find_merge_base
+breezy.tests.blackbox.test_find_merge_base.TestFindMergeBase.test_find_null_merge_base
 breezy.tests.blackbox.test_help.TestHelp.test_help_basic
 breezy.tests.blackbox.test_help.TestHelp.test_help_checkouts
 breezy.tests.blackbox.test_help.TestHelp.test_help_commands
@@ -1779,12 +1783,14 @@
 breezy.tests.blackbox.test_ignore.TestCommands.test_ignore_patterns
 breezy.tests.blackbox.test_ignore.TestCommands.test_ignore_versioned_file
 breezy.tests.blackbox.test_import.TestImport.test_import_upstream
+breezy.tests.blackbox.test_import.TestImport.test_import_upstream_lzma
 breezy.tests.blackbox.test_info.TestInfo.test_info_dangling_branch_reference
 breezy.tests.blackbox.test_info.TestInfo.test_info_empty_controldir
 breezy.tests.blackbox.test_info.TestInfo.test_info_empty_controldir_verbose
 breezy.tests.blackbox.test_info.TestInfo.test_info_non_existing
 breezy.tests.blackbox.test_info.TestInfo.test_info_repository_hook
 breezy.tests.blackbox.test_info.TestInfo.test_info_revinfo_optional
+breezy.tests.blackbox.test_info.TestInfo.test_info_shared_repository
 breezy.tests.blackbox.test_info.TestInfo.test_info_shared_repository_with_tree_in_root
 breezy.tests.blackbox.test_info.TestInfo.test_info_shared_repository_with_trees
 breezy.tests.blackbox.test_info.TestInfo.test_info_shows_colocated_branches
@@ -1909,6 +1915,10 @@
 breezy.tests.blackbox.test_log.TestLogRevSpecsWithPaths.test_log_revno_n_path
 breezy.tests.blackbox.test_log.TestLogRevSpecsWithPaths.test_log_revno_n_path_correct_order
 breezy.tests.blackbox.test_log.TestLogRevSpecsWithPaths.test_log_revno_n_path_wrong_namespace
+breezy.tests.blackbox.test_log.TestLogSignatures.test_log_without_signatures
+breezy.tests.blackbox.test_log.TestLogSignatures.test_log_with_signatures
+breezy.tests.blackbox.test_log.TestLogTags.test_log_with_tags
+breezy.tests.blackbox.test_log.TestLogTags.test_merged_log_with_tags
 breezy.tests.blackbox.test_log.TestLogUnicodeDiff.test_log_show_diff_non_ascii
 breezy.tests.blackbox.test_log.TestLogVerbose.test_log_long_verbose
 breezy.tests.blackbox.test_log.TestLogVerbose.test_log_long_verbose_verbose
@@ -1958,10 +1968,13 @@
 breezy.tests.blackbox.test_merge.TestMergeRevisionRange.test_merge_reversed_revision_range(file-only)
 breezy.tests.blackbox.test_merge.TestMergeRevisionRange.test_merge_reversed_revision_range(whole-tree)
 breezy.tests.blackbox.test_merge.TestMergeScript.test_merge_empty_branch
+breezy.tests.blackbox.test_merge.TestMerge.test_cherrypicking_merge
 breezy.tests.blackbox.test_merge.TestMerge.test_conflict_leaves_base_this_other_files
 breezy.tests.blackbox.test_merge.TestMerge.test_directive_cherrypick
+breezy.tests.blackbox.test_merge.TestMerge.test_directive_verify_warning
 breezy.tests.blackbox.test_merge.TestMerge.test_lca_merge_criss_cross
 breezy.tests.blackbox.test_merge.TestMerge.test_merge
+breezy.tests.blackbox.test_merge.TestMerge.test_merge_arbitrary
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_bundle
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_criss_cross
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_defaults_to_reprocess
@@ -2004,7 +2017,10 @@
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_file_forcing_after
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_file_into_subdir
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_file_into_unversioned_subdir
+breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_files_forcing_after
+breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_files_into_subdir
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_files_into_unversioned_subdir
+breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_files_using_after
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_file_to_versioned_target
 breezy.tests.blackbox.test_mv.TestMove.test_mv_already_moved_file_using_after
 breezy.tests.blackbox.test_mv.TestMove.test_mv_auto
@@ -2015,13 +2031,16 @@
 breezy.tests.blackbox.test_mv.TestMove.test_mv_change_case_dir
 breezy.tests.blackbox.test_mv.TestMove.test_mv_change_case_dir_w_files
 breezy.tests.blackbox.test_mv.TestMove.test_mv_change_case_file
+breezy.tests.blackbox.test_mv.TestMove.test_mv_dirs
 breezy.tests.blackbox.test_mv.TestMove.test_mv_file_to_wrong_case_dir
 breezy.tests.blackbox.test_mv.TestMove.test_mv_invalid
+breezy.tests.blackbox.test_mv.TestMove.test_mv_modes
 breezy.tests.blackbox.test_mv.TestMove.test_mv_no_auto_dry_run
 breezy.tests.blackbox.test_mv.TestMove.test_mv_nonexisting
 breezy.tests.blackbox.test_mv.TestMove.test_mv_no_root
 breezy.tests.blackbox.test_mv.TestMove.test_mv_quiet
 breezy.tests.blackbox.test_mv.TestMove.test_mv_readonly_lightweight_checkout
+breezy.tests.blackbox.test_mv.TestMove.test_mv_relative
 breezy.tests.blackbox.test_mv.TestMove.test_mv_removed_non_ascii
 breezy.tests.blackbox.test_mv.TestMove.test_mv_smoke_aliases
 breezy.tests.blackbox.test_mv.TestMove.test_mv_through_symlinks
@@ -2363,6 +2382,8 @@
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_multiple_branch_explicit
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_original_branch
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_original_branch_explicit
+breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_pending_merges
+breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_pending_merges_force
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_remote_path
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_repeatedly
 breezy.tests.blackbox.test_remove_tree.TestRemoveTree.test_remove_tree_shelved_changes
@@ -2543,18 +2564,22 @@
 breezy.tests.blackbox.test_status.BranchStatus.test_branch_status
 breezy.tests.blackbox.test_status.BranchStatus.test_branch_status_revisions
 breezy.tests.blackbox.test_status.BranchStatus.test_pending
+breezy.tests.blackbox.test_status.BranchStatus.test_status_nonexistent_file
 breezy.tests.blackbox.test_status.BranchStatus.test_status_nonexistent_file_with_unversioned
 breezy.tests.blackbox.test_status.BranchStatus.test_status_on_ignored
 breezy.tests.blackbox.test_status.BranchStatus.test_status_out_of_date
+breezy.tests.blackbox.test_status.BranchStatus.test_status_with_shelves
 breezy.tests.blackbox.test_status.BranchStatus.test_status_write_lock
 breezy.tests.blackbox.test_status.BranchStatus.test_tree_status_ignores
 breezy.tests.blackbox.test_status.BranchStatus.test_tree_status_specific_files
 breezy.tests.blackbox.test_status.CheckoutStatus.test_branch_status
 breezy.tests.blackbox.test_status.CheckoutStatus.test_branch_status_revisions
 breezy.tests.blackbox.test_status.CheckoutStatus.test_pending
+breezy.tests.blackbox.test_status.CheckoutStatus.test_status_nonexistent_file
 breezy.tests.blackbox.test_status.CheckoutStatus.test_status_nonexistent_file_with_unversioned
 breezy.tests.blackbox.test_status.CheckoutStatus.test_status_on_ignored
 breezy.tests.blackbox.test_status.CheckoutStatus.test_status_out_of_date
+breezy.tests.blackbox.test_status.CheckoutStatus.test_status_with_shelves
 breezy.tests.blackbox.test_status.CheckoutStatus.test_status_write_lock
 breezy.tests.blackbox.test_status.CheckoutStatus.test_tree_status_ignores
 breezy.tests.blackbox.test_status.CheckoutStatus.test_tree_status_specific_files
@@ -2627,7 +2652,9 @@
 breezy.tests.blackbox.test_testament.TestTestament.test_testament_command
 breezy.tests.blackbox.test_testament.TestTestament.test_testament_command_2
 breezy.tests.blackbox.test_testament.TestTestament.test_testament_command_3
+breezy.tests.blackbox.test_testament.TestTestament.test_testament_non_ascii
 breezy.tests.blackbox.test_too_much.HTTPTests.test_push
+breezy.tests.blackbox.test_too_much.OldTests.test_bzr
 breezy.tests.blackbox.test_too_much.SFTPTestsAbsoluteSibling.test_push
 breezy.tests.blackbox.test_too_much.SFTPTestsAbsolute.test_push
 breezy.tests.blackbox.test_too_much.SFTPTestsRelative.test_push
@@ -2938,6 +2965,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(LocalGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(RemoteBranchFormat-default)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_heavyweight_checkout(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(BzrBranchFormat4)
@@ -2947,6 +2975,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(LocalGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(RemoteBranchFormat-default)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_anonymous_lightweight_checkout(RemoteGitBranchFormat)
 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(BzrBranchFormat4)
@@ -3610,6 +3639,14 @@
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_delta(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_delta(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BranchReferenceFormat)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BzrBranchFormat4)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BzrBranchFormat5)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BzrBranchFormat6)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BzrBranchFormat7)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(BzrBranchFormat8)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(LocalGitBranchFormat)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(RemoteBranchFormat-default)
+breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_fails(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_passes(BranchReferenceFormat)
 breezy.tests.per_branch.test_commit.TestCommitHook.test_pre_commit_passes(BzrBranchFormat4)
@@ -4960,6 +4997,7 @@
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_simple_revno(BzrBranchFormat8)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_simple_revno(LocalGitBranchFormat)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_simple_revno(RemoteBranchFormat-default)
+breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_simple_revno(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_simple_revno(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_nickname(BranchReferenceFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_nickname(BzrBranchFormat4)
@@ -8375,6 +8413,42 @@
 breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(lca)
 breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(merge3)
 breezy.tests.per_merger.TestHookMergeFileContent.test_can_access_this_other_and_base_versions(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_conflict(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_conflict(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_conflict(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_conflict(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_delete(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_delete(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_delete(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_delete(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_success(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_success(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_success(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_stops_after_success(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_active(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_active(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_active(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_active(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_applicable(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_applicable(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_applicable(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_chain_when_not_applicable(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_change(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_change(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_change(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_change(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_deleted(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_deleted(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_deleted(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_change_vs_deleted(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_conflict(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_conflict(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_conflict(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_conflict(weave)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_delete(diff3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_delete(lca)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_delete(merge3)
+breezy.tests.per_merger.TestHookMergeFileContent.test_result_can_be_delete(weave)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(diff3)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(merge3)
 breezy.tests.per_merger.TestMergeImplementation.test_merge_move_and_change(weave)
@@ -8858,8 +8932,10 @@
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormat2a)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormat2aSubtree)
+breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitStackedFailsAppropriately.test_stacked_commit_fails_on_old_formats(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_reference.test_commit_with_stacking.TestCommitWithStacking.test_commit_with_ghost_in_ancestry(RemoteRepositoryFormat-default)
@@ -9601,12 +9677,17 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_unchanged(GitRepositoryFormat)
@@ -9743,12 +9824,17 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_dir_unchanged(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(GitRepositoryFormat)
@@ -9759,12 +9845,17 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_file_unchanged(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(GitRepositoryFormat)
@@ -9775,12 +9866,17 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_converged_merge_link_unchanged(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_merge_dir_changes(GitRepositoryFormat)
@@ -11198,12 +11294,17 @@
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(GitRepositoryFormat)
@@ -11214,12 +11315,17 @@
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_unchanged_directory(GitRepositoryFormat)
@@ -11232,12 +11338,17 @@
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(GitRepositoryFormat)
@@ -11248,12 +11359,17 @@
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestEscaping.test_create_bundle(GitRepositoryFormat)
@@ -12341,12 +12457,17 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revision_delta(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_get_revisions(GitRepositoryFormat)
@@ -12373,10 +12494,24 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(GitRepositoryFormat)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat6)
 breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack1)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack3)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack5)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack5RichRoot)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack6)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatKnitPack6RichRoot)
+breezy.tests.per_repository.test_repository.TestRepository.test_graph_ghost_handling(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(GitRepositoryFormat)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_repository.TestRepository.test_implements_revision_graph_can_have_wrong_parents(RemoteRepositoryFormat-v2)
@@ -12406,12 +12541,17 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnit1)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnit3)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack5)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_files_bytes(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_iter_revisions(GitRepositoryFormat)
@@ -13955,12 +14095,17 @@
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormat5)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack4)
+breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_check.TestNoSpuriousInconsistentAncestors.test_two_files_different_versions_no_inconsistencies_bug_165071(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_fetch.TestSource.test_no_absent_records_in_stream_with_ghosts(RemoteRepositoryFormat-default)
@@ -14050,12 +14195,17 @@
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormat5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolvedSuperset.test_fileid_involved_full_compare2(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RemoteRepositoryFormat-default)
@@ -14065,12 +14215,17 @@
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormat5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_between_two_revs(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RemoteRepositoryFormat-default)
@@ -14080,12 +14235,17 @@
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormat5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_altered_by_revision_ids(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RemoteRepositoryFormat-default)
@@ -14095,12 +14255,17 @@
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormat4)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormat5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormat6)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormat7)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnit1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnit3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnit4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack1)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack3)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack4)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_vf.test_fileid_involved.TestFileIdInvolved.test_fileids_involved_full_compare(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository_vf.test_find_text_key_references.TestFindTextKeyReferences.test_empty(RemoteRepositoryFormat-default)
@@ -15726,6 +15891,7 @@
 breezy.tests.per_transport.TransportTests.test_copy_tree(NoSmartTransportDecorator,NoSmartTransportServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_copy_tree(RemoteTCPTransport,SmartTCPServer_for_testing)
 breezy.tests.per_transport.TransportTests.test_copy_tree(SFTPTransport,SFTPAbsoluteServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(SFTPTransport,SFTPHomeDirServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -15742,6 +15908,7 @@
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(NoSmartTransportDecorator,NoSmartTransportServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(RemoteTCPTransport,SmartTCPServer_for_testing)
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(SFTPTransport,SFTPAbsoluteServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(SFTPTransport,SFTPHomeDirServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree_to_transport(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -16125,6 +16292,7 @@
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(NoSmartTransportDecorator,NoSmartTransportServer)
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_iter_files_recursive(RemoteTCPTransport,SmartTCPServer_for_testing)
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(SFTPTransport,SFTPAbsoluteServer)
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(SFTPTransport,SFTPHomeDirServer)
 breezy.tests.per_transport.TransportTests.test_iter_files_recursive(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -17552,9 +17720,12 @@
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_executable(WorkingTreeFormat5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_executable(WorkingTreeFormat6)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_executable(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(GitWorkingTreeFormat)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(PreviewTree)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(PreviewTreePost)
+breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(RevisionTree)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(WorkingTreeFormat2)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(WorkingTreeFormat3)
 breezy.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_non_exec(WorkingTreeFormat4)
@@ -17763,8 +17934,18 @@
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_subdirs_and_all_content_types_wo_symlinks(WorkingTreeFormat5)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_subdirs_and_all_content_types_wo_symlinks(WorkingTreeFormat6)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_subdirs_and_all_content_types_wo_symlinks(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(PreviewTree)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(PreviewTreePost)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(RevisionTree)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat2)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat3)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat4)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat5)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat6)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_utf8(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.TestTreeImplementationSupport.test_revision_tree_from_workingtree
 breezy.tests.per_tree.test_tree.TestAnnotate.test_annotate(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_tree.TestAnnotate.test_annotate(DirStateRevisionTree,WT5)
@@ -17910,7 +18091,18 @@
 breezy.tests.per_tree.test_tree.TestGetFileSha1.test_get_file_sha1(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestGetFileSha1.test_get_file_sha1(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestGetFileSha1.test_get_file_sha1(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(PreviewTree)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(PreviewTreePost)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(RevisionTree)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat2)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat3)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat4)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat5)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat6)
+breezy.tests.per_tree.test_tree.TestGetFileVerifier.test_get_file_verifier(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_tree.TestHasId.test_has_id(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_tree.TestHasId.test_has_id(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestHasId.test_has_id(GitWorkingTreeFormat)
@@ -19833,18 +20025,38 @@
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file1_deleted_in_dir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_deleted_in_root(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file3_in_root_conflicted(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_in_root(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_merge_from_branch.TestMergedBranch.test_file4_added_then_renamed(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_merge_from_branch.TestMergeFromBranch.test_compare_after_merge(WorkingTreeFormat3)
@@ -19903,6 +20115,8 @@
 breezy.tests.per_workingtree.test_mkdir.TestMkdir.test_mkdir_with_id(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(WorkingTreeFormat4)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_no_target(WorkingTreeFormat6)
@@ -19910,47 +20124,107 @@
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_source_and_dest(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after_with_after(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_after(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_named(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_correct_call_unnamed(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_into_parent(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_children_in_subdir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_deleted_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_moved_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_new_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_renamed_child(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory_with_swapped_children(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_directory(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_fail_consistent(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_moved(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_multi_unversioned(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_multi_unversioned(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_multi_unversioned(WorkingTreeFormat3)
@@ -19982,12 +20256,24 @@
 breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_subdir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_target_not_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_target_not_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_target_not_dir(WorkingTreeFormat3)
@@ -20013,6 +20299,10 @@
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned_non_ascii(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned(WorkingTreeFormat4)
@@ -20601,6 +20891,10 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat3)
@@ -20686,6 +20980,12 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_unknown_ignored_files(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_unknown_ignored_files(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_after_non_existant_non_ascii(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_into_unversioned_non_ascii_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_into_unversioned_non_ascii_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_into_unversioned_non_ascii_dir(WorkingTreeFormat3)
@@ -20702,6 +21002,12 @@
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_dest_versioned(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_no_target(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_source_and_dest(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_source_and_dest(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_after_source_and_dest(WorkingTreeFormat3)
@@ -20771,6 +21077,13 @@
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_non_existent(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_non_existent(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_non_existent(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_not_localdir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_onto_existing(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_onto_existing(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_onto_existing(WorkingTreeFormat3)
@@ -20799,6 +21112,20 @@
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_parent_dir(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_parent_dir(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_parent_dir(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_samedir(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_subdir(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_target_not_dir(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_target_not_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_target_not_dir(WorkingTreeFormat3)
@@ -21150,6 +21477,10 @@
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_requires_write_lock(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_requires_write_lock(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_requires_write_lock(WorkingTreeFormat3)
@@ -21535,7 +21866,19 @@
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified_detects_corruption(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_modified(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_merge_revert(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_missing_file_sha1(WorkingTreeFormat3)
@@ -21947,6 +22290,7 @@
 breezy.tests.test_branch.TestBranch7.test_set_stacked_on_url_unstackable_repo
 breezy.tests.test_branch.TestBranch7.test_stack_and_unstack
 breezy.tests.test_branch.TestBranchFormat5.test_branch_format_5_uses_lockdir
+breezy.tests.test_branch.TestBranchFormat5.test_set_push_location
 breezy.tests.test_branch.TestBranchFormatRegistry.test_default
 breezy.tests.test_branch.TestBranchFormatRegistry.test_get_all
 breezy.tests.test_branch.TestBranchFormatRegistry.test_register_extra
@@ -21973,6 +22317,8 @@
 breezy.tests.test_branch.TestHooks.test_post_branch_init_hook
 breezy.tests.test_branch.TestHooks.test_post_branch_init_hook_repr
 breezy.tests.test_branch.TestHooks.test_post_switch_hook
+breezy.tests.test_branch.TestPullResult.test_report_changed
+breezy.tests.test_branch.TestPullResult.test_report_unchanged
 breezy.tests.test_btree_index.TestBTreeBuilder.test_2_leaves_1_0
 breezy.tests.test_btree_index.TestBTreeBuilder.test_2_leaves_2_2
 breezy.tests.test_btree_index.TestBTreeBuilder.test_clear_cache
@@ -22137,6 +22483,7 @@
 breezy.tests.test_bundle.V08BundleTester.test_bundle_sorted_properties
 breezy.tests.test_bundle.V08BundleTester.test_bundle_unicode_properties
 breezy.tests.test_bundle.V08BundleTester.test_crlf_bundle
+breezy.tests.test_bundle.V08BundleTester.test_get_merge_request
 breezy.tests.test_bundle.V08BundleTester.test_hide_history
 breezy.tests.test_bundle.V08BundleTester.test_install_revisions
 breezy.tests.test_bundle.V08BundleTester.test_malformed
@@ -22149,6 +22496,7 @@
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_bundle_sorted_properties
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_bundle_unicode_properties
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_crlf_bundle
+breezy.tests.test_bundle.V09BundleKnit1Tester.test_get_merge_request
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_hide_history
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_malformed
 breezy.tests.test_bundle.V09BundleKnit1Tester.test_non_bundle
@@ -22200,6 +22548,8 @@
 breezy.tests.test_bundle.V4BundleTester.test_across_models_incompatible
 breezy.tests.test_bundle.V4BundleTester.test_across_serializers
 breezy.tests.test_bundle.V4BundleTester.test_alt_timezone_bundle
+breezy.tests.test_bundle.V4BundleTester.test_binary_bundle
+breezy.tests.test_bundle.V4BundleTester.test_bundle
 breezy.tests.test_bundle.V4BundleTester.test_bundle_empty_property
 breezy.tests.test_bundle.V4BundleTester.test_bundle_root_id
 breezy.tests.test_bundle.V4BundleTester.test_bundle_same_basis
@@ -22209,9 +22559,11 @@
 breezy.tests.test_bundle.V4BundleTester.test_copy_signatures
 breezy.tests.test_bundle.V4BundleTester.test_creation
 breezy.tests.test_bundle.V4BundleTester.test_crlf_bundle
+breezy.tests.test_bundle.V4BundleTester.test_get_merge_request
 breezy.tests.test_bundle.V4BundleTester.test_hide_history
 breezy.tests.test_bundle.V4BundleTester.test_install_revisions
 breezy.tests.test_bundle.V4BundleTester.test_inv_hash_across_serializers
+breezy.tests.test_bundle.V4BundleTester.test_last_modified
 breezy.tests.test_bundle.V4BundleTester.test_malformed
 breezy.tests.test_bundle.V4BundleTester.test_non_bundle
 breezy.tests.test_bundle.V4BundleTester.test_revision_id_with_slash
@@ -22608,6 +22960,7 @@
 breezy.tests.test_commit.TestCommit.test_commit_has_1ms_resolution
 breezy.tests.test_commit.TestCommit.test_commit_invokes_hooks
 breezy.tests.test_commit.TestCommit.test_commit_kind_changes
+breezy.tests.test_commit.TestCommit.test_commit_move
 breezy.tests.test_commit.TestCommit.test_commit_new_subdir_child_selective
 breezy.tests.test_commit.TestCommit.test_commit_no_author
 breezy.tests.test_commit.TestCommit.test_commit_object_doesnt_set_nick
@@ -23363,6 +23716,7 @@
 breezy.tests.test_conflicts.TestConflicts.test_resolve_conflicts_recursive
 breezy.tests.test_conflicts.TestConflicts.test_select_conflicts
 breezy.tests.test_conflicts.TestMalformedTransform.test_bug_430129
+breezy.tests.test_conflicts.TestNoFinalPath.test_bug_805809
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(ContentsConflict)
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(DuplicateEntry)
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(DuplicateID)
@@ -23946,9 +24300,11 @@
 breezy.tests.test_export_pot.TestWriteOption.test_registry_option_value_switches_hidden
 breezy.tests.test_export.RootNameTests.test_root_name
 breezy.tests.test_export.TarExporterTests.test_export_tarball_generator
+breezy.tests.test_export.TarExporterTests.test_lzma
 breezy.tests.test_export.TarExporterTests.test_tbz2
 breezy.tests.test_export.TarExporterTests.test_tgz
 breezy.tests.test_export.TarExporterTests.test_tgz_ignores_dest_path
+breezy.tests.test_export.TarExporterTests.test_xz
 breezy.tests.test_export.TarExporterTests.test_xz_stdout
 breezy.tests.test_export.TestDirExport.test_empty
 breezy.tests.test_export.TestDirExport.test_empty_subdir
@@ -23992,6 +24348,7 @@
 breezy.tests.test_fetch.TestFetch.test_fetch_root_knit
 breezy.tests.test_fetch.TestFetch.test_fetch_self
 breezy.tests.test_fetch.TestKnitToPackFetch.test_fetch_no_deltas_with_delta_closure
+breezy.tests.test_fetch.TestKnitToPackFetch.test_fetch_revisions_with_deltas_into_pack
 breezy.tests.test_fetch.TestKnitToPackFetch.test_fetch_with_deltas_no_delta_closure
 breezy.tests.test_fetch.TestKnitToPackFetch.test_fetch_with_fallback_and_merge
 breezy.tests.test_fetch.TestMergeFetch.test_merge_fetches
@@ -24293,7 +24650,15 @@
 breezy.tests.test_hashcache.TestHashCache.test_hashcache_not_file
 breezy.tests.test_hashcache.TestHashCache.test_hashcache_raise
 breezy.tests.test_hashcache.TestHashCache.test_hashcache_replaced_file
+breezy.tests.test_help.TestCommandHelp.test_command_help_includes_see_also
+breezy.tests.test_help.TestCommandHelp.test_command_only_additional_see_also
+breezy.tests.test_help.TestCommandHelp.test_command_with_additional_see_also
+breezy.tests.test_help.TestCommandHelp.test_concise_help_text
+breezy.tests.test_help.TestCommandHelp.test_formatted_help_text
+breezy.tests.test_help.TestCommandHelp.test_get_help_text
 breezy.tests.test_help.TestCommandHelp.test_get_help_topic
+breezy.tests.test_help.TestCommandHelp.test_help_custom_section_ordering
+breezy.tests.test_help.TestCommandHelp.test_help_text_custom_usage
 breezy.tests.test_help.TestCommandIndex.test_default_constructable
 breezy.tests.test_help.TestCommandIndex.test_get_topics_None
 breezy.tests.test_help.TestCommandIndex.test_get_topics_no_topic
@@ -24390,6 +24755,8 @@
 breezy.tests.test_https_urllib.CaCertsConfigTests.test_default_exists
 breezy.tests.test_https_urllib.CaCertsConfigTests.test_specified
 breezy.tests.test_https_urllib.CaCertsConfigTests.test_specified_doesnt_exist
+breezy.tests.test_https_urllib.CertReqsConfigTests.test_default
+breezy.tests.test_https_urllib.CertReqsConfigTests.test_from_string
 breezy.tests.test_https_urllib.MatchHostnameTests.test_common_name
 breezy.tests.test_https_urllib.MatchHostnameTests.test_no_certificate
 breezy.tests.test_https_urllib.MatchHostnameTests.test_no_valid_attributes
@@ -26032,9 +26399,12 @@
 breezy.tests.test_mail_client.TestXDGEmail.test_commandline_is_8bit
 breezy.tests.test_matchers.TestContainsNoVfsCalls.test_empty
 breezy.tests.test_matchers.TestContainsNoVfsCalls.test_ignores_unknown
+breezy.tests.test_matchers.TestContainsNoVfsCalls.test_match
 breezy.tests.test_matchers.TestContainsNoVfsCalls.test_no_vfs_calls
 breezy.tests.test_matchers.TestContainsNoVfsCalls.test__str__
 breezy.tests.test_matchers.TestHasLayout.test_match
+breezy.tests.test_matchers.TestHasLayout.test_mismatch
+breezy.tests.test_matchers.TestHasLayout.test_no_dirs
 breezy.tests.test_matchers.TestHasLayout.test__str__
 breezy.tests.test_matchers.TestHasPathRelations.test_match
 breezy.tests.test_matchers.TestHasPathRelations.test_mismatch
@@ -26046,10 +26416,13 @@
 breezy.tests.test_matchers.TestReturnsUnlockable.test_mismatch
 breezy.tests.test_matchers.TestReturnsUnlockable.test___str__
 breezy.tests.test_matchers.TestRevisionHistoryMatches.test_empty
+breezy.tests.test_matchers.TestRevisionHistoryMatches.test_matches
+breezy.tests.test_matchers.TestRevisionHistoryMatches.test_mismatch
 breezy.tests.test_memorytree.TestMemoryTree.test_add_in_subdir
 breezy.tests.test_memorytree.TestMemoryTree.test_add_with_kind
 breezy.tests.test_memorytree.TestMemoryTree.test_commit_trivial
 breezy.tests.test_memorytree.TestMemoryTree.test_create_on_branch
+breezy.tests.test_memorytree.TestMemoryTree.test_create_on_branch_with_content
 breezy.tests.test_memorytree.TestMemoryTree.test_get_root_id
 breezy.tests.test_memorytree.TestMemoryTree.test_last_revision
 breezy.tests.test_memorytree.TestMemoryTree.test_lock_tree_write
@@ -26315,6 +26688,7 @@
 breezy.tests.test_missing.TestMissing.test_find_unmerged
 breezy.tests.test_missing.TestMissing.test_iter_log_revisions
 breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template
+breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_and_diff
 breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_encoded
 breezy.tests.test_msgeditor.MsgEditorTest.test_commit_template_pending_merges
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_commit_template
@@ -26324,6 +26698,10 @@
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_commit_template_in_unicode_dir(utf-8,1)
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_commit_template_in_unicode_dir(utf-8,2)
 breezy.tests.test_msgeditor.MsgEditorTest.test__create_temp_file_with_empty_commit_template
+breezy.tests.test_msgeditor.MsgEditorTest.test_deleted_commit_message
+breezy.tests.test_msgeditor.MsgEditorTest.test_edit_commit_message_with_ascii_infotext
+breezy.tests.test_msgeditor.MsgEditorTest.test_edit_commit_message_without_infotext
+breezy.tests.test_msgeditor.MsgEditorTest.test_edit_commit_message_with_unicode_infotext
 breezy.tests.test_msgeditor.MsgEditorTest.test_generate_commit_message_template_hook
 breezy.tests.test_msgeditor.MsgEditorTest.test_generate_commit_message_template_no_hooks
 breezy.tests.test_msgeditor.MsgEditorTest.test__get_editor
@@ -26332,6 +26710,8 @@
 breezy.tests.test_msgeditor.MsgEditorTest.test__run_editor_EACCES
 breezy.tests.test_msgeditor.MsgEditorTest.test_set_commit_message_hook
 breezy.tests.test_msgeditor.MsgEditorTest.test_set_commit_message_no_hooks
+breezy.tests.test_msgeditor.MsgEditorTest.test_start_message
+breezy.tests.test_msgeditor.MsgEditorTest.test_unsupported_encoding_commit_message
 breezy.tests.test_msgeditor.TestPlatformErrnoWorkarounds.test_subprocess_call_bad_file
 breezy.tests.test_multiparent.TestMulti.test_binary_content
 breezy.tests.test_multiparent.TestMulti.test_compare_no_parent
@@ -27091,6 +27471,7 @@
 breezy.tests.test_remote.TestRepositoryWriteGroups.test_start_write_group_unsuspendable
 breezy.tests.test_remote.TestRepositoryWriteGroups.test_suspend_write_group
 breezy.tests.test_remote.TestStacking.test_access_stacked_remote
+breezy.tests.test_remote.TestStacking.test_stacked_get_parent_map
 breezy.tests.test_remote.TestStacking.test_stacked_get_stream_groupcompress
 breezy.tests.test_remote.TestStacking.test_stacked_get_stream_topological
 breezy.tests.test_remote.TestStacking.test_stacked_get_stream_unordered
@@ -27183,6 +27564,7 @@
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_none
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_one
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_two
+breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_obsoletes_new_pack
 breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_reloads_and_stops
 breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs
 breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs_preserve
@@ -27202,8 +27584,11 @@
 breezy.tests.test_repository.TestRepositoryPackCollection.test_repr
 breezy.tests.test_repository.TestRepositoryPackCollection.test__save_pack_names
 breezy.tests.test_repository.TestRepositoryPackCollection.test__save_pack_names_already_obsoleted
+breezy.tests.test_revert.TestRevert.test_revert_deletes_files_from_revert
 breezy.tests.test_revert.TestRevert.test_revert_executable
 breezy.tests.test_revert.TestRevert.test_revert_file_in_deleted_dir
+breezy.tests.test_revert.TestRevert.test_revert_merged_dir
+breezy.tests.test_revert.TestRevert.test_revert_new
 breezy.tests.test_revert.TestRevert.test_revert_root_id_change
 breezy.tests.test_revisionspec.TestOddRevisionSpec.test_none
 breezy.tests.test_revisionspec.TestOddRevisionSpec.test_object
@@ -27222,6 +27607,7 @@
 breezy.tests.test_revisionspec.TestRevisionSpec_annotate.test_no_such_file
 breezy.tests.test_revisionspec.TestRevisionSpec_annotate.test_no_such_file_with_colon
 breezy.tests.test_revisionspec.TestRevisionSpecBase.test_wants_no_revision_history
+breezy.tests.test_revisionspec.TestRevisionSpec_before.test_alt_no_parents
 breezy.tests.test_revisionspec.TestRevisionSpec_before.test_alt_revid
 breezy.tests.test_revisionspec.TestRevisionSpec_before.test_as_revision_id
 breezy.tests.test_revisionspec.TestRevisionSpec_before.test_before_none
@@ -27242,6 +27628,8 @@
 breezy.tests.test_revisionspec.TestRevisionSpec_date.test_today
 breezy.tests.test_revisionspec.TestRevisionSpec_date.test_tomorrow
 breezy.tests.test_revisionspec.TestRevisionSpec_date.test_yesterday
+breezy.tests.test_revisionspec.TestRevisionSpec_dwim.test_append_dwim_revspec
+breezy.tests.test_revisionspec.TestRevisionSpec_dwim.test_append_lazy_dwim_revspec
 breezy.tests.test_revisionspec.TestRevisionSpec_dwim.test_dwim_spec_branch
 breezy.tests.test_revisionspec.TestRevisionSpec_dwim.test_dwim_spec_date
 breezy.tests.test_revisionspec.TestRevisionSpec_dwim.test_dwim_spec_nonexistent
@@ -27271,6 +27659,8 @@
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_dotted_decimal
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_int_with_branch
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_invalid_branch
+breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_invalid_number
+breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_invalid_number_with_branch
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_invalid_revno_in_branch
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_missing_number_and_branch
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_negative
@@ -27284,6 +27674,10 @@
 breezy.tests.test_revisionspec.TestRevisionSpec_revno.test_with_url
 breezy.tests.test_revisionspec.TestRevisionSpec_submit.test_as_revision_id
 breezy.tests.test_revisionspec.TestRevisionSpec_submit.test_submit_branch
+breezy.tests.test_revisionspec.TestRevisionSpec_tag.test_as_revision_id
+breezy.tests.test_revisionspec.TestRevisionSpec_tag.test_failed_lookup
+breezy.tests.test_revisionspec.TestRevisionSpec_tag.test_from_string_tag
+breezy.tests.test_revisionspec.TestRevisionSpec_tag.test_lookup_tag
 breezy.tests.test_revision.TestCommonAncestor.test_get_history
 breezy.tests.test_revision.TestIsAncestor.test_recorded_ancestry
 breezy.tests.test_revision.TestReservedId.test_is_reserved_id
@@ -27886,6 +28280,7 @@
 breezy.tests.test_smart.TestSmartServerBzrDirRequestCloningMetaDir.test_checkout_metadir
 breezy.tests.test_smart.TestSmartServerBzrDirRequestDestroyBranch.test_destroy_branch_default
 breezy.tests.test_smart.TestSmartServerBzrDirRequestDestroyBranch.test_destroy_branch_missing
+breezy.tests.test_smart.TestSmartServerBzrDirRequestDestroyBranch.test_destroy_branch_named
 breezy.tests.test_smart.TestSmartServerBzrDirRequestDestroyRepository.test_destroy_repository_default
 breezy.tests.test_smart.TestSmartServerBzrDirRequestDestroyRepository.test_destroy_repository_missing
 breezy.tests.test_smart.TestSmartServerBzrDirRequestGetBranches.test_empty
@@ -27902,6 +28297,7 @@
 breezy.tests.test_smart.TestSmartServerRepositoryAddSignatureText.test_add_text
 breezy.tests.test_smart.TestSmartServerRepositoryAllRevisionIds.test_empty
 breezy.tests.test_smart.TestSmartServerRepositoryAllRevisionIds.test_some_revisions
+breezy.tests.test_smart.TestSmartServerRepositoryAnnotateFileRevision.test_get
 breezy.tests.test_smart.TestSmartServerRepositoryBreakLock.test_lock_to_break
 breezy.tests.test_smart.TestSmartServerRepositoryBreakLock.test_nothing_to_break
 breezy.tests.test_smart.TestSmartServerRepositoryGatherStats.test_empty_revid
@@ -27951,6 +28347,7 @@
 breezy.tests.test_smart.TestSmartServerRepositoryUnlock.test_unlock_on_unlocked_repo
 breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_abort_write_group
 breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_check_write_group
+breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_check_write_group_invalid
 breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_commit_write_group
 breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_start_write_group
 breezy.tests.test_smart.TestSmartServerRepositoryWriteGroup.test_start_write_group_unsuspendable
@@ -28005,9 +28402,11 @@
 breezy.tests.test_smart.TestSmartServerRequestRevisionHistory.test_empty
 breezy.tests.test_smart.TestSmartServerRequestRevisionHistory.test_not_empty
 breezy.tests.test_smart.TestSmartServerRequest.test_translate_client_path
+breezy.tests.test_smart.TestSmartServerRequest.test_translate_client_path_vfs
 breezy.tests.test_smart.TestSmartServerRequest.test_transport_from_client_path
 breezy.tests.test_smart.TestSmartServerResponse.test__eq__
 breezy.tests.test_smart.TestSmartServerResponse.test__str__
+breezy.tests.test_smart.TestSmartServerVfsGet.test_unicode_path
 breezy.tests.test_smart_transport.HTTPTunnellingSmokeTest.test_smart_http_medium_request_accept_bytes
 breezy.tests.test_smart_transport.LengthPrefixedBodyDecoder.test_accept_bytes
 breezy.tests.test_smart_transport.LengthPrefixedBodyDecoder.test_accept_bytes_all_at_once_with_excess
@@ -28182,6 +28581,7 @@
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_pipe_wait_for_bytes_with_timeout_no_data
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_pipe_wait_for_bytes_with_timeout_with_data
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_response_to_canned_get
+breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_response_to_canned_get_of_utf8
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_smart_query_version
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_socket_build_protocol_non_two
 breezy.tests.test_smart_transport.TestSmartServerStreamMedium.test_socket_build_protocol_two
@@ -28614,6 +29014,7 @@
 breezy.tests.test_transform.TestBuildTree.test_build_tree_accelerator_tree_moved
 breezy.tests.test_transform.TestBuildTree.test_build_tree_accelerator_tree_observes_sha1
 breezy.tests.test_transform.TestBuildTree.test_build_tree_accelerator_wrong_kind
+breezy.tests.test_transform.TestBuildTree.test_build_tree_content_filtered_files_are_not_hardlinked
 breezy.tests.test_transform.TestBuildTree.test_build_tree_hardlink
 breezy.tests.test_transform.TestBuildTree.test_build_tree_hardlinks_preserve_execute
 breezy.tests.test_transform.TestBuildTree.test_build_tree_observes_sha
@@ -28672,6 +29073,7 @@
 breezy.tests.test_transform.TestTransformMerge.test_file_merge
 breezy.tests.test_transform.TestTransformMerge.test_filename_merge
 breezy.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts
+breezy.tests.test_transform.TestTransformMerge.test_text_merge
 breezy.tests.test_transform.TestTransformMissingParent.test_non_versioned_file_create_conflict
 breezy.tests.test_transform.TestTransformMissingParent.test_resolve_create_parent_for_versioned_file
 breezy.tests.test_transform.TestTransformPreview.test_all_file_ids
@@ -28923,12 +29325,19 @@
 breezy.tests.test_treebuilder.TestTreeBuilderMemoryTree.test_start_tree_when_started_fails
 breezy.tests.test_tree.FindPreviousPathsTests.test_find_previous_paths
 breezy.tests.test_tree.FindPreviousPathsTests.test_new
+breezy.tests.test_treeshape.TestTreeShape.test_build_tree
 breezy.tests.test_treeshape.TestTreeShape.test_build_tree_symlink
 breezy.tests.test_tree.TestErrors.test_file_timestamp_unavailable
 breezy.tests.test_tree.TestInterTree.test_revision_tree_revision_tree
 breezy.tests.test_tree.TestInterTree.test_working_tree_revision_tree
 breezy.tests.test_tree.TestInterTree.test_working_tree_working_tree
+breezy.tests.test_tree.TestMultiWalker.test_different_file_id_in_others
+breezy.tests.test_tree.TestMultiWalker.test__lt_path_by_dirblock
+breezy.tests.test_tree.TestMultiWalker.test_master_has_extra
+breezy.tests.test_tree.TestMultiWalker.test_master_renamed_to_earlier
+breezy.tests.test_tree.TestMultiWalker.test_master_renamed_to_later
 breezy.tests.test_tree.TestMultiWalker.test_other_extra_at_end
+breezy.tests.test_tree.TestMultiWalker.test_other_extra_in_middle
 breezy.tests.test_tree.TestMultiWalker.test_others_extra_at_end
 breezy.tests.test_tree.TestMultiWalker.test__path_to_key
 breezy.tests.test_tree.TestMultiWalker.test_simple_stepping
@@ -29297,6 +29706,7 @@
 breezy.tests.test_workingtree.TestWorkingTreeFormatRegistry.test_register_unregister_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_no_tree
+breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_string
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_unknown_format
 breezy.tests.test_workingtree.TestWorkingTreeFormat.test_find_format_with_features
 breezy.tests.test_workingtree.TestWorkingTreeIterEntriesByDir_wSubtrees.test_direct_subtree