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

[Jelmer Vernooij]

Fix another round of tests on Python 3.

Fix another 58 tests on Python 3.

[Martin Packman (gz)]

Thanks! There are quite a few stream checking changes that really just need to be unicode always using an abstraction that decodes for python 2, but that can get cleaned up later. Couple of other inline notes.

review: Approve

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

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

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

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

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

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

=== modified file 'breezy/bzr/btree_index.py'
--- breezy/bzr/btree_index.py	2018-06-25 20:47:38 +0000
+++ breezy/bzr/btree_index.py	2018-08-07 21:08:25 +0000
@@ -708,8 +708,7 @@
 
     def __lt__(self, other):
         if isinstance(other, type(self)):
-            return ((self._transport, self._name, self._size) <
-                    (other._transport, other._name, other._size))
+            return ((self._name, self._size) < (other._name, other._size))
         # Always sort existing indexes before ones that are still being built.
         if isinstance(other, BTreeBuilder):
             return True

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2018-07-24 19:02:16 +0000
+++ breezy/bzr/remote.py	2018-08-07 21:08:25 +0000
@@ -2767,7 +2767,7 @@
         self.refresh_data()
         if response[0] != b'ok':
             raise errors.UnexpectedSmartServerResponse(response)
-        self._write_group_tokens = response[1:]
+        self._write_group_tokens = [token.decode('utf-8') for token in response[1:]]
 
     def has_signature_for_revision_id(self, revision_id):
         path = self.controldir._path_for_remote_call(self._client)

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2018-07-26 22:37:49 +0000
+++ breezy/bzr/workingtree_4.py	2018-08-07 21:08:25 +0000
@@ -2088,7 +2088,7 @@
             # push the user specified dirs from dirblock
             for dir in reversed(dirblock):
                 if dir[2] == _directory:
-                    pending.append((dir[0].decode('utf-8'), dir[4]))
+                    pending.append((dir[0], dir[4]))
 
 
 class InterDirStateTree(InterTree):

=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2018-06-17 20:17:39 +0000
+++ breezy/bzr/xml_serializer.py	2018-08-07 21:08:25 +0000
@@ -129,7 +129,7 @@
     # aren't listed in the XML specification
     # (http://www.w3.org/TR/REC-xml/#NT-Char).
     return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
-            lambda match: match.group(0).encode('unicode_escape'),
+            lambda match: match.group(0).encode('unicode_escape').decode('ascii'),
             message)
 
 

=== modified file 'breezy/generate_ids.py'
--- breezy/generate_ids.py	2018-06-22 02:22:23 +0000
+++ breezy/generate_ids.py	2018-08-07 21:08:25 +0000
@@ -32,11 +32,12 @@
     errors,
     lazy_regex,
     )
+from .sixish import text_type
 
 # the regex removes any weird characters; we don't escape them
 # but rather just pull them out
-_file_id_chars_re = lazy_regex.lazy_compile('[^\\w.]')
-_rev_id_chars_re = lazy_regex.lazy_compile('[^-\\w.+@]')
+_file_id_chars_re = lazy_regex.lazy_compile(b'[^\\w.]')
+_rev_id_chars_re = lazy_regex.lazy_compile(b'[^-\\w.+@]')
 _gen_file_id_suffix = None
 _gen_file_id_serial = 0
 
@@ -71,6 +72,8 @@
 
     The uniqueness is supplied from _next_id_suffix.
     """
+    if isinstance(name, text_type):
+        name = name.encode('ascii', 'replace')
     # The real randomness is in the _next_id_suffix, the
     # rest of the identifier is just to be nice.
     # So we:
@@ -82,7 +85,7 @@
     #    filesystems
     # 4) Removing starting '.' characters to prevent the file ids from
     #    being considered hidden.
-    ascii_word_only = _file_id_chars_re.sub('', name.lower()).encode('ascii', 'replace')
+    ascii_word_only = _file_id_chars_re.sub(b'', name.lower())
     short_no_dots = ascii_word_only.lstrip(b'.')[:20]
     return short_no_dots + _next_id_suffix()
 
@@ -108,15 +111,15 @@
 
     user_or_email = user_or_email.lower()
     user_or_email = user_or_email.replace(' ', '_')
-    user_or_email = _rev_id_chars_re.sub('', user_or_email)
+    user_or_email = _rev_id_chars_re.sub(b'', user_or_email.encode('utf-8'))
 
     # This gives 36^16 ~= 2^82.7 ~= 83 bits of entropy
-    unique_chunk = osutils.rand_chars(16)
+    unique_chunk = osutils.rand_chars(16).encode('utf-8')
 
     if timestamp is None:
         timestamp = time.time()
 
-    rev_id = u'-'.join((user_or_email,
-                        osutils.compact_date(timestamp),
+    rev_id = b'-'.join((user_or_email,
+                        osutils.compact_date(timestamp).encode('utf-8'),
                         unique_chunk))
-    return rev_id.encode('utf8')
+    return rev_id

=== modified file 'breezy/i18n.py'
--- breezy/i18n.py	2017-11-12 13:53:51 +0000
+++ breezy/i18n.py	2018-08-07 21:08:25 +0000
@@ -28,6 +28,8 @@
 import os
 import sys
 
+from .sixish import text_type
+
 
 _translations = None
 
@@ -208,8 +210,7 @@
 
     :param domain: Gettext domain name (usually 'brz-PLUGINNAME')
     """
-    locale_base = os.path.dirname(
-        unicode(__file__, sys.getfilesystemencoding()))
+    locale_base = os.path.dirname(__file__)
     translation = install_translations(domain=domain,
         locale_base=locale_base)
     add_fallback(translation)

=== modified file 'breezy/log.py'
--- breezy/log.py	2018-07-25 21:22:37 +0000
+++ breezy/log.py	2018-08-07 21:08:25 +0000
@@ -464,7 +464,7 @@
         for revs in revision_iterator:
             for (rev_id, revno, merge_depth), rev, delta in revs:
                 # 0 levels means show everything; merge_depth counts from 0
-                if levels != 0 and merge_depth >= levels:
+                if levels != 0 and merge_depth is not None and merge_depth >= levels:
                     continue
                 if omit_merges and len(rev.parent_ids) > 1:
                     continue

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2018-07-15 18:45:17 +0000
+++ breezy/merge.py	2018-08-07 21:08:25 +0000
@@ -58,12 +58,10 @@
 
 
 def transform_tree(from_tree, to_tree, interesting_files=None):
-    from_tree.lock_tree_write()
-    operation = cleanup.OperationWithCleanups(merge_inner)
-    operation.add_cleanup(from_tree.unlock)
-    operation.run_simple(from_tree.branch, to_tree, from_tree,
-        ignore_zero=True, this_tree=from_tree,
-        interesting_files=interesting_files)
+    with from_tree.lock_tree_write():
+        merge_inner(from_tree.branch, to_tree, from_tree,
+            ignore_zero=True, this_tree=from_tree,
+            interesting_files=interesting_files)
 
 
 class MergeHooks(hooks.Hooks):
@@ -788,17 +786,10 @@
             pass
 
     def make_preview_transform(self):
-        operation = cleanup.OperationWithCleanups(self._make_preview_transform)
-        self.base_tree.lock_read()
-        operation.add_cleanup(self.base_tree.unlock)
-        self.other_tree.lock_read()
-        operation.add_cleanup(self.other_tree.unlock)
-        return operation.run_simple()
-
-    def _make_preview_transform(self):
-        self.tt = transform.TransformPreview(self.working_tree)
-        self._compute_transform()
-        return self.tt
+        with self.base_tree.lock_read(), self.other_tree.lock_read():
+            self.tt = transform.TransformPreview(self.working_tree)
+            self._compute_transform()
+            return self.tt
 
     def _compute_transform(self):
         if self._lca_trees is None:

=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
--- breezy/plugins/weave_fmt/test_bzrdir.py	2018-07-24 21:21:21 +0000
+++ breezy/plugins/weave_fmt/test_bzrdir.py	2018-08-07 21:08:25 +0000
@@ -402,7 +402,7 @@
         self.addCleanup(repo.unlock)
         text_keys = repo.texts.keys()
         dir_keys = [key for key in text_keys if key[0] ==
-                'dir-20051005095101-da1441ea3fa6917a']
+                b'dir-20051005095101-da1441ea3fa6917a']
         self.assertNotEqual([], dir_keys)
 
     def test_upgrade_to_meta_sets_workingtree_last_revision(self):

=== modified file 'breezy/status.py'
--- breezy/status.py	2018-07-22 17:06:14 +0000
+++ breezy/status.py	2018-08-07 21:08:25 +0000
@@ -316,7 +316,7 @@
         for num, sub_merge, depth, eom in rev_id_iterator:
             rev = revisions[sub_merge]
             if rev is None:
-                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
+                to_file.write(sub_prefix + '(ghost) ' + sub_merge.decode('utf-8') + '\n')
                 continue
             show_log_message(revisions[sub_merge], sub_prefix)
 

=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2018-07-19 22:55:15 +0000
+++ breezy/tests/per_intertree/test_compare.py	2018-08-07 21:08:25 +0000
@@ -1427,7 +1427,7 @@
         expected = [
             self.unchanged(tree1, tree1.path2id('')),
             self.added(tree2, b'added'),
-            self.content_changed(tree2, 'changed'),
+            self.content_changed(tree2, b'changed'),
             self.kind_changed(tree1, tree2, b'fromdir'),
             self.kind_changed(tree1, tree2, b'fromfile'),
             self.deleted(tree1, b'removed'),
@@ -1448,7 +1448,7 @@
         root_id = tree1.path2id('')
         expected = [
             self.added(tree2, b'added'),
-            self.content_changed(tree2, 'changed'),
+            self.content_changed(tree2, b'changed'),
             self.kind_changed(tree1, tree2, b'fromdir'),
             self.kind_changed(tree1, tree2, b'fromfile'),
             self.deleted(tree1, b'removed'),

=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2018-07-27 18:57:21 +0000
+++ breezy/tests/per_repository/test_repository.py	2018-08-07 21:08:25 +0000
@@ -411,7 +411,7 @@
             # roundtrip xml invalid characters in the xml-based serializers.
             escaped_message, escape_count = re.subn(
                 u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
-                lambda match: match.group(0).encode('unicode_escape'),
+                lambda match: match.group(0).encode('unicode_escape').decode('ascii'),
                 message)
             self.assertEqual(rev.message, escaped_message)
         else:

=== modified file 'breezy/tests/per_workingtree/test_paths2ids.py'
--- breezy/tests/per_workingtree/test_paths2ids.py	2018-07-02 23:41:13 +0000
+++ breezy/tests/per_workingtree/test_paths2ids.py	2018-08-07 21:08:25 +0000
@@ -166,12 +166,12 @@
         tree.unversion(['dir/child-goes'])
         tree.rename_one('dir/child-moves', 'child-moves')
         self.build_tree(['tree/newdir/'])
-        tree.add(['newdir'], ['newdir'])
+        tree.add(['newdir'], [b'newdir'])
         tree.rename_one('dir/child-stays', 'child-stays')
         tree.rename_one('dir', 'newdir/dir')
         tree.rename_one('child-stays', 'newdir/dir/child-stays')
         self.build_tree(['tree/newdir/dir/new-child'])
-        tree.add(['newdir/dir/new-child'], ['new-child'])
+        tree.add(['newdir/dir/new-child'], [b'new-child'])
         self.assertExpectedIds(
             [b'newdir', b'dir', b'child-moves', b'child-stays', b'child-goes',
              b'new-child'], tree, ['newdir'], [basis])

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-07-24 21:44:05 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2018-08-07 21:08:25 +0000
@@ -1207,7 +1207,7 @@
         self.build_tree(['tree/subdir/', 'tree/subdir/somefile'])
         tree.add(['subdir', 'subdir/somefile'])
 
-        with open('tree/subdir/m\xb5', 'wb') as f:
+        with open(b'tree/subdir/m\xb5', 'wb') as f:
             f.write(b'trivial\n')
 
         tree.lock_read()
@@ -1220,7 +1220,7 @@
                                   tree.iter_changes, tree.basis_tree(),
                                   want_unversioned=True)
         # We should display the relative path
-        self.assertEqual('subdir/m\xb5', e.filename)
+        self.assertEqual(b'subdir/m\xb5', e.filename)
         self.assertEqual(osutils._fs_enc, e.fs_encoding)
 
 

=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2018-08-03 00:47:53 +0000
+++ breezy/tests/test_bzrdir.py	2018-08-07 21:08:25 +0000
@@ -1227,14 +1227,14 @@
             raise TestSkipped('unable to make file hidden without pywin32 library')
         b = bzrdir.BzrDir.create('.')
         self.build_tree(['a'])
-        self.assertEqual(['a'], self.get_ls())
+        self.assertEqual([b'a'], self.get_ls())
 
     def test_dot_bzr_hidden_with_url(self):
         if sys.platform == 'win32' and not win32utils.has_win32file:
             raise TestSkipped('unable to make file hidden without pywin32 library')
         b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
         self.build_tree(['a'])
-        self.assertEqual(['a'], self.get_ls())
+        self.assertEqual([b'a'], self.get_ls())
 
 
 class _TestBzrDirFormat(bzrdir.BzrDirMetaFormat1):
@@ -1404,7 +1404,7 @@
         self.assertEqual("a.~1~", self._bzrdir._available_backup_name("a"))
 
     def test_exiting(self):
-        self._transport.put_bytes("a.~1~", "some content")
+        self._transport.put_bytes("a.~1~", b"some content")
         self.assertEqual("a.~2~", self._bzrdir._available_backup_name("a"))
 
 
@@ -1474,7 +1474,7 @@
         self.assertEqual(format.as_string(),
             b"First line\n"
             b"required foo\n")
-        format.features["another"] = "optional"
+        format.features[b"another"] = b"optional"
         self.assertEqual(format.as_string(),
             b"First line\n"
             b"optional another\n"

=== modified file 'breezy/tests/test_chk_map.py'
--- breezy/tests/test_chk_map.py	2018-07-12 00:59:12 +0000
+++ breezy/tests/test_chk_map.py	2018-08-07 21:08:25 +0000
@@ -407,20 +407,20 @@
         map_two = CHKMap(store, None)
         map_two._root_node.set_maximum_size(20)
         self.assertMapLayoutEqual(map_one, map_two)
-        map_one.map(b'aaa', b'value')
+        map_one.map((b'aaa', ), b'value')
         self.assertRaises(AssertionError,
             self.assertMapLayoutEqual, map_one, map_two)
-        map_two.map(b'aaa', b'value')
+        map_two.map((b'aaa', ), b'value')
         self.assertMapLayoutEqual(map_one, map_two)
         # Split the tree, so we ensure that internal nodes and leaf nodes are
         # properly checked
-        map_one.map(b'aab', b'value')
+        map_one.map((b'aab', ), b'value')
         self.assertIsInstance(map_one._root_node, InternalNode)
         self.assertRaises(AssertionError,
             self.assertMapLayoutEqual, map_one, map_two)
-        map_two.map(b'aab', b'value')
+        map_two.map((b'aab', ), b'value')
         self.assertMapLayoutEqual(map_one, map_two)
-        map_one.map(b'aac', b'value')
+        map_one.map((b'aac', ), b'value')
         self.assertRaises(AssertionError,
             self.assertMapLayoutEqual, map_one, map_two)
         self.assertCanonicalForm(map_one)
@@ -434,7 +434,7 @@
 
     def test_from_dict_ab(self):
         chk_bytes = self.get_chk_bytes()
-        root_key = CHKMap.from_dict(chk_bytes, {b"a": b"b"})
+        root_key = CHKMap.from_dict(chk_bytes, {(b"a", ): b"b"})
         # Check the data was saved and inserted correctly.
         expected_root_key = self.assertHasABMap(chk_bytes)
         self.assertEqual(expected_root_key, root_key)
@@ -445,7 +445,7 @@
         chk_bytes = self.get_chk_bytes()
         root_key = CHKMap.from_dict(chk_bytes, {})
         chkmap = CHKMap(chk_bytes, root_key)
-        new_root = chkmap.apply_delta([(None, b"a", b"b")])
+        new_root = chkmap.apply_delta([(None, (b"a", ), b"b")])
         # Check the data was saved and inserted correctly.
         expected_root_key = self.assertHasABMap(chk_bytes)
         self.assertEqual(expected_root_key, new_root)
@@ -1143,7 +1143,7 @@
     def test_iteritems_two_items(self):
         chk_bytes = self.get_chk_bytes()
         root_key = CHKMap.from_dict(chk_bytes,
-            {b"a": b"content here", b"b": b"more content"})
+            {(b"a", ): b"content here", (b"b", ): b"more content"})
         chkmap = CHKMap(chk_bytes, root_key)
         self.assertEqual([((b"a",), b"content here"), ((b"b",), b"more content")],
             sorted(list(chkmap.iteritems())))
@@ -1561,8 +1561,8 @@
         self.assertEqual(None, node.key())
 
     def test_key_after_map(self):
-        node = LeafNode.deserialise("chkleaf:\n10\n1\n0\n\n", ("sha1:1234",))
-        node.map(None, ("foo bar",), "baz quux")
+        node = LeafNode.deserialise(b"chkleaf:\n10\n1\n0\n\n", (b"sha1:1234",))
+        node.map(None, (b"foo bar",), b"baz quux")
         self.assertEqual(None, node.key())
 
     def test_key_after_unmap(self):

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2018-08-01 19:37:07 +0000
+++ breezy/tests/test_commit.py	2018-08-07 21:08:25 +0000
@@ -117,7 +117,7 @@
         with open('hello', 'w') as f: f.write('hello world')
         wt.add('hello')
         revid = wt.commit(message='add hello', rev_id=b'revid', lossy=True)
-        self.assertEqual('revid', revid)
+        self.assertEqual(b'revid', revid)
 
     def test_commit_lossy_foreign(self):
         """Attempt a lossy commit to a foreign branch."""
@@ -129,7 +129,7 @@
         wt.add('hello')
         revid = wt.commit(message='add hello', lossy=True,
             timestamp=1302659388, timezone=0)
-        self.assertEqual(b'dummy-v1:1302659388.0-0-UNKNOWN', revid)
+        self.assertEqual(b'dummy-v1:1302659388-0-UNKNOWN', revid)
 
     def test_commit_bound_lossy_foreign(self):
         """Attempt a lossy commit to a bzr branch bound to a foreign branch."""
@@ -142,10 +142,10 @@
         wt.add('hello')
         revid = wt.commit(message='add hello', lossy=True,
             timestamp=1302659388, timezone=0)
-        self.assertEqual(b'dummy-v1:1302659388.0-0-0', revid)
-        self.assertEqual(b'dummy-v1:1302659388.0-0-0',
+        self.assertEqual(b'dummy-v1:1302659388-0-0', revid)
+        self.assertEqual(b'dummy-v1:1302659388-0-0',
             foreign_branch.last_revision())
-        self.assertEqual(b'dummy-v1:1302659388.0-0-0',
+        self.assertEqual(b'dummy-v1:1302659388-0-0',
             wt.branch.last_revision())
 
     def test_missing_commit(self):
@@ -357,7 +357,7 @@
             with open('hello', 'w') as f: f.write((str(i) * 4) + '\n')
             if i == 0:
                 wt.add(['hello'], [b'hello-id'])
-            rev_id = 'test@rev-%d' % (i+1)
+            rev_id = b'test@rev-%d' % (i+1)
             rev_ids.append(rev_id)
             wt.commit(message='rev %d' % (i+1),
                      rev_id=rev_id)
@@ -423,7 +423,7 @@
         wt = self.make_branch_and_tree('.')
         branch = wt.branch
         wt.commit("base", allow_pointless=True, rev_id=b'A')
-        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
+        self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
         try:
             from ..testament import Testament
             # monkey patch gpg signing mechanism
@@ -438,8 +438,8 @@
                 return breezy.gpg.LoopbackGPGStrategy(None).sign(
                         text, breezy.gpg.MODE_CLEAR)
             self.assertEqual(sign(Testament.from_revision(branch.repository,
-                                                          'B').as_short_text()),
-                             branch.repository.get_signature_text('B'))
+                                                          b'B').as_short_text()),
+                             branch.repository.get_signature_text(b'B'))
         finally:
             breezy.gpg.GPGStrategy = oldstrategy
 

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2018-06-22 01:50:22 +0000
+++ breezy/tests/test_config.py	2018-08-07 21:08:25 +0000
@@ -1495,9 +1495,9 @@
         self.assertEqual('/environ-bzr', my_config.get_bzr_remote_path())
 
 
-precedence_global = 'option = global'
-precedence_branch = 'option = branch'
-precedence_location = """
+precedence_global = b'option = global'
+precedence_branch = b'option = branch'
+precedence_location = b"""
 [http://]
 recurse = true
 option = recurse

=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2018-08-03 02:26:35 +0000
+++ breezy/tests/test_conflicts.py	2018-08-07 21:08:25 +0000
@@ -43,22 +43,22 @@
 # '\xc3\xae' == u'\xee' == i with hat
 # So these are u'path' and 'id' only with a circle and a hat. (shappo?)
 example_conflicts = conflicts.ConflictList(
-    [conflicts.MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
-     conflicts.ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
+    [conflicts.MissingParent('Not deleting', u'p\xe5thg', b'\xc3\xaedg'),
+     conflicts.ContentsConflict(u'p\xe5tha', None, b'\xc3\xaeda'),
      conflicts.TextConflict(u'p\xe5tha'),
-     conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
+     conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', b'\xc3\xaedb'),
      conflicts.DuplicateID('Unversioned existing file',
                            u'p\xe5thc', u'p\xe5thc2',
-                           '\xc3\xaedc', '\xc3\xaedc'),
+                           b'\xc3\xaedc', b'\xc3\xaedc'),
     conflicts.DuplicateEntry('Moved existing file to',
                              u'p\xe5thdd.moved', u'p\xe5thd',
-                             '\xc3\xaedd', None),
+                             b'\xc3\xaedd', None),
     conflicts.ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
-                         None, '\xc3\xaed2e'),
+                         None, b'\xc3\xaed2e'),
     conflicts.UnversionedParent('Versioned directory',
-                                u'p\xe5thf', '\xc3\xaedf'),
+                                u'p\xe5thf', b'\xc3\xaedf'),
     conflicts.NonDirectoryParent('Created directory',
-                                 u'p\xe5thg', '\xc3\xaedg'),
+                                 u'p\xe5thg', b'\xc3\xaedg'),
 ])
 
 
@@ -933,18 +933,18 @@
             (dict(_base_actions='create_dir1_dir2'),
              ('dir1_into_dir2',
               dict(actions='move_dir1_into_dir2', check='dir1_moved',
-                   dir_id=b'dir1-id', target_id='dir2-id', xfail=False)),
+                   dir_id=b'dir1-id', target_id=b'dir2-id', xfail=False)),
              ('dir2_into_dir1',
               dict(actions='move_dir2_into_dir1', check='dir2_moved',
-                   dir_id=b'dir2-id', target_id='dir1-id', xfail=False))),
+                   dir_id=b'dir2-id', target_id=b'dir1-id', xfail=False))),
             # Subdirs moved into each other
             (dict(_base_actions='create_dir1_4'),
              ('dir1_into_dir4',
               dict(actions='move_dir1_into_dir4', check='dir1_2_moved',
-                   dir_id=b'dir1-id', target_id='dir4-id', xfail=True)),
+                   dir_id=b'dir1-id', target_id=b'dir4-id', xfail=True)),
              ('dir3_into_dir2',
               dict(actions='move_dir3_into_dir2', check='dir3_4_moved',
-                   dir_id=b'dir3-id', target_id='dir2-id', xfail=True))),
+                   dir_id=b'dir3-id', target_id=b'dir2-id', xfail=True))),
             ])
 
     def do_create_dir1_dir2(self):

=== modified file 'breezy/tests/test_email_message.py'
--- breezy/tests/test_email_message.py	2018-08-01 19:37:07 +0000
+++ breezy/tests/test_email_message.py	2018-08-07 21:08:25 +0000
@@ -23,6 +23,7 @@
 from .. import __version__ as _breezy_version
 from ..email_message import EmailMessage
 from ..errors import BzrBadParameterNotUnicode
+from ..sixish import text_type
 from ..smtp_connection import SMTPConnection
 from .. import tests
 
@@ -110,10 +111,10 @@
 
     def test_simple_message(self):
         pairs = {
-            'body': SIMPLE_MESSAGE_ASCII,
+            b'body': SIMPLE_MESSAGE_ASCII,
             u'b\xf3dy': SIMPLE_MESSAGE_UTF8,
-            'b\xc3\xb3dy': SIMPLE_MESSAGE_UTF8,
-            'b\xf4dy': SIMPLE_MESSAGE_8BIT,
+            b'b\xc3\xb3dy': SIMPLE_MESSAGE_UTF8,
+            b'b\xf4dy': SIMPLE_MESSAGE_8BIT,
         }
         for body, expected in pairs.items():
             msg = EmailMessage('[e-mail]', '[e-mail]', 'subject', body)
@@ -205,10 +206,9 @@
     def test_string_with_encoding(self):
         pairs = {
                 u'Pepe':        (b'Pepe', 'ascii'),
-                u'P\xe9rez':    ('P\xc3\xa9rez', 'utf-8'),
-                'Perez':         ('Perez', 'ascii'), # u'Pepe' == 'Pepe'
-                'P\xc3\xa9rez': ('P\xc3\xa9rez', 'utf-8'),
-                'P\xe8rez':     ('P\xe8rez', '8-bit'),
+                u'P\xe9rez':    (b'P\xc3\xa9rez', 'utf-8'),
+                b'P\xc3\xa9rez': (b'P\xc3\xa9rez', 'utf-8'),
+                b'P\xe8rez':     (b'P\xe8rez', '8-bit'),
         }
         for string_, pair in pairs.items():
             self.assertEqual(pair, EmailMessage.string_with_encoding(string_))

=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/test_foreign.py	2018-08-07 21:08:25 +0000
@@ -129,7 +129,7 @@
         mapping = DummyForeignVcsMapping(DummyForeignVcs())
         if self._lossy:
             self._new_revision_id = mapping.revision_id_foreign_to_bzr(
-                (str(self._timestamp).encode('ascii'),
+                (b'%d' % self._timestamp,
                  str(self._timezone).encode('ascii'), b"UNKNOWN"))
             self.random_revid = False
         elif revid is not None:
@@ -198,7 +198,7 @@
                     return (tree.get_file(path, file_id), None)
                 tree.get_file_with_stat = get_file_with_stat
                 new_revid = self.target.mapping.revision_id_foreign_to_bzr(
-                    (str(rev.timestamp).encode('ascii'), str(rev.timezone).encode('ascii'),
+                    (b'%d' % rev.timestamp, str(rev.timezone).encode('ascii'),
                         str(self.target.revno()).encode('ascii')))
                 parent_revno, parent_revid= self.target.last_revision_info()
                 if parent_revid == revision.NULL_REVISION:

=== modified file 'breezy/tests/test_generate_ids.py'
--- breezy/tests/test_generate_ids.py	2018-08-01 19:37:07 +0000
+++ breezy/tests/test_generate_ids.py	2018-08-07 21:08:25 +0000
@@ -33,7 +33,7 @@
         file_id = generate_ids.gen_file_id(filename)
         self.assertContainsRe(file_id, b'^'+regex+b'$')
         # It should be a utf8 file_id, not a unicode one
-        self.assertIsInstance(file_id, str)
+        self.assertIsInstance(file_id, bytes)
         # gen_file_id should always return ascii file ids.
         file_id.decode('ascii')
 
@@ -41,14 +41,14 @@
         gen_file_id = generate_ids.gen_file_id
 
         # We try to use the filename if possible
-        self.assertStartsWith(gen_file_id(b'bar'), b'bar-')
+        self.assertStartsWith(gen_file_id('bar'), b'bar-')
 
         # but we squash capitalization, and remove non word characters
-        self.assertStartsWith(gen_file_id(b'Mwoo oof\t m'), b'mwoooofm-')
+        self.assertStartsWith(gen_file_id('Mwoo oof\t m'), b'mwoooofm-')
 
         # We also remove leading '.' characters to prevent hidden file-ids
-        self.assertStartsWith(gen_file_id(b'..gam.py'), b'gam.py-')
-        self.assertStartsWith(gen_file_id(b'..Mwoo oof\t m'), b'mwoooofm-')
+        self.assertStartsWith(gen_file_id('..gam.py'), b'gam.py-')
+        self.assertStartsWith(gen_file_id('..Mwoo oof\t m'), b'mwoooofm-')
 
         # we remove unicode characters, and still don't end up with a
         # hidden file id
@@ -61,18 +61,18 @@
 
         # Test both case squashing and length restriction
         fid = gen_file_id('A'*50 + '.txt')
-        self.assertStartsWith(fid, 'a'*20 + '-')
+        self.assertStartsWith(fid, b'a'*20 + b'-')
         self.assertTrue(len(fid) < 60)
 
         # restricting length happens after the other actions, so
         # we preserve as much as possible
         fid = gen_file_id('\xe5\xb5..aBcd\tefGhijKLMnop\tqrstuvwxyz')
-        self.assertStartsWith(fid, 'abcdefghijklmnopqrst-')
+        self.assertStartsWith(fid, b'abcdefghijklmnopqrst-')
         self.assertTrue(len(fid) < 60)
 
     def test_file_ids_are_ascii(self):
         tail = br'-\d{14}-[a-z0-9]{16}-\d+'
-        self.assertGenFileId(b'foo' + tail, b'foo')
+        self.assertGenFileId(b'foo' + tail, 'foo')
         self.assertGenFileId(b'foo' + tail, u'foo')
         self.assertGenFileId(b'bar' + tail, u'bar')
         self.assertGenFileId(b'br' + tail, u'b\xe5r')

=== modified file 'breezy/tests/test_http.py'
--- breezy/tests/test_http.py	2018-08-01 19:37:07 +0000
+++ breezy/tests/test_http.py	2018-08-07 21:08:25 +0000
@@ -2159,7 +2159,7 @@
 
     def setUp(self):
         super(TestNoReportActivity, self).setUp()
-        self._transport =HttpTransport
+        self._transport = HttpTransport
         TestActivityMixin.setUp(self)
 
     def assertActivitiesMatch(self):

=== modified file 'breezy/tests/test_i18n.py'
--- breezy/tests/test_i18n.py	2018-08-01 19:37:07 +0000
+++ breezy/tests/test_i18n.py	2018-08-07 21:08:25 +0000
@@ -24,6 +24,7 @@
     errors,
     workingtree,
     )
+from ..sixish import PY3
 
 
 class ZzzTranslations(object):
@@ -40,6 +41,9 @@
     def gettext(self, s):
         return self.zzz(self._null_translation.gettext(s))
 
+    def ngettext(self, s, p, n):
+        return self.zzz(self._null_translation.ngettext(s, p, n))
+
     def ugettext(self, s):
         return self.zzz(self._null_translation.ugettext(s))
 
@@ -59,16 +63,28 @@
         t = trans.zzz('msg')
         self._check_exact(u'zz\xe5{{msg}}', t)
 
-        t = trans.ugettext('msg')
-        self._check_exact(u'zz\xe5{{msg}}', t)
-
-        t = trans.ungettext('msg1', 'msg2', 0)
-        self._check_exact(u'zz\xe5{{msg2}}', t)
-        t = trans.ungettext('msg1', 'msg2', 2)
-        self._check_exact(u'zz\xe5{{msg2}}', t)
-
-        t = trans.ungettext('msg1', 'msg2', 1)
-        self._check_exact(u'zz\xe5{{msg1}}', t)
+        if PY3:
+            t = trans.gettext('msg')
+            self._check_exact(u'zz\xe5{{msg}}', t)
+
+            t = trans.ngettext('msg1', 'msg2', 0)
+            self._check_exact(u'zz\xe5{{msg2}}', t)
+            t = trans.ngettext('msg1', 'msg2', 2)
+            self._check_exact(u'zz\xe5{{msg2}}', t)
+
+            t = trans.ngettext('msg1', 'msg2', 1)
+            self._check_exact(u'zz\xe5{{msg1}}', t)
+        else:
+            t = trans.ugettext('msg')
+            self._check_exact(u'zz\xe5{{msg}}', t)
+
+            t = trans.ungettext('msg1', 'msg2', 0)
+            self._check_exact(u'zz\xe5{{msg2}}', t)
+            t = trans.ungettext('msg1', 'msg2', 2)
+            self._check_exact(u'zz\xe5{{msg2}}', t)
+
+            t = trans.ungettext('msg1', 'msg2', 1)
+            self._check_exact(u'zz\xe5{{msg1}}', t)
 
 
 class TestGetText(tests.TestCase):
@@ -148,8 +164,11 @@
             workingtree.WorkingTree.open('./foo')
         except errors.NotBranchError as e:
             err = str(e)
-        self.assertContainsRe(err, 
-                              u"zz\xe5{{Not a branch: .*}}".encode("utf-8"))
+        if PY3:
+            self.assertContainsRe(err, u"zz\xe5{{Not a branch: .*}}")
+        else:
+            self.assertContainsRe(
+                    err, u"zz\xe5{{Not a branch: .*}}".encode('utf-8'))
 
     def test_topic_help_translation(self):
         """does topic help get translated?"""

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2018-07-15 18:45:17 +0000
+++ breezy/tests/test_merge.py	2018-08-07 21:08:25 +0000
@@ -3080,7 +3080,7 @@
         builder = self.make_builder()
         builder.add_file(b'bar-id', builder.tree_root, 'bar', b'text1', True,
                          this=False)
-        builder.add_dir(b'bar-dir', builder.tree_root, b'bar-id',
+        builder.add_dir(b'bar-dir', builder.tree_root, 'bar-id',
                         base=False, other=False)
         return builder
 

=== modified file 'breezy/tests/test_options.py'
--- breezy/tests/test_options.py	2018-07-31 00:06:59 +0000
+++ breezy/tests/test_options.py	2018-08-07 21:08:25 +0000
@@ -81,7 +81,7 @@
 
     def test_unknown_short_opt(self):
         out, err = self.run_bzr('help -r', retcode=3)
-        self.assertContainsRe(err, br'no such option')
+        self.assertContainsRe(err, r'no such option')
 
     def test_set_short_name(self):
         o = option.Option('wiggle')

=== modified file 'breezy/tests/test_reconfigure.py'
--- breezy/tests/test_reconfigure.py	2018-06-18 02:13:57 +0000
+++ breezy/tests/test_reconfigure.py	2018-08-07 21:08:25 +0000
@@ -385,7 +385,7 @@
         tree = workingtree.WorkingTree.open('root/tree')
         repo = tree.branch.repository
         self.assertRaises(errors.NoSuchRevision, repo.get_revision,
-                          'dead-head-id')
+                          b'dead-head-id')
 
     def test_standalone_to_standalone(self):
         tree = self.make_branch_and_tree('tree')

=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2018-07-25 21:49:15 +0000
+++ breezy/tests/test_remote.py	2018-08-07 21:08:25 +0000
@@ -1045,7 +1045,7 @@
         # XXX: It would be better to call fmt.initialize_on_transport_ex, but
         # it's currently hard to test that without supplying a real remote
         # transport connected to a real server.
-        result = fmt._initialize_on_transport_ex_rpc(client, 'path',
+        result = fmt._initialize_on_transport_ex_rpc(client, b'path',
             transport, False, False, False, None, None, None, None, False)
         self.assertFinished(client)
 
@@ -1067,7 +1067,7 @@
         # it's currently hard to test that without supplying a real remote
         # transport connected to a real server.
         err = self.assertRaises(errors.PermissionDenied,
-            fmt._initialize_on_transport_ex_rpc, client, 'path', transport,
+            fmt._initialize_on_transport_ex_rpc, client, b'path', transport,
             False, False, False, None, None, None, None, False)
         self.assertEqual('path', err.path)
         self.assertEqual(': extra info', err.extra)
@@ -1596,8 +1596,8 @@
         client = FakeClient(self.get_url())
         branch_network_name = self.get_branch_format().network_name()
         client.add_expected_call(
-            b'BzrDir.open_branchV3', ('stacked/',),
-            b'success', ('branch', branch_network_name))
+            b'BzrDir.open_branchV3', (b'stacked/',),
+            b'success', (b'branch', branch_network_name))
         client.add_expected_call(
             b'BzrDir.find_repositoryV3', (b'stacked/',),
             b'success', (b'ok', b'', b'yes', b'no', b'yes', network_name))
@@ -1994,7 +1994,7 @@
         client.add_expected_call(
             b'Branch.lock_write', (b'memory:///', b'', b''),
             b'success', (b'ok', b'branch token', b'repo token'))
-        encoded_dict_value = 'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
+        encoded_dict_value = b'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
         client.add_expected_call(
             b'Branch.set_config_option_dict', (b'memory:///', b'branch token',
             b'repo token', encoded_dict_value, b'foo', b''),

=== modified file 'breezy/tests/test_rename_map.py'
--- breezy/tests/test_rename_map.py	2018-07-24 21:44:05 +0000
+++ breezy/tests/test_rename_map.py	2018-08-07 21:08:25 +0000
@@ -46,8 +46,8 @@
         tree.add('a', b'a')
         rn = RenameMap(tree)
         rn.add_file_edge_hashes(tree, [b'a'])
-        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
-        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
+        self.assertEqual({b'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
+        self.assertEqual({b'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
         self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
 
     def test_hitcounts(self):
@@ -63,8 +63,8 @@
         rn = RenameMap(tree)
         rn.add_edge_hashes(self.a_lines, 'aid')
         rn.add_edge_hashes(self.b_lines, 'bid')
-        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
-        self.build_tree_contents([('tree/b', ''.join(self.b_lines))])
+        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
+        self.build_tree_contents([('tree/b', b''.join(self.b_lines))])
         self.assertEqual({'a': 'aid', 'b': 'bid'},
                          rn.file_match(['a', 'b']))
 

=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2018-08-03 00:47:53 +0000
+++ breezy/tests/test_repository.py	2018-08-07 21:08:25 +0000
@@ -255,7 +255,7 @@
         tree.add(['foo'], [b'Nasty-IdC:'], ['file'])
         tree.put_file_bytes_non_atomic('foo', b'')
         tree.commit('1st post', rev_id=b'foo')
-        self.assertHasKnit(t, b'knits/e8/%254easty-%2549d%2543%253a',
+        self.assertHasKnit(t, 'knits/e8/%254easty-%2549d%2543%253a',
             b'\nfoo fulltext 0 81  :')
 
     def assertHasKnit(self, t, knit_name, extra_content=b''):
@@ -265,9 +265,9 @@
 
     def check_knits(self, t):
         """check knit content for a repository."""
-        self.assertHasKnit(t, b'inventory')
-        self.assertHasKnit(t, b'revisions')
-        self.assertHasKnit(t, b'signatures')
+        self.assertHasKnit(t, 'inventory')
+        self.assertHasKnit(t, 'revisions')
+        self.assertHasKnit(t, 'signatures')
 
     def test_shared_disk_layout(self):
         control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
@@ -737,7 +737,7 @@
                           (b'sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
                           (b'sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
                           (b'sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)},
-                         simple_chk_records)
+                         set(simple_chk_records))
         # Now, when we do a similar call using 'get_stream_for_missing_keys'
         # we should get a much larger set of pages.
         missing = [('inventories', b'rev-2')]
@@ -956,13 +956,15 @@
 
     def add_file(self, repo, inv, filename, revision, parents):
         file_id = filename.encode('utf-8') + b'-id'
+        content = [b'line\n']
         entry = inventory.InventoryFile(file_id, filename, b'TREE_ROOT')
         entry.revision = revision
+        entry.text_sha1 = osutils.sha_strings(content)
         entry.text_size = 0
         inv.add(entry)
         text_key = (file_id, revision)
         parent_keys = [(file_id, parent) for parent in parents]
-        repo.texts.add_lines(text_key, parent_keys, [b'line\n'])
+        repo.texts.add_lines(text_key, parent_keys, content)
 
     def test_insert_from_broken_repo(self):
         """Inserting a data stream from a broken repository won't silently

=== modified file 'breezy/tests/test_revert.py'
--- breezy/tests/test_revert.py	2018-07-07 19:27:38 +0000
+++ breezy/tests/test_revert.py	2018-08-07 21:08:25 +0000
@@ -103,7 +103,8 @@
         self.addCleanup(tree.unlock)
         self.assertTrue(tree.is_executable('newfile'))
         transform.revert(tree, tree.basis_tree(), None, backups=True)
-        self.assertEqual('helooo!', tree.get_file('newfile').read())
+        with tree.get_file('newfile', 'rb') as f:
+            self.assertEqual(b'helooo!', f.read())
         self.assertTrue(tree.is_executable('newfile'))
 
     def test_revert_executable(self):

=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2018-07-31 17:39:09 +0000
+++ breezy/tests/test_selftest.py	2018-08-07 21:08:25 +0000
@@ -18,6 +18,7 @@
 
 import gc
 import doctest
+from functools import reduce
 import os
 import signal
 import sys
@@ -790,8 +791,8 @@
 
         This is used to exercise the test framework.
         """
-        self.time(text_type, 'hello', errors='replace')
-        self.time(text_type, 'world', errors='replace')
+        self.time(text_type, b'hello', errors='replace')
+        self.time(text_type, b'world', errors='replace')
 
     def test_lsprofiling(self):
         """Verbose test result prints lsprof statistics from test cases."""
@@ -821,14 +822,20 @@
         # and then repeated but with 'world', rather than 'hello'.
         # this should appear in the output stream of our test result.
         output = result_stream.getvalue()
-        self.assertContainsRe(output,
-            r"LSProf output for <type 'unicode'>\(\('hello',\), {'errors': 'replace'}\)")
+        if PY3:
+            self.assertContainsRe(output,
+                r"LSProf output for <class 'str'>\(\(b'hello',\), {'errors': 'replace'}\)")
+            self.assertContainsRe(output,
+                r"LSProf output for <class 'str'>\(\(b'world',\), {'errors': 'replace'}\)")
+        else:
+            self.assertContainsRe(output,
+                r"LSProf output for <type 'unicode'>\(\('hello',\), {'errors': 'replace'}\)")
+            self.assertContainsRe(output,
+                r"LSProf output for <type 'unicode'>\(\('world',\), {'errors': 'replace'}\)\n")
         self.assertContainsRe(output,
             r" *CallCount *Recursive *Total\(ms\) *Inline\(ms\) *module:lineno\(function\)\n")
         self.assertContainsRe(output,
             r"( +1 +0 +0\.\d+ +0\.\d+ +<method 'disable' of '_lsprof\.Profiler' objects>\n)?")
-        self.assertContainsRe(output,
-            r"LSProf output for <type 'unicode'>\(\('world',\), {'errors': 'replace'}\)\n")
 
     def test_uses_time_from_testtools(self):
         """Test case timings in verbose results should use testtools times"""
@@ -1912,9 +1919,14 @@
         self.assertRaises(AssertionError, self.assertIsInstance, 23.3, int)
         e = self.assertRaises(AssertionError,
             self.assertIsInstance, None, int, "it's just not")
-        self.assertEqual(str(e),
-            "None is an instance of <type 'NoneType'> rather than <type 'int'>"
-            ": it's just not")
+        if PY3:
+            self.assertEqual(str(e),
+                "None is an instance of <class 'NoneType'> rather than <class 'int'>: it's "
+                "just not")
+        else:
+            self.assertEqual(str(e),
+                "None is an instance of <type 'NoneType'> rather than <type 'int'>"
+                ": it's just not")
 
     def test_assertEndsWith(self):
         self.assertEndsWith('foo', 'oo')
@@ -2174,7 +2186,7 @@
 
     def test_load_list(self):
         # Provide a list with one test - this test.
-        test_id_line = b'%s\n' % self.id()
+        test_id_line = '%s\n' % self.id()
         self.build_tree_contents([('test.list', test_id_line)])
         # And generate a list of the tests in  the suite.
         stream = self.run_selftest(load_list='test.list', list_only=True)
@@ -2862,7 +2874,7 @@
         out, err = self.run_bzr(["log", "%s/nonexistantpath" % url], retcode=3)
         self.assertEqual(out, '')
         self.assertContainsRe(err,
-            b'brz: ERROR: Not a branch: ".*nonexistantpath/".\n')
+            'brz: ERROR: Not a branch: ".*nonexistantpath/".\n')
 
 
 class TestTestLoader(tests.TestCase):

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2018-07-26 02:19:13 +0000
+++ breezy/tests/test_transform.py	2018-08-07 21:08:25 +0000
@@ -62,6 +62,7 @@
 from ..mutabletree import MutableTree
 from ..sixish import (
     BytesIO,
+    PY3,
     text_type,
     )
 from . import (
@@ -2548,8 +2549,12 @@
         new_globals.update(globals)
         new_func = types.FunctionType(func.__code__, new_globals,
             func.__name__, func.__defaults__)
-        setattr(instance, method_name,
-            types.MethodType(new_func, instance, instance.__class__))
+        if PY3:
+            setattr(instance, method_name,
+                types.MethodType(new_func, instance))
+        else:
+            setattr(instance, method_name,
+                types.MethodType(new_func, instance, instance.__class__))
         self.addCleanup(delattr, instance, method_name)
 
     @staticmethod

=== modified file 'breezy/tests/test_upstream_import.py'
--- breezy/tests/test_upstream_import.py	2018-07-19 22:29:27 +0000
+++ breezy/tests/test_upstream_import.py	2018-08-07 21:08:25 +0000
@@ -66,11 +66,11 @@
         existing = fileobj.read()
         fileobj.seek(0)
         path = tempfile.mkdtemp(dir=os.getcwd())
-        if existing != '':
+        if existing != b'':
             # copytree requires the directory not to exist
             os.rmdir(path)
             copytree(existing, path)
-        fileobj.write(path)
+        fileobj.write(path.encode('utf-8'))
         self.root = path
 
     def add(self, path):
@@ -223,8 +223,7 @@
     def archive_test(self, builder, importer, subdir=False):
         archive_file = self.make_archive(builder, subdir)
         tree = BzrDir.create_standalone_workingtree('tree')
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             importer(tree, archive_file)
             self.assertTrue(tree.is_versioned('README'))
             self.assertTrue(tree.is_versioned('FEEDME'))
@@ -242,9 +241,6 @@
             # Ensure the second version of the file is used.
             self.assertEqual(tree.get_file_text('README'), b'Wow?')
             self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
-        finally:
-            tree.unlock()
-
 
     def test_untar2(self):
         tar_file = self.make_messed_tar()

=== modified file 'breezy/tests/test_urlutils.py'
--- breezy/tests/test_urlutils.py	2018-07-22 21:59:42 +0000
+++ breezy/tests/test_urlutils.py	2018-08-07 21:08:25 +0000
@@ -415,7 +415,7 @@
             raise TestSkipped("local encoding cannot handle unicode")
 
         self.assertEqual('file:///D:/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
-        self.assertFalse(isinstance(result, text_type))
+        self.assertIsInstance(result, str)
 
     def test_win32_unc_path_to_url(self):
         self.requireFeature(features.win32_feature)
@@ -654,7 +654,7 @@
     def test_escape(self):
         self.assertEqual('%25', urlutils.escape('%'))
         self.assertEqual('%C3%A5', urlutils.escape(u'\xe5'))
-        self.assertFalse(isinstance(urlutils.escape(u'\xe5'), text_type))
+        self.assertIsInstance(urlutils.escape(u'\xe5'), str)
 
     def test_escape_tildes(self):
         self.assertEqual('~foo', urlutils.escape('~foo'))
@@ -1050,5 +1050,12 @@
 
     def test_unquote(self):
         self.assertEqual('%', urlutils.unquote('%25'))
-        self.assertEqual('\xc3\xa5', urlutils.unquote('%C3%A5'))
+        if PY3:
+            self.assertEqual('\xe5', urlutils.unquote('%C3%A5'))
+        else:
+            self.assertEqual('\xc3\xa5', urlutils.unquote('%C3%A5'))
         self.assertEqual(u"\xe5", urlutils.unquote(u'\xe5'))
+
+    def test_unquote_to_bytes(self):
+        self.assertEqual(b'%', urlutils.unquote_to_bytes('%25'))
+        self.assertEqual(b'\xc3\xa5', urlutils.unquote_to_bytes('%C3%A5'))

=== modified file 'breezy/tests/test_version.py'
--- breezy/tests/test_version.py	2018-07-15 18:45:17 +0000
+++ breezy/tests/test_version.py	2018-08-07 21:08:25 +0000
@@ -25,8 +25,8 @@
     workingtree,
     )
 from ..sixish import (
-    BytesIO,
     PY3,
+    StringIO,
     )
 from .scenarios import load_tests_apply_scenarios
 
@@ -53,7 +53,7 @@
 
     def test_python_binary_path(self):
         self.permit_source_tree_branch_repo()
-        sio = BytesIO()
+        sio = StringIO()
         version.show_version(show_config=False, show_copyright=False,
             to_file=sio)
         out = sio.getvalue()

=== modified file 'breezy/tests/test_vf_search.py'
--- breezy/tests/test_vf_search.py	2018-06-29 15:36:29 +0000
+++ breezy/tests/test_vf_search.py	2018-08-07 21:08:25 +0000
@@ -35,8 +35,8 @@
 #   rev3  /
 #     |  /
 #   rev4
-ancestry_1 = {'rev1': [NULL_REVISION], 'rev2a': ['rev1'], 'rev2b': ['rev1'],
-              'rev3': ['rev2a'], 'rev4': ['rev3', 'rev2b']}
+ancestry_1 = {b'rev1': [NULL_REVISION], b'rev2a': [b'rev1'], b'rev2b': [b'rev1'],
+              b'rev3': [b'rev2a'], b'rev4': [b'rev3', b'rev2b']}
 
 # Ancestry 2:
 #
@@ -49,8 +49,8 @@
 # rev3a
 #   |
 # rev4a
-ancestry_2 = {'rev1a': [NULL_REVISION], 'rev2a': ['rev1a'],
-              'rev1b': [NULL_REVISION], 'rev3a': ['rev2a'], 'rev4a': ['rev3a']}
+ancestry_2 = {b'rev1a': [NULL_REVISION], b'rev2a': [b'rev1a'],
+              b'rev1b': [NULL_REVISION], b'rev3a': [b'rev2a'], b'rev4a': [b'rev3a']}
 
 
 # Extended history shortcut
@@ -65,12 +65,12 @@
 #       d |
 #       |\|
 #       e f
-extended_history_shortcut = {'a': [NULL_REVISION],
-                             'b': ['a'],
-                             'c': ['b'],
-                             'd': ['c'],
-                             'e': ['d'],
-                             'f': ['a', 'd'],
+extended_history_shortcut = {b'a': [NULL_REVISION],
+                             b'b': [b'a'],
+                             b'c': [b'b'],
+                             b'd': [b'c'],
+                             b'e': [b'd'],
+                             b'f': [b'a', b'd'],
                             }
 
 
@@ -83,18 +83,18 @@
         # Used when pulling from a stacked repository, so test some revisions
         # being satisfied from the stacking branch.
         g = self.make_graph(
-            {"tip":["mid"], "mid":["base"], "tag":["base"],
-             "base":[NULL_REVISION], NULL_REVISION:[]})
-        result = vf_search.SearchResult({'tip', 'tag'},
-            {NULL_REVISION}, 4, {'tip', 'mid', 'tag', 'base'})
-        result = result.refine({'tip'}, {'mid'})
+            {b"tip": [b"mid"], b"mid": [b"base"], b"tag": [b"base"],
+             b"base": [NULL_REVISION], NULL_REVISION:[]})
+        result = vf_search.SearchResult({b'tip', b'tag'},
+            {NULL_REVISION}, 4, {b'tip', b'mid', b'tag', b'base'})
+        result = result.refine({b'tip'}, {b'mid'})
         recipe = result.get_recipe()
         # We should be starting from tag (original head) and mid (seen ref)
-        self.assertEqual({'mid', 'tag'}, recipe[1])
+        self.assertEqual({b'mid', b'tag'}, recipe[1])
         # We should be stopping at NULL (original stop) and tip (seen head)
-        self.assertEqual({NULL_REVISION, 'tip'}, recipe[2])
+        self.assertEqual({NULL_REVISION, b'tip'}, recipe[2])
         self.assertEqual(3, recipe[3])
-        result = result.refine({'mid', 'tag', 'base'},
+        result = result.refine({b'mid', b'tag', b'base'},
             {NULL_REVISION})
         recipe = result.get_recipe()
         # We should be starting from nothing (NULL was known as a cut point)
@@ -103,7 +103,7 @@
         # tag (seen head) and mid(seen mid-point head). We could come back and
         # define this as not including mid, for minimal results, but it is
         # still 'correct' to include mid, and simpler/easier.
-        self.assertEqual({NULL_REVISION, 'tip', 'tag', 'mid'}, recipe[2])
+        self.assertEqual({NULL_REVISION, b'tip', b'tag', b'mid'}, recipe[2])
         self.assertEqual(0, recipe[3])
         self.assertTrue(result.is_empty())
 
@@ -122,30 +122,30 @@
         self.assertSearchResult([], [], 0, None)
 
     def test_ancestry_1(self):
-        self.assertSearchResult(['rev4'], [NULL_REVISION], len(ancestry_1),
+        self.assertSearchResult([b'rev4'], [NULL_REVISION], len(ancestry_1),
                                 ancestry_1)
 
     def test_ancestry_2(self):
-        self.assertSearchResult(['rev1b', 'rev4a'], [NULL_REVISION],
+        self.assertSearchResult([b'rev1b', b'rev4a'], [NULL_REVISION],
                                 len(ancestry_2), ancestry_2)
-        self.assertSearchResult(['rev1b', 'rev4a'], [],
+        self.assertSearchResult([b'rev1b', b'rev4a'], [],
                                 len(ancestry_2)+1, ancestry_2,
                                 missing_keys=[NULL_REVISION])
 
     def test_partial_search(self):
         parent_map = dict((k, extended_history_shortcut[k])
-                          for k in ['e', 'f'])
-        self.assertSearchResult(['e', 'f'], ['d', 'a'], 2,
+                          for k in [b'e', b'f'])
+        self.assertSearchResult([b'e', b'f'], [b'd', b'a'], 2,
                                 parent_map)
         parent_map.update((k, extended_history_shortcut[k])
-                          for k in ['d', 'a'])
-        self.assertSearchResult(['e', 'f'], ['c', NULL_REVISION], 4,
+                          for k in [b'd', b'a'])
+        self.assertSearchResult([b'e', b'f'], [b'c', NULL_REVISION], 4,
                                 parent_map)
-        parent_map['c'] = extended_history_shortcut['c']
-        self.assertSearchResult(['e', 'f'], ['b'], 6,
+        parent_map[b'c'] = extended_history_shortcut[b'c']
+        self.assertSearchResult([b'e', b'f'], [b'b'], 6,
                                 parent_map, missing_keys=[NULL_REVISION])
-        parent_map['b'] = extended_history_shortcut['b']
-        self.assertSearchResult(['e', 'f'], [], 7,
+        parent_map[b'b'] = extended_history_shortcut[b'b']
+        self.assertSearchResult([b'e', b'f'], [], 7,
                                 parent_map, missing_keys=[NULL_REVISION])
 
 
@@ -159,24 +159,24 @@
                          (sorted(start), sorted(stop), count))
 
     def test_empty_ancestry(self):
-        self.assertSearchResult([], [], 0, {}, (), ['tip-rev-id'], 10)
+        self.assertSearchResult([], [], 0, {}, (), [b'tip-rev-id'], 10)
 
     def test_ancestry_1(self):
-        self.assertSearchResult(['rev4'], ['rev1'], 4,
-                                ancestry_1, (), ['rev1'], 10)
-        self.assertSearchResult(['rev2a', 'rev2b'], ['rev1'], 2,
-                                ancestry_1, (), ['rev1'], 1)
+        self.assertSearchResult([b'rev4'], [b'rev1'], 4,
+                                ancestry_1, (), [b'rev1'], 10)
+        self.assertSearchResult([b'rev2a', b'rev2b'], [b'rev1'], 2,
+                                ancestry_1, (), [b'rev1'], 1)
 
 
     def test_multiple_heads(self):
-        self.assertSearchResult(['e', 'f'], ['a'], 5,
-                                extended_history_shortcut, (), ['a'], 10)
+        self.assertSearchResult([b'e', b'f'], [b'a'], 5,
+                                extended_history_shortcut, (), [b'a'], 10)
         # Note that even though we only take 1 step back, we find 'f', which
         # means the described search will still find d and c.
-        self.assertSearchResult(['f'], ['a'], 4,
-                                extended_history_shortcut, (), ['a'], 1)
-        self.assertSearchResult(['f'], ['a'], 4,
-                                extended_history_shortcut, (), ['a'], 2)
+        self.assertSearchResult([b'f'], [b'a'], 4,
+                                extended_history_shortcut, (), [b'a'], 1)
+        self.assertSearchResult([b'f'], [b'a'], 4,
+                                extended_history_shortcut, (), [b'a'], 2)
 
 
 class TestPendingAncestryResultRefine(tests.TestCase):
@@ -188,12 +188,12 @@
         # Used when pulling from a stacked repository, so test some revisions
         # being satisfied from the stacking branch.
         g = self.make_graph(
-            {"tip":["mid"], "mid":["base"], "tag":["base"],
-             "base":[NULL_REVISION], NULL_REVISION:[]})
-        result = vf_search.PendingAncestryResult(['tip', 'tag'], None)
-        result = result.refine({'tip'}, {'mid'})
-        self.assertEqual({'mid', 'tag'}, result.heads)
-        result = result.refine({'mid', 'tag', 'base'},
+            {b"tip": [b"mid"], b"mid": [b"base"], b"tag": [b"base"],
+             b"base":[NULL_REVISION], NULL_REVISION:[]})
+        result = vf_search.PendingAncestryResult([b'tip', b'tag'], None)
+        result = result.refine({b'tip'}, {b'mid'})
+        self.assertEqual({b'mid', b'tag'}, result.heads)
+        result = result.refine({b'mid', b'tag', b'base'},
             {NULL_REVISION})
         self.assertEqual({NULL_REVISION}, result.heads)
         self.assertTrue(result.is_empty())
@@ -236,8 +236,8 @@
         # ancestries.
         class StubGraph(object):
             def iter_ancestry(self, keys):
-                return [(NULL_REVISION, ()), ('foo', (NULL_REVISION,))]
-        result = vf_search.PendingAncestryResult(['rev-3'], None)
+                return [(NULL_REVISION, ()), (b'foo', (NULL_REVISION,))]
+        result = vf_search.PendingAncestryResult([b'rev-3'], None)
         result_keys = result._get_keys(StubGraph())
         # Only the non-null keys from the ancestry appear.
-        self.assertEqual({'foo'}, set(result_keys))
+        self.assertEqual({b'foo'}, set(result_keys))

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-08-03 00:47:53 +0000
+++ breezy/transform.py	2018-08-07 21:08:25 +0000
@@ -1003,7 +1003,11 @@
                    (from_name, to_name),
                    (from_kind, to_kind),
                    (from_executable, to_executable)))
-        return iter(sorted(results, key=lambda x:x[1]))
+
+        def path_key(t):
+            paths = t[1]
+            return (paths[0] or '', paths[1] or '')
+        return iter(sorted(results, key=path_key))
 
     def get_preview_tree(self):
         """Return a tree representing the result of the transform.

=== modified file 'breezy/transport/http/response.py'
--- breezy/transport/http/response.py	2018-08-01 19:37:07 +0000
+++ breezy/transport/http/response.py	2018-08-07 21:08:25 +0000
@@ -209,7 +209,7 @@
                     % (self._boundary, boundary_line))
 
     def _unquote_boundary(self, b):
-        return b[:2] + email_utils.unquote(b[2:-2]) + b[-2:]
+        return b[:2] + email_utils.unquote(b[2:-2].decode('ascii')).encode('ascii') + b[-2:]
 
     def read_range_definition(self):
         """Read a new range definition in a multi parts message.

=== modified file 'breezy/upstream_import.py'
--- breezy/upstream_import.py	2018-07-22 17:06:14 +0000
+++ breezy/upstream_import.py	2018-08-07 21:08:25 +0000
@@ -107,7 +107,7 @@
         if mode != 'r':
             raise AssertionError(
                 'only readonly supported')
-        self.root = os.path.realpath(fileobj.read())
+        self.root = os.path.realpath(fileobj.read().decode('utf-8'))
 
     def __repr__(self):
         return 'DirWrapper(%r)' % self.root
@@ -331,7 +331,7 @@
             archive, external_compressor = get_archive_type(source)
         except NotArchiveType:
             if file_kind(source) == 'directory':
-                s = StringIO(source)
+                s = BytesIO(source.encode('utf-8'))
                 s.seek(0)
                 import_dir(tree, s)
             else:

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2018-07-23 22:25:11 +0000
+++ breezy/urlutils.py	2018-08-07 21:08:25 +0000
@@ -422,7 +422,7 @@
         if path_chars[i] not in _url_safe_characters:
             chars = path_chars[i].encode('utf-8')
             path_chars[i] = ''.join(
-                ['%%%02X' % ord(c) for c in path_chars[i].encode('utf-8')])
+                ['%%%02X' % c for c in bytearray(path_chars[i].encode('utf-8'))])
     path = ''.join(path_chars)
     path = _url_hex_escapes_re.sub(_unescape_safe_chars, path)
     return str(prefix + path)

=== modified file 'python3.passing'
--- python3.passing	2018-08-07 19:37:29 +0000
+++ python3.passing	2018-08-07 21:08:25 +0000
@@ -387,6 +387,7 @@
 breezy.plugins.fastimport.tests.test_revision_store.Test_TreeShim.test_id2path_no_delta
 breezy.plugins.fastimport.tests.test_revision_store.Test_TreeShim.test_id2path_with_delta
 breezy.plugins.fastimport.tests.test_revision_store.Test_TreeShim.test_path2id
+breezy.plugins.git.tests.test_blackbox.ShallowTests.test_log_shallow
 breezy.plugins.git.tests.test_blackbox.ShallowTests.test_version_info_custom_without_revno
 breezy.plugins.git.tests.test_blackbox.ShallowTests.test_version_info_custom_with_revno
 breezy.plugins.git.tests.test_blackbox.ShallowTests.test_version_info_python
@@ -1222,6 +1223,7 @@
 breezy.plugins.weave_fmt.test_bzrdir.TestFormat6.test_same_lockfiles_between_tree_repo_branch
 breezy.plugins.weave_fmt.test_bzrdir.TestInfo.test_info_locking_oslocks
 breezy.plugins.weave_fmt.test_bzrdir.TestInit.test_init_weave
+breezy.plugins.weave_fmt.test_bzrdir.TestUpgrade.test_upgrade_makes_dir_weaves
 breezy.plugins.weave_fmt.test_bzrdir.TestUpgrade.test_upgrade_simple
 breezy.plugins.weave_fmt.test_bzrdir.TestUpgrade.test_upgrade_to_meta_sets_workingtree_last_revision
 breezy.plugins.weave_fmt.test_bzrdir.TestUpgrade.test_upgrade_v6_to_meta_no_workingtree
@@ -2563,6 +2565,7 @@
 breezy.tests.blackbox.test_sign_my_commits.SignMyCommits.test_sign_dry_run
 breezy.tests.blackbox.test_sign_my_commits.SignMyCommits.test_sign_my_commits
 breezy.tests.blackbox.test_sign_my_commits.SignMyCommits.test_sign_my_commits_location
+breezy.tests.blackbox.test_sign_my_commits.TestSmartServerSignMyCommits.test_sign_single_commit
 breezy.tests.blackbox.test_split.TestSplit.test_split
 breezy.tests.blackbox.test_split.TestSplit.test_split_repo_failure
 breezy.tests.blackbox.test_split.TestSplit.test_split_rich_root
@@ -2746,6 +2749,7 @@
 breezy.tests.blackbox.test_upgrade.UpgradeRecommendedTests.test_no_upgrade_recommendation_from_bzrdir
 breezy.tests.blackbox.test_upgrade.UpgradeRecommendedTests.test_recommend_upgrade_wt4
 breezy.tests.blackbox.test_upgrade.UpgradeRecommendedTests.test_upgrade_shared_repo
+breezy.tests.blackbox.test_verify_signatures.TestSmartServerVerifySignatures.test_verify_signatures
 breezy.tests.blackbox.test_verify_signatures.TestVerifySignatures.test_verify_signatures
 breezy.tests.blackbox.test_verify_signatures.TestVerifySignatures.test_verify_signatures_acceptable_key
 breezy.tests.blackbox.test_verify_signatures.TestVerifySignatures.test_verify_signatures_verbose
@@ -8388,6 +8392,10 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks_specific_files(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks_specific_files(InterDirStateTree(PY))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks_specific_files(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks_specific_files(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_versioned_symlinks_specific_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_file_content_matches.TestFileContentMatches.test_different_contents_and_same_verifier(InterDirStateTree(C))
 breezy.tests.per_intertree.test_file_content_matches.TestFileContentMatches.test_different_contents_and_same_verifier(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_file_content_matches.TestFileContentMatches.test_different_contents_and_same_verifier(InterTree)
@@ -9104,6 +9112,10 @@
 breezy.tests.per_repository_reference.test_fetch.TestFetch.test_sprout_from_stacked_with_short_history(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.test_fetch.TestFetch.test_sprout_from_stacked_with_short_history(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.test_fetch.TestFetch.test_sprout_from_stacked_with_short_history(RepositoryFormatPackDevelopment2Subtree)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_complex(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_complex(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_complex(RepositoryFormat2a)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_complex(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RemoteRepositoryFormat-default)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RepositoryFormat2a)
@@ -9114,6 +9126,14 @@
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_fulltext_simple(RepositoryFormatPackDevelopment2Subtree)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2a)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2aSubtree)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-v2)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2a)
+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRoot)
 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRootBroken)
@@ -12130,6 +12150,21 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat2a)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat5)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormat7)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnit1)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnit3)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnit4)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack1)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack3)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack4)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack5)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack5RichRoot)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack5RichRootBroken)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack6)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatKnitPack6RichRoot)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_control_characters(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(GitRepositoryFormat)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(RemoteRepositoryFormat-v2)
@@ -12992,6 +13027,7 @@
 breezy.tests.per_repository.test_signatures.TestSignatures.test_sign_existing_revision(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_signatures.TestSignatures.test_sign_existing_revision(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_signatures.TestSignatures.test_store_signature(GitRepositoryFormat)
+breezy.tests.per_repository.test_signatures.TestSignatures.test_store_signature(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_signatures.TestSignatures.test_store_signature(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository.test_signatures.TestSignatures.test_store_signature(RepositoryFormat2a)
 breezy.tests.per_repository.test_signatures.TestSignatures.test_store_signature(RepositoryFormat2aSubtree)
@@ -18178,6 +18214,8 @@
 breezy.tests.per_tree.test_tree.TestSupportsVersionableKind.test_unknown(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestSupportsVersionableKind.test_unknown(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestSupportsVersionableKind.test_unknown(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(GitWorkingTreeFormat)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(PreviewTree)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(PreviewTreePost)
@@ -18188,6 +18226,8 @@
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(WorkingTreeFormat5)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(WorkingTreeFormat6)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_root(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_subtree(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_subtree(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_subtree(GitWorkingTreeFormat)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_subtree(PreviewTree)
 breezy.tests.per_tree.test_walkdirs.TestWalkdirs.test_walkdir_subtree(PreviewTreePost)
@@ -20582,6 +20622,12 @@
 breezy.tests.per_workingtree.test_parents.UpdateToOneParentViaDeltaTests.test_removes(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_parents.UpdateToOneParentViaDeltaTests.test_removes(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_children_of_moved_directories(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_single_root(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_single_root(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_paths2ids.TestPaths2Ids.test_find_single_root(WorkingTreeFormat3)
@@ -21556,6 +21602,7 @@
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_workingtree.TestFormatAttributes.test_versioned_directories(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_workingtree.TestIllegalPaths.test_bad_fs_path(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_conflicts(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_conflicts(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_add_conflicts(WorkingTreeFormat3)
@@ -22525,6 +22572,7 @@
 breezy.tests.test_bzrdir.TestBzrDirHooks.test_pre_open_called
 breezy.tests.test_bzrdir.TestBzrDirSprout.test_sprout_parent
 breezy.tests.test_bzrdir.TestBzrDirSprout.test_sprout_uses_branch_sprout
+breezy.tests.test_bzrdir.TestBzrFormat.test_as_string
 breezy.tests.test_bzrdir.TestBzrFormat.test_check_support_status_optional
 breezy.tests.test_bzrdir.TestBzrFormat.test_check_support_status_required
 breezy.tests.test_bzrdir.TestBzrFormat.test_check_support_status_unknown
@@ -22538,11 +22586,14 @@
 breezy.tests.test_bzrdir.TestBzrFormat.test_from_string_with_spaces
 breezy.tests.test_bzrdir.TestBzrFormat.test_network_name
 breezy.tests.test_bzrdir.TestDefaultFormat.test_get_set_default_format
+breezy.tests.test_bzrdir.TestDotBzrHidden.test_dot_bzr_hidden
+breezy.tests.test_bzrdir.TestDotBzrHidden.test_dot_bzr_hidden_with_url
 breezy.tests.test_bzrdir.TestFormatRegistry.test_aliases
 breezy.tests.test_bzrdir.TestFormatRegistry.test_format_registry
 breezy.tests.test_bzrdir.TestFormatRegistry.test_get_help
 breezy.tests.test_bzrdir.TestFormatRegistry.test_help_topic
 breezy.tests.test_bzrdir.TestFormatRegistry.test_set_default_repository
+breezy.tests.test_bzrdir.TestGenerateBackupName.test_exiting
 breezy.tests.test_bzrdir.TestGenerateBackupName.test_new
 breezy.tests.test_bzrdir.TestHTTPRedirections_nosmart.test_loop
 breezy.tests.test_bzrdir.TestHTTPRedirections_nosmart.test_qualifier_preserved
@@ -22666,6 +22717,7 @@
 breezy.tests.test_chk_map.TestLeafNode.test_deserialise_item_with_null_width_2
 breezy.tests.test_chk_map.TestLeafNode.test_deserialise_multi_line
 breezy.tests.test_chk_map.TestLeafNode.test_iteritems_selected_one_of_two_items
+breezy.tests.test_chk_map.TestLeafNode.test_key_after_map
 breezy.tests.test_chk_map.TestLeafNode.test_key_after_unmap
 breezy.tests.test_chk_map.TestLeafNode.test_key_new
 breezy.tests.test_chk_map.TestLeafNode.test_map_exceeding_max_size_only_entry_new
@@ -22689,10 +22741,12 @@
 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_with_internal_node
 breezy.tests.test_chk_map.TestMap.test_apply_ab_empty
 breezy.tests.test_chk_map.TestMap.test_apply_delete_to_internal_node
+breezy.tests.test_chk_map.TestMap.test_apply_empty_ab
 breezy.tests.test_chk_map.TestMap.test_apply_new_keys_must_be_new
 breezy.tests.test_chk_map.TestMap.test_deep_splitting
 breezy.tests.test_chk_map.TestMap.test__dump_tree
 breezy.tests.test_chk_map.TestMap.test__dump_tree_in_progress
+breezy.tests.test_chk_map.TestMap.test_from_dict_ab
 breezy.tests.test_chk_map.TestMap.test_from_dict_empty
 breezy.tests.test_chk_map.TestMap.test_init_and_save_new
 breezy.tests.test_chk_map.TestMap.test_init_root_is_LeafNode_new
@@ -22710,6 +22764,7 @@
 breezy.tests.test_chk_map.TestMap.test_iteritems_keys_prefixed_by_2_width_nodes_hashed
 breezy.tests.test_chk_map.TestMap.test_iteritems_keys_prefixed_by_2_width_one_leaf
 breezy.tests.test_chk_map.TestMap.test_iteritems_selected_one_of_two_items
+breezy.tests.test_chk_map.TestMap.test_iteritems_two_items
 breezy.tests.test_chk_map.TestMap.test___len__2
 breezy.tests.test_chk_map.TestMap.test___len__empty
 breezy.tests.test_chk_map.TestMap.test_map_double_deep_collapses
@@ -22853,6 +22908,8 @@
 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_lossy_foreign
+breezy.tests.test_commit.TestCommit.test_commit_lossy_native
 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
@@ -22862,6 +22919,7 @@
 breezy.tests.test_commit.TestCommit.test_commit_rename
 breezy.tests.test_commit.TestCommit.test_commit_reporting_after_merge
 breezy.tests.test_commit.TestCommit.test_commit_saves_1ms_timestamp
+breezy.tests.test_commit.TestCommit.test_committed_ancestry
 breezy.tests.test_commit.TestCommit.test_commit_unversioned_specified
 breezy.tests.test_commit.TestCommit.test_commit_with_checkout_and_branch_sharing_repo
 breezy.tests.test_commit.TestCommit.test_missing_commit
@@ -22877,6 +22935,7 @@
 breezy.tests.test_commit.TestCommit.test_safe_master_lock
 breezy.tests.test_commit.TestCommit.test_selected_file_merge_commit
 breezy.tests.test_commit.TestCommit.test_selective_delete
+breezy.tests.test_commit.TestCommit.test_signed_commit
 breezy.tests.test_commit.TestCommit.test_simple_commit
 breezy.tests.test_commit.TestCommit.test_strict_commit
 breezy.tests.test_commit.TestCommit.test_strict_commit_without_unknowns
@@ -22927,6 +22986,7 @@
 breezy.tests.test_config.TestBaseStackGet.test_get_without_registered_default_value
 breezy.tests.test_config.TestBaseStackGet.test_get_with_registered_default_value
 breezy.tests.test_config.TestBranchConfigItems.test_BRZ_EMAIL_OVERRIDES
+breezy.tests.test_config.TestBranchConfigItems.test_config_precedence
 breezy.tests.test_config.TestBranchConfigItems.test_get_user_option_global
 breezy.tests.test_config.TestBranchConfigItems.test_user_id
 breezy.tests.test_config.TestBranchConfig.test_autonick_urlencoded
@@ -23617,7 +23677,15 @@
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(PathConflict)
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(TextConflict)
 breezy.tests.test_conflicts.TestPerConflict.test_stanza_roundtrip(UnversionedParent)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(ContentsConflict)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(DuplicateEntry)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(DuplicateID)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(MissingParent)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(NonDirectoryParent)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(ParentLoop)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(PathConflict)
 breezy.tests.test_conflicts.TestPerConflict.test_stanzification(TextConflict)
+breezy.tests.test_conflicts.TestPerConflict.test_stanzification(UnversionedParent)
 breezy.tests.test_conflicts.TestPerConflict.test_stringification(ContentsConflict)
 breezy.tests.test_conflicts.TestPerConflict.test_stringification(DuplicateEntry)
 breezy.tests.test_conflicts.TestPerConflict.test_stringification(DuplicateID)
@@ -23660,6 +23728,11 @@
 breezy.tests.test_conflicts.TestResolveMissingParent.test_keep_them_all
 breezy.tests.test_conflicts.TestResolveMissingParent.test_kill_them_all
 breezy.tests.test_conflicts.TestResolveMissingParent.test_resolve_taking_other
+breezy.tests.test_conflicts.TestResolveMissingParent.test_resolve_taking_this
+breezy.tests.test_conflicts.TestResolveParentLoop.test_resolve_taking_other(dir1_into_dir2,dir2_into_dir1)
+breezy.tests.test_conflicts.TestResolveParentLoop.test_resolve_taking_other(dir2_into_dir1,dir1_into_dir2)
+breezy.tests.test_conflicts.TestResolveParentLoop.test_resolve_taking_this(dir1_into_dir2,dir2_into_dir1)
+breezy.tests.test_conflicts.TestResolveParentLoop.test_resolve_taking_this(dir2_into_dir1,dir1_into_dir2)
 breezy.tests.test_conflicts.TestResolvePathConflictBefore531967.test_resolve_taking_other(dir_deleted,dir_renamed)
 breezy.tests.test_conflicts.TestResolvePathConflictBefore531967.test_resolve_taking_other(dir_renamed2,dir_renamed)
 breezy.tests.test_conflicts.TestResolvePathConflictBefore531967.test_resolve_taking_other(dir_renamed,dir_deleted)
@@ -24286,10 +24359,13 @@
 breezy.tests.test_foreign.ForeignVcsRegistryTests.test_parse_revision_id_unknown_mapping
 breezy.tests.test_generate_docs.TestGenerateDocs.test_man_page
 breezy.tests.test_generate_docs.TestGenerateDocs.test_rstx_man
+breezy.tests.test_generate_ids.TestFileIds.test_file_ids_are_ascii
+breezy.tests.test_generate_ids.TestFileIds.test_gen_file_id
 breezy.tests.test_generate_ids.TestFileIds.test_gen_root_id
 breezy.tests.test_generate_ids.TestFileIds.test__next_id_suffix_increments
 breezy.tests.test_generate_ids.TestFileIds.test__next_id_suffix_sets_suffix
 breezy.tests.test_generate_ids.TestGenRevisionId.test_gen_revision_id_email
+breezy.tests.test_generate_ids.TestGenRevisionId.test_gen_revision_id_user
 breezy.tests.test_generate_ids.TestGenRevisionId.test_revision_ids_are_ascii
 breezy.tests.test_generate_ids.TestGenRevisionId.test_timestamp
 breezy.tests.test_globbing.TestExceptionGlobster.test_exclusion_order
@@ -24605,6 +24681,21 @@
 breezy.tests.test_http_response.TestHandleResponse.test_missing_content_range
 breezy.tests.test_http_response.TestHandleResponse.test_multipart_no_content_range
 breezy.tests.test_http_response.TestHTTPConnection.test_cleanup_pipe
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_can_read_at_first_access
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_checked_read_dont_overflow_buffers
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_read_all_ranges
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_read_at_range_end
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_read_past_end_of_range
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_read_zero
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_across_ranges
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_at_range_end
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_backwards
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_from_end
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_into_void
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_outside_single_range
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_read
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_seek_twice_between_ranges
+breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_unbounded_read_after_seek
 breezy.tests.test_http_response.TestRangeFileMultipleRanges.test_can_read_at_first_access
 breezy.tests.test_http_response.TestRangeFileMultipleRanges.test_checked_read_dont_overflow_buffers
 breezy.tests.test_http_response.TestRangeFileMultipleRanges.test_read_all_ranges
@@ -24975,6 +25066,7 @@
 breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.0)
 breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.1)
 breezy.tests.test_http.TestUrllib2AuthHandler.test_get_user_password_without_port
+breezy.tests.test_i18n.LoadPluginTranslations.test_does_not_exist
 breezy.tests.test_i18n.TestGetTextPerParagraph.test_multiline
 breezy.tests.test_i18n.TestGetTextPerParagraph.test_oneline
 breezy.tests.test_i18n.TestGetText.test_multiline
@@ -24982,7 +25074,9 @@
 breezy.tests.test_i18n.TestInstall.test_custom_languages
 breezy.tests.test_i18n.TestInstall.test_disable_i18n
 breezy.tests.test_i18n.TestInstall.test_no_env_variables
+breezy.tests.test_i18n.TestTranslate.test_error_message_translation
 breezy.tests.test_i18n.TestTranslate.test_topic_help_translation
+breezy.tests.test_i18n.TestZzzTranslation.test_translation
 breezy.tests.test_identitymap.TestIdentityMap.test_add_weave
 breezy.tests.test_identitymap.TestIdentityMap.test_construct
 breezy.tests.test_identitymap.TestIdentityMap.test_double_add_weave
@@ -26712,6 +26806,7 @@
 breezy.tests.test_merge_directive.TestParseOldMergeDirective2.test_parse_old_merge_directive
 breezy.tests.test_merge.TestConfigurableFileMerger.test_affected_files_cached
 breezy.tests.test_merge.TestConfigurableFileMerger.test_hook_called_for_text_conflicts
+breezy.tests.test_merge.TestConfigurableFileMerger.test_hook_not_called_for_kind_change
 breezy.tests.test_merge.TestConfigurableFileMerger.test_hook_not_called_for_other_files
 breezy.tests.test_merge.TestConfigurableFileMerger.test_uses_this_branch
 breezy.tests.test_merge.TestLCAMultiWay.test_all_differ
@@ -26937,6 +27032,7 @@
 breezy.tests.test_options.OptionTests.test_registry_conversion
 breezy.tests.test_options.OptionTests.test_registry_converter
 breezy.tests.test_options.OptionTests.test_set_short_name
+breezy.tests.test_options.OptionTests.test_unknown_short_opt
 breezy.tests.test_options.TestListOptions.test_list_option
 breezy.tests.test_options.TestListOptions.test_list_option_can_be_reset
 breezy.tests.test_options.TestListOptions.test_list_option_no_arguments
@@ -27412,6 +27508,7 @@
 breezy.tests.test_reconfigure.TestReconfigure.test_unsynced_branch_to_lightweight_checkout_unforced
 breezy.tests.test_reconfigure.TestReconfigure.test_unsynced_checkout_to_lightweight
 breezy.tests.test_reconfigure.TestReconfigure.test_use_shared_to_standalone
+breezy.tests.test_reconfigure.TestReconfigure.test_use_shared_to_standalone_preserves_dead_heads
 breezy.tests.test_reconfigure.TestReconfigure.test_use_shared_to_use_shared
 breezy.tests.test_registry.TestRegistryIter.test_items
 breezy.tests.test_registry.TestRegistryIter.test_iteritems
@@ -27464,8 +27561,10 @@
 breezy.tests.test_remote.TestBranchGetSetConfig.test_get_branch_conf
 breezy.tests.test_remote.TestBranchGetSetConfig.test_get_multi_line_branch_conf
 breezy.tests.test_remote.TestBranchGetSetConfig.test_set_option
+breezy.tests.test_remote.TestBranchGetSetConfig.test_set_option_with_dict
 breezy.tests.test_remote.TestBranch_get_stacked_on_url.test_backwards_compatible
 breezy.tests.test_remote.TestBranch_get_stacked_on_url.test_get_stacked_on_invalid_url
+breezy.tests.test_remote.TestBranch_get_stacked_on_url.test_get_stacked_on_real_branch
 breezy.tests.test_remote.TestBranchGetTagsBytes.test_backwards_compat
 breezy.tests.test_remote.TestBranchGetTagsBytes.test_trivial
 breezy.tests.test_remote.TestBranchHeadsToFetch.test_backwards_compatible
@@ -27506,6 +27605,7 @@
 breezy.tests.test_remote.TestBzrDirDestroyBranch.test_destroy_default
 breezy.tests.test_remote.TestBzrDirDestroyRepository.test_destroy_repository
 breezy.tests.test_remote.TestBzrDirFormatInitializeEx.test_error_from_real_server
+breezy.tests.test_remote.TestBzrDirFormatInitializeEx.test_success
 breezy.tests.test_remote.TestBzrDirGetBranches.test_get_branches
 breezy.tests.test_remote.TestBzrDirGetSetConfig.test_backwards_compat_get_option
 breezy.tests.test_remote.TestBzrDirGetSetConfig.test__get_config
@@ -27661,6 +27761,8 @@
 breezy.tests.test_remote.TestWithCustomErrorHandler.test_no_context
 breezy.tests.test_remote.TestWithCustomErrorHandler.test_with_context
 breezy.tests.test_rename_map.TestRenameMap.test_add_edge_hashes
+breezy.tests.test_rename_map.TestRenameMap.test_add_file_edge_hashes
+breezy.tests.test_rename_map.TestRenameMap.test_file_match
 breezy.tests.test_rename_map.TestRenameMap.test_file_match_no_dups
 breezy.tests.test_rename_map.TestRenameMap.test_find_directory_renames
 breezy.tests.test_rename_map.TestRenameMap.test_guess_rename_handles_new_directories
@@ -27676,6 +27778,7 @@
 breezy.tests.test_repository.Test2a.test_chk_bytes_uses_custom_btree_parser
 breezy.tests.test_repository.Test2a.test_fetch_combines_groups
 breezy.tests.test_repository.Test2a.test_format_pack_compresses_True
+breezy.tests.test_repository.Test2a.test_get_stream_for_missing_keys_includes_all_chk_refs
 breezy.tests.test_repository.Test2a.test_inconsistency_fatal
 breezy.tests.test_repository.Test2a.test_inventories_use_chk_map_with_parent_base_dict
 breezy.tests.test_repository.Test2a.test_pack_with_hint
@@ -27701,6 +27804,9 @@
 breezy.tests.test_repository.TestFormatKnit1.test_attribute__fetch_uses_deltas
 breezy.tests.test_repository.TestFormatKnit1.test_deserialise_sets_root_revision
 breezy.tests.test_repository.TestFormatKnit1.test_deserialise_uses_global_revision_id
+breezy.tests.test_repository.TestFormatKnit1.test_disk_layout
+breezy.tests.test_repository.TestFormatKnit1.test_shared_disk_layout
+breezy.tests.test_repository.TestFormatKnit1.test_shared_no_tree_disk_layout
 breezy.tests.test_repository.TestFormatKnit1.test_supports_external_lookups
 breezy.tests.test_repository.TestGCCHKPacker.test_pack_with_distant_inventories
 breezy.tests.test_repository.TestGCCHKPacker.test_pack_with_missing_inventory
@@ -27757,6 +27863,8 @@
 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_repository.TestWithBrokenRepo.test_insert_from_broken_repo
+breezy.tests.test_revert.TestRevert.test_preserve_execute
 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
@@ -28045,6 +28153,7 @@
 breezy.tests.test_selftest.MetaTestLog.test_logging
 breezy.tests.test_selftest.TestActuallyStartBzrSubprocess.test_start_and_stop_bzr_subprocess_send_signal
 breezy.tests.test_selftest.TestBlackboxSupport.test_run_bzr_failure_not_caught
+breezy.tests.test_selftest.TestBlackboxSupport.test_run_bzr_user_error_caught
 breezy.tests.test_selftest.TestBranchScenarios.test_scenarios
 breezy.tests.test_selftest.TestBzrDirScenarios.test_scenarios
 breezy.tests.test_selftest.TestCheckTreeShape.test_check_tree_shape
@@ -28063,6 +28172,7 @@
 breezy.tests.test_selftest.TestEnvironHandling.test_overrideEnv_None_called_twice_doesnt_leak
 breezy.tests.test_selftest.TestExtraAssertions.test_assertEndsWith
 breezy.tests.test_selftest.TestExtraAssertions.test_assertEqualDiff
+breezy.tests.test_selftest.TestExtraAssertions.test_assert_isinstance
 breezy.tests.test_selftest.TestFilteredByModuleTestLoader.test_exclude_tests
 breezy.tests.test_selftest.TestFilteredByModuleTestLoader.test_load_tests
 breezy.tests.test_selftest.TestFilteredByNameStartTestLoader.test_exclude_tests
@@ -28140,6 +28250,7 @@
 breezy.tests.test_selftest.TestSelftest.test_selftest_benchmark_parameter_invokes_test_suite__benchmark__
 breezy.tests.test_selftest.TestSelftest.test_transport_memory
 breezy.tests.test_selftest.TestSelftest.test_transport_sftp
+breezy.tests.test_selftest.TestSelftestWithIdList.test_load_list
 breezy.tests.test_selftest.TestSelftestWithIdList.test_load_unknown
 breezy.tests.test_selftest.TestStartBzrSubProcess.test_allow_plugins
 breezy.tests.test_selftest.TestStartBzrSubProcess.test_env_del_missing
@@ -28225,6 +28336,7 @@
 breezy.tests.test_selftest.TestTestPrefixRegistry.test_resolve_unknown_alias
 breezy.tests.test_selftest.TestTestResult.test_add_not_supported
 breezy.tests.test_selftest.TestTestResult.test_known_failure
+breezy.tests.test_selftest.TestTestResult.test_lsprofiling
 breezy.tests.test_selftest.TestTestResult.test_startTests
 breezy.tests.test_selftest.TestTestResult.test_startTests_only_once
 breezy.tests.test_selftest.TestTestResult.test_strict_with_known_failure
@@ -28245,6 +28357,7 @@
 breezy.tests.test_selftest.TestThreadLeakDetection.test_testcase_without_addCleanups
 breezy.tests.test_selftest.TestThreadLeakDetection.test_thread_leak
 breezy.tests.test_selftest.TestTransportScenarios.test_get_transport_permutations
+breezy.tests.test_selftest.TestTransportScenarios.test_scenarios_include_all_modules
 breezy.tests.test_selftest.TestTransportScenarios.test_scenarios_include_transport_class
 breezy.tests.test_selftest.TestTreeScenarios.test_scenarios
 breezy.tests.test_selftest.TestTreeShape.test_unicode_paths
@@ -29033,6 +29146,7 @@
 breezy.tests.test_status.TestStatus.test_multiple_pending
 breezy.tests.test_status.TestStatus.test_multiple_pending_verbose
 breezy.tests.test_status.TestStatus.test_pending_none
+breezy.tests.test_status.TestStatus.test_pending_with_ghosts
 breezy.tests.test_status.TestStatus.tests_revision_to_revision
 breezy.tests.test_status.TestStatus.test_with_pending_ghost
 breezy.tests.test_strace.TestStrace.test_strace_callable_is_called
@@ -29245,6 +29359,12 @@
 breezy.tests.test_transform.TestFileMover.test_file_mover
 breezy.tests.test_transform.TestFileMover.test_file_mover_rollback
 breezy.tests.test_transform.TestFileMover.test_pre_delete_rollback
+breezy.tests.test_transform.TestFinalizeRobustness.test_rename_in_limbo_rename_raises_after_rename
+breezy.tests.test_transform.TestFinalizeRobustness.test_rename_in_limbo_rename_raises_before_rename
+breezy.tests.test_transform.TestFinalizeRobustness.test_root_create_file_open_raises_after_creation
+breezy.tests.test_transform.TestFinalizeRobustness.test_root_create_file_open_raises_before_creation
+breezy.tests.test_transform.TestFinalizeRobustness.test_subdir_create_file_open_raises_after_creation
+breezy.tests.test_transform.TestFinalizeRobustness.test_subdir_create_file_open_raises_before_creation
 breezy.tests.test_transform.TestInventoryAltered.test_inventory_altered_changed_parent_id
 breezy.tests.test_transform.TestInventoryAltered.test_inventory_altered_noop_changed_parent_id
 breezy.tests.test_transform.TestInventoryAltered.test_inventory_altered_unchanged
@@ -29319,6 +29439,7 @@
 breezy.tests.test_transform.TestTransformPreview.test_missing_content_summary
 breezy.tests.test_transform.TestTransformPreview.test_path2id_created
 breezy.tests.test_transform.TestTransformPreview.test_path2id_deleted_unchanged
+breezy.tests.test_transform.TestTransformPreview.test_path2id_moved
 breezy.tests.test_transform.TestTransformPreview.test_path2id_renamed_parent
 breezy.tests.test_transform.TestTransformPreview.test_plan_file_merge
 breezy.tests.test_transform.TestTransformPreview.test_plan_file_merge_revision_tree
@@ -29632,6 +29753,7 @@
 breezy.tests.test_upgrade.TestUpgrade.test_upgrade_rich_root
 breezy.tests.test_upstream_import.TestImport.test_broken_tar
 breezy.tests.test_upstream_import.TestImport.test_common_directory
+breezy.tests.test_upstream_import.TestImport.test_copydir_nosub
 breezy.tests.test_upstream_import.TestImport.test_get_archive_type
 breezy.tests.test_upstream_import.TestImport.test_no_crash_with_bzrdir
 breezy.tests.test_upstream_import.TestImport.test_top_path
@@ -29664,6 +29786,8 @@
 breezy.tests.test_url_policy_open.TestOpenOnlyScheme.test_stacked_within_scheme
 breezy.tests.test_urlutils.QuoteTests.test_quote
 breezy.tests.test_urlutils.QuoteTests.test_quote_tildes
+breezy.tests.test_urlutils.QuoteTests.test_unquote
+breezy.tests.test_urlutils.QuoteTests.test_unquote_to_bytes
 breezy.tests.test_urlutils.TestCwdToURL.test_dot
 breezy.tests.test_urlutils.TestCwdToURL.test_non_ascii
 breezy.tests.test_urlutils.TestDeriveToLocation.test_to_locations_derived_from_paths
@@ -29696,6 +29820,7 @@
 breezy.tests.test_urlutils.TestURL.test_str
 breezy.tests.test_urlutils.TestUrlToPath.test_basename
 breezy.tests.test_urlutils.TestUrlToPath.test_dirname
+breezy.tests.test_urlutils.TestUrlToPath.test_escape
 breezy.tests.test_urlutils.TestUrlToPath.test_escape_tildes
 breezy.tests.test_urlutils.TestUrlToPath.test_escape_unescape
 breezy.tests.test_urlutils.TestUrlToPath.test_function_type
@@ -29716,6 +29841,7 @@
 breezy.tests.test_urlutils.TestUrlToPath.test_url_scheme_re
 breezy.tests.test_urlutils.TestUrlToPath.test_win32_extract_drive_letter
 breezy.tests.test_urlutils.TestUrlToPath.test_win32_local_path_from_url
+breezy.tests.test_urlutils.TestUrlToPath.test_win32_local_path_to_url
 breezy.tests.test_urlutils.TestUrlToPath.test_win32_strip_local_trailing_slash
 breezy.tests.test_urlutils.TestUrlToPath.test_win32_unc_path_from_url
 breezy.tests.test_urlutils.TestUrlToPath.test_win32_unc_path_to_url
@@ -29766,6 +29892,7 @@
 breezy.tests.test_version_info.TestVersionInfoRio.test_rio_version_hook
 breezy.tests.test_version_info.TestVersionInfoRio.test_simple
 breezy.tests.test_version.TestBzrlibVersioning.test_get_brz_source_tree
+breezy.tests.test_version.TestBzrlibVersioning.test_python_binary_path
 breezy.tests.test_version.TestPlatformUse.test_platform(ascii)
 breezy.tests.test_version.TestPlatformUse.test_platform(unicode)
 breezy.tests.test_vf_search.TestLimitedSearchResultFromParentMap.test_ancestry_1
@@ -29778,6 +29905,7 @@
 breezy.tests.test_vf_search.TestSearchResultFromParentMap.test_ancestry_1
 breezy.tests.test_vf_search.TestSearchResultFromParentMap.test_ancestry_2
 breezy.tests.test_vf_search.TestSearchResultFromParentMap.test_no_parents
+breezy.tests.test_vf_search.TestSearchResultFromParentMap.test_partial_search
 breezy.tests.test_vf_search.TestSearchResultRefine.test_refine
 breezy.tests.test_views.TestErrors.test_file_outside_view
 breezy.tests.test_views.TestErrors.test_no_such_view