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

[Jelmer Vernooij]

Add more bees.

Fix more python3 tests.

% wc -l python3.passing
13351 python3.passing

[Martin Packman (gz)]

Thanks! There's some scary bits here with the unicode() cast changes, may need to write ourselves a more robust helper for the short term to have confidence.

review: Approve

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2018-06-21 08:27:34 +0000
+++ breezy/branch.py	2018-06-21 23:03:57 +0000
@@ -2124,7 +2124,7 @@
             try:
                 parent = self.source.get_parent()
             except errors.InaccessibleParent as e:
-                mutter('parent was not accessible to copy: %s', e)
+                mutter('parent was not accessible to copy: %s', str(e))
             else:
                 if parent:
                     self.target.set_parent(parent)
 
=== modified file 'breezy/bundle/serializer/v08.py'
--- breezy/bundle/serializer/v08.py	2018-06-15 13:10:28 +0000
+++ breezy/bundle/serializer/v08.py	2018-06-21 23:03:57 +0000
@@ -30,6 +30,7 @@
 from breezy.bundle.bundle_data import (RevisionInfo, BundleInfo)
 from breezy.diff import internal_diff
 from breezy.revision import NULL_REVISION
+from breezy.sixish import text_type
 from breezy.testament import StrictTestament
 from breezy.timestamp import (
     format_highres_date,
@@ -152,7 +153,7 @@
             f.write(b': ')
             f.write(value)
             f.write(b'\n')
-        elif isinstance(value, unicode):
+        elif isinstance(value, text_type):
             f.write(b': ')
             f.write(value.encode('utf-8'))
             f.write(b'\n')
 
=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2018-06-21 19:00:42 +0000
+++ breezy/bzr/branch.py	2018-06-21 23:03:57 +0000
@@ -263,7 +263,7 @@
         _locs = ['parent', 'pull', 'x-pull']
         for l in _locs:
             try:
-                return self._transport.get_bytes(l).strip(b'\n')
+                return self._transport.get_bytes(l).strip(b'\n').decode('utf-8')
             except errors.NoSuchFile:
                 pass
         return None
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-05-07 14:35:05 +0000
+++ breezy/bzr/bzrdir.py	2018-06-21 23:03:57 +0000
@@ -833,7 +833,7 @@
         """
         if name == "":
             return 'branch'
-        return urlutils.join('branches', name.encode("utf-8"))
+        return urlutils.join('branches', urlutils.escape(name))
 
     def _read_branch_list(self):
         """Read the branch list.
 
=== modified file 'breezy/bzr/smart/request.py'
--- breezy/bzr/smart/request.py	2018-06-21 22:26:54 +0000
+++ breezy/bzr/smart/request.py	2018-06-21 23:03:57 +0000
@@ -45,6 +45,7 @@
     trace,
     urlutils,
     )
+from ...sixish import text_type
 from ...lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy.bzr import bzrdir
@@ -445,7 +446,7 @@
         # If it is a DecodeError, than most likely we are starting
         # with a plain string
         str_or_unicode = err.object
-        if isinstance(str_or_unicode, unicode):
+        if isinstance(str_or_unicode, text_type):
             # XXX: UTF-8 might have \x01 (our protocol v1 and v2 seperator
             # byte) in it, so this encoding could cause broken responses.
             # Newer clients use protocol v3, so will be fine.
 
=== modified file 'breezy/config.py'
--- breezy/config.py	2018-03-10 13:52:14 +0000
+++ breezy/config.py	2018-06-21 23:03:57 +0000
@@ -119,8 +119,8 @@
     binary_type,
     BytesIO,
     PY3,
+    string_types,
     text_type,
-    string_types,
     )
 
 
@@ -2558,7 +2558,7 @@
         can take quoting into account.
         """
         super(RegistryOption, self).__init__(
-            name, default=lambda: unicode(registry.default_key),
+            name, default=lambda: registry.default_key.decode('utf-8'),
             default_from_env=default_from_env,
             from_unicode=self.from_unicode, help=help,
             invalid=invalid, unquote=False)
 
=== modified file 'breezy/conflicts.py'
--- breezy/conflicts.py	2018-05-27 18:00:21 +0000
+++ breezy/conflicts.py	2018-06-21 23:03:57 +0000
@@ -400,6 +400,9 @@
         return not self.__eq__(other)
 
     def __unicode__(self):
+        return self.describe()
+
+    def describe(self):
         return self.format % self.__dict__
 
     def __repr__(self):
 
=== modified file 'breezy/diff.py'
--- breezy/diff.py	2018-02-18 19:18:40 +0000
+++ breezy/diff.py	2018-06-21 23:03:57 +0000
@@ -738,7 +738,7 @@
         if sys.platform == 'win32': # Popen doesn't accept unicode on win32
             command_encoded = []
             for c in command:
-                if isinstance(c, unicode):
+                if isinstance(c, text_type):
                     command_encoded.append(c.encode('mbcs'))
                 else:
                     command_encoded.append(c)
 
=== modified file 'breezy/email_message.py'
--- breezy/email_message.py	2017-10-26 11:10:38 +0000
+++ breezy/email_message.py	2018-06-21 23:03:57 +0000
@@ -69,7 +69,7 @@
         self._body = body
         self._parts = []
 
-        if isinstance(to_address, (str, text_type)):
+        if isinstance(to_address, (bytes, text_type)):
             to_address = [ to_address ]
 
         to_addresses = []
@@ -201,7 +201,7 @@
         # avoid base64 when it's not necessary in order to be most compatible
         # with the capabilities of the receiving side, we check with encode()
         # and decode() whether the body is actually ascii-only.
-        if isinstance(string_, unicode):
+        if isinstance(string_, text_type):
             try:
                 return (string_.encode('ascii'), 'ascii')
             except UnicodeEncodeError:
 
=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2018-06-15 13:10:28 +0000
+++ breezy/gpg.py	2018-06-21 23:03:57 +0000
@@ -42,7 +42,7 @@
     errors,
     )
 from .sixish import (
-    BytesIO,
+    text_type,
     )
 
 #verification results
@@ -232,7 +232,7 @@
 
     def sign(self, content, mode):
         import gpg
-        if isinstance(content, unicode):
+        if isinstance(content, text_type):
             raise errors.BzrBadParameterUnicode('content')
 
         plain_text = gpg.Data(content)
 
=== modified file 'breezy/log.py'
--- breezy/log.py	2018-05-21 00:30:32 +0000
+++ breezy/log.py	2018-06-21 23:03:57 +0000
@@ -1523,7 +1523,7 @@
                 rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
 
         # Imported foreign revision revision ids always contain :
-        if not ":" in rev.revision_id:
+        if not b":" in rev.revision_id:
             return []
 
         # Revision was once imported from a foreign repository
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2018-06-04 11:35:48 +0000
+++ breezy/merge.py	2018-06-21 23:03:57 +0000
@@ -51,6 +51,7 @@
     registry,
     )
 from .sixish import (
+    text_type,
     viewitems,
     )
 # TODO: Report back as changes are merged in
@@ -841,7 +842,7 @@
                 self.tt.iter_changes(), self.change_reporter)
         self.cook_conflicts(fs_conflicts)
         for conflict in self.cooked_conflicts:
-            trace.warning(unicode(conflict))
+            trace.warning('%s', conflict.describe())
 
     def _entries3(self):
         """Gather data about files modified between three trees.
 
=== modified file 'breezy/mergetools.py'
--- breezy/mergetools.py	2017-05-22 00:56:52 +0000
+++ breezy/mergetools.py	2018-06-21 23:03:57 +0000
@@ -33,6 +33,8 @@
 )
 """)
 
+from .sixish import text_type
+
 
 known_merge_tools = {
     'bcompare': 'bcompare {this} {other} {base} {result}',
@@ -52,7 +54,7 @@
         if exe is None:
             return False
         base, ext = os.path.splitext(exe)
-        path_ext = [unicode(s.lower())
+        path_ext = [s.lower()
                     for s in os.getenv('PATHEXT', '').split(os.pathsep)]
         return os.path.exists(exe) and ext in path_ext
     else:
 
=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2018-05-13 02:18:13 +0000
+++ breezy/osutils.py	2018-06-21 23:03:57 +0000
@@ -384,12 +384,12 @@
 
 def _win32_abspath(path):
     # Real ntpath.abspath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/'))
+    return _win32_fixdrive(ntpath.abspath(path).replace('\\', '/'))
 
 
 def _win32_realpath(path):
     # Real ntpath.realpath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/'))
+    return _win32_fixdrive(ntpath.realpath(path).replace('\\', '/'))
 
 
 def _win32_pathjoin(*args):
@@ -397,7 +397,7 @@
 
 
 def _win32_normpath(path):
-    return _win32_fixdrive(ntpath.normpath(unicode(path)).replace('\\', '/'))
+    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
 
 
 def _win32_getcwd():
@@ -1454,13 +1454,17 @@
     can be accessed by that path.
     """
 
-    return unicodedata.normalize('NFC', text_type(path)), True
+    if isinstance(path, bytes):
+        path = path.decode(sys.getfilesystemencoding())
+    return unicodedata.normalize('NFC', path), True
 
 
 def _inaccessible_normalized_filename(path):
     __doc__ = _accessible_normalized_filename.__doc__
 
-    normalized = unicodedata.normalize('NFC', text_type(path))
+    if isinstance(path, bytes):
+        path = path.decode(sys.getfilesystemencoding())
+    normalized = unicodedata.normalize('NFC', path)
     return normalized, normalized == path
 
 
 
=== modified file 'breezy/plugins/git/branch.py'
--- breezy/plugins/git/branch.py	2018-05-15 19:46:32 +0000
+++ breezy/plugins/git/branch.py	2018-06-21 23:03:57 +0000
@@ -44,6 +44,7 @@
 from ...revision import (
     NULL_REVISION,
     )
+from ...sixish import text_type
 from ...trace import (
     is_quiet,
     mutter,
@@ -263,7 +264,7 @@
 class GitBranchFormat(branch.BranchFormat):
 
     def network_name(self):
-        return "git"
+        return b"git"
 
     def supports_tags(self):
         return True
@@ -695,7 +696,7 @@
             peeled = refs.get_peeled(ref_name)
             if peeled is None:
                 peeled = unpeeled
-            if type(tag_name) is not unicode:
+            if not isinstance(tag_name, text_type):
                 raise TypeError(tag_name)
             yield (ref_name, tag_name, peeled, unpeeled)
 
 
=== modified file 'breezy/plugins/git/dir.py'
--- breezy/plugins/git/dir.py	2018-05-13 22:54:28 +0000
+++ breezy/plugins/git/dir.py	2018-06-21 23:03:57 +0000
@@ -689,5 +689,5 @@
         except bzr_errors.NoSuchFile:
             return self
         else:
-            commondir = commondir.rstrip('/.git/')
+            commondir = commondir.rstrip(b'/.git/')
             return ControlDir.open_from_transport(get_transport_from_path(commondir))
 
=== modified file 'breezy/plugins/git/fetch.py'
--- breezy/plugins/git/fetch.py	2018-06-17 13:07:22 +0000
+++ breezy/plugins/git/fetch.py	2018-06-21 23:03:57 +0000
@@ -55,6 +55,7 @@
 from ...revision import (
     NULL_REVISION,
     )
+from ...sixish import text_type
 from ...bzr.inventorytree import InventoryRevisionTree
 from ...testament import (
     StrictTestament3,
@@ -223,7 +224,7 @@
     :param lookup_object: Lookup a git object by its SHA1
     :return: Inventory delta, as list
     """
-    if type(path) is not unicode:
+    if not isinstance(path, text_type):
         raise TypeError(path)
     ret = []
     for name, mode, hexsha in base_tree.iteritems():
 
=== modified file 'breezy/plugins/git/mapping.py'
--- breezy/plugins/git/mapping.py	2018-05-15 01:20:00 +0000
+++ breezy/plugins/git/mapping.py	2018-06-21 23:03:57 +0000
@@ -40,6 +40,7 @@
 from ...revision import (
     NULL_REVISION,
     )
+from ...sixish import text_type
 from .errors import (
     NoPushSupport,
     UnknownCommitExtra,
@@ -159,7 +160,7 @@
         # We must just hope they are valid UTF-8..
         if path == "":
             return ROOT_ID
-        if type(path) is unicode:
+        if isinstance(path, text_type):
             path = path.encode("utf-8")
         return FILE_ID_PREFIX + escape_file_id(path)
 
@@ -553,7 +554,7 @@
 def symlink_to_blob(symlink_target):
     from dulwich.objects import Blob
     blob = Blob()
-    if type(symlink_target) == unicode:
+    if isinstance(symlink_target, text_type):
         symlink_target = symlink_target.encode('utf-8')
     blob.data = symlink_target
     return blob
 
=== modified file 'breezy/plugins/git/remote.py'
--- breezy/plugins/git/remote.py	2018-05-20 16:08:36 +0000
+++ breezy/plugins/git/remote.py	2018-06-21 23:03:57 +0000
@@ -48,6 +48,7 @@
     UninitializableFormat,
     )
 from ...revisiontree import RevisionTree
+from ...sixish import text_type
 from ...transport import (
     Transport,
     register_urlparse_netloc_protocol,
@@ -902,7 +903,7 @@
                 except KeyError:
                     # Let's just hope it's a commit
                     peeled = unpeeled
-            if type(tag_name) is not unicode:
+            if not isinstance(tag_name, text_type):
                 raise TypeError(tag_name)
             yield (ref_name, tag_name, peeled, unpeeled)
 
 
=== modified file 'breezy/plugins/git/tests/test_memorytree.py'
--- breezy/plugins/git/tests/test_memorytree.py	2018-05-22 02:05:12 +0000
+++ breezy/plugins/git/tests/test_memorytree.py	2018-06-21 23:03:57 +0000
@@ -96,33 +96,30 @@
     def test_put_new_file(self):
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
-        tree.lock_write()
-        tree.add(['', 'foo'], kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', tree.get_file('foo').read())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            self.assertEqual(b'barshoom', tree.get_file('foo').read())
 
     def test_put_existing_file(self):
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
-        tree.lock_write()
-        tree.add(['', 'foo'], kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'first-content')
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', tree.get_file('foo').read())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'first-content')
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            self.assertEqual(b'barshoom', tree.get_file('foo').read())
 
     def test_add_in_subdir(self):
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
-        tree.lock_write()
-        self.addCleanup(tree.unlock)
-        tree.add([''], None, ['directory'])
-        tree.mkdir('adir')
-        tree.put_file_bytes_non_atomic('adir/afile', 'barshoom')
-        tree.add(['adir/afile'], None, ['file'])
-        self.assertTrue(tree.is_versioned('adir/afile'))
-        self.assertTrue(tree.is_versioned('adir'))
+        with tree.lock_write():
+            tree.add([''], None, ['directory'])
+            tree.mkdir('adir')
+            tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
+            tree.add(['adir/afile'], None, ['file'])
+            self.assertTrue(tree.is_versioned('adir/afile'))
+            self.assertTrue(tree.is_versioned('adir'))
 
     def test_commit_trivial(self):
         """Smoke test for commit on a MemoryTree.
@@ -132,18 +129,16 @@
         """
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
-        tree.lock_write()
-        tree.add(['', 'foo'], kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
-        revision_id = tree.commit('message baby')
-        # the parents list for the tree should have changed.
-        self.assertEqual([revision_id], tree.get_parent_ids())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            revision_id = tree.commit('message baby')
+            # the parents list for the tree should have changed.
+            self.assertEqual([revision_id], tree.get_parent_ids())
         # and we should have a revision that is accessible outside the tree lock
         revtree = tree.branch.repository.revision_tree(revision_id)
-        revtree.lock_read()
-        self.addCleanup(revtree.unlock)
-        self.assertEqual('barshoom', revtree.get_file('foo').read())
+        with revtree.lock_read():
+            self.assertEqual(b'barshoom', revtree.get_file('foo').read())
 
     def test_unversion(self):
         """Some test for unversion of a memory tree."""
@@ -168,22 +163,22 @@
         tree = self.make_branch_and_memory_tree('branch')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        tree.add(['', 'foo'], ['root-id', 'foo-id'], ['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'content\n')
+        tree.add(['', 'foo'], [b'root-id', b'foo-id'], ['directory', 'file'])
+        tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
         tree.rename_one('foo', 'bar')
-        self.assertEqual('bar', tree.id2path('foo-id'))
+        self.assertEqual('bar', tree.id2path(b'foo-id'))
         self.assertEqual('content\n', tree._file_transport.get_bytes('bar'))
         self.assertRaises(errors.NoSuchFile,
                           tree._file_transport.get_bytes, 'foo')
         tree.commit('two', rev_id=b'rev-two')
-        self.assertEqual('content\n', tree._file_transport.get_bytes('bar'))
+        self.assertEqual(b'content\n', tree._file_transport.get_bytes('bar'))
         self.assertRaises(errors.NoSuchFile,
                           tree._file_transport.get_bytes, 'foo')
 
         rev_tree2 = tree.branch.repository.revision_tree(b'rev-two')
-        self.assertEqual('bar', rev_tree2.id2path('foo-id'))
-        self.assertEqual('content\n', rev_tree2.get_file_text('bar'))
+        self.assertEqual('bar', rev_tree2.id2path(b'foo-id'))
+        self.assertEqual(b'content\n', rev_tree2.get_file_text('bar'))
 
     def test_rename_file_to_subdir(self):
         tree = self.make_branch_and_memory_tree('branch')
 
=== modified file 'breezy/plugins/git/tree.py'
--- breezy/plugins/git/tree.py	2018-06-21 08:03:55 +0000
+++ breezy/plugins/git/tree.py	2018-06-21 23:03:57 +0000
@@ -59,6 +59,7 @@
     CURRENT_REVISION,
     NULL_REVISION,
     )
+from ...sixish import text_type
 
 from .mapping import (
     mode_is_executable,
@@ -1034,9 +1035,9 @@
             posixpath.basename(path).strip("/"), parent_id)
 
     def _get_file_ie(self, name, path, value, parent_id):
-        if type(name) is not unicode:
+        if not isinstance(name, text_type):
             raise TypeError(name)
-        if type(path) is not unicode:
+        if not isinstance(path, text_type):
             raise TypeError(path)
         if not isinstance(value, tuple) or len(value) != 10:
             raise TypeError(value)
 
=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2017-11-12 17:53:47 +0000
+++ breezy/revisionspec.py	2018-06-21 23:03:57 +0000
@@ -468,7 +468,7 @@
         # self.spec comes straight from parsing the command line arguments,
         # so we expect it to be a Unicode string. Switch it to the internal
         # representation.
-        if isinstance(self.spec, unicode):
+        if isinstance(self.spec, text_type):
             return cache_utf8.encode(self.spec)
         return self.spec
 
 
=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2018-02-18 19:18:40 +0000
+++ breezy/shelf.py	2018-06-21 23:03:57 +0000
@@ -297,7 +297,7 @@
         if message is not None:
             metadata[b'message'] = message.encode('utf-8')
         return serializer.bytes_record(
-            bencode.bencode(metadata), (('metadata',),))
+            bencode.bencode(metadata), ((b'metadata',),))
 
     def write_shelf(self, shelf_file, message=None):
         """Serialize the shelved changes to a file.
 
=== modified file 'breezy/status.py'
--- breezy/status.py	2017-12-11 01:58:37 +0000
+++ breezy/status.py	2018-06-21 23:03:57 +0000
@@ -27,6 +27,7 @@
     revision as _mod_revision,
     )
 from . import errors as errors
+from .sixish import text_type
 from .trace import mutter, warning
 from .workingtree import ShelvingUnsupported
 
@@ -195,7 +196,7 @@
                     prefix = 'C  '
                 else:
                     prefix = ' '
-                to_file.write("%s %s\n" % (prefix, unicode(conflict)))
+                to_file.write("%s %s\n" % (prefix, conflict))
             # Show files that were requested but don't exist (and are
             # not versioned).  We don't involve delta in this; these
             # paths are really the province of just the status
 
=== modified file 'breezy/tag.py'
--- breezy/tag.py	2018-05-13 02:18:13 +0000
+++ breezy/tag.py	2018-06-21 23:03:57 +0000
@@ -28,6 +28,7 @@
 # called tags* are ctags files... mbp 20070220.
 
 from .registry import Registry
+from .sixish import text_type
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import itertools
@@ -360,7 +361,7 @@
     """
     def natural_sort_key(tag):
         return [f(s) for f, s in
-                zip(itertools.cycle((unicode.lower, int)),
+                zip(itertools.cycle((text_type.lower, int)),
                                     re.split('([0-9]+)', tag[0]))]
     tags.sort(key=natural_sort_key)
 
 
=== modified file 'breezy/testament.py'
--- breezy/testament.py	2017-10-27 00:18:42 +0000
+++ breezy/testament.py	2018-06-21 23:03:57 +0000
@@ -78,6 +78,7 @@
     contains_linebreaks,
     sha_strings,
     )
+from .sixish import text_type
 from .tree import Tree
 
 
@@ -162,7 +163,9 @@
     def _escape_path(self, path):
         if contains_linebreaks(path):
             raise ValueError(path)
-        return unicode(path.replace('\\', '/').replace(' ', '\\ '))
+        if not isinstance(path, text_type):
+            raise TypeError(path)
+        return path.replace(u'\\', u'/').replace(u' ', u'\\ ')
 
     def _entry_to_line(self, path, ie):
         """Turn an inventory entry into a testament line"""
@@ -240,6 +243,9 @@
     def _escape_path(self, path):
         if contains_linebreaks(path):
             raise ValueError(path)
-        if path == '':
-            path = '.'
-        return unicode(path.replace('\\', '/').replace(' ', '\\ '))
+        if not isinstance(path, text_type):
+            # TODO(jelmer): Clean this up for pad.lv/1696545
+            path = path.decode('ascii')
+        if path == u'':
+            path = u'.'
+        return path.replace(u'\\', u'/').replace(u' ', u'\\ ')
 
=== modified file 'breezy/tests/blackbox/test_reconcile.py'
--- breezy/tests/blackbox/test_reconcile.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/blackbox/test_reconcile.py	2018-06-21 23:03:57 +0000
@@ -51,10 +51,10 @@
         # an empty inventory with no revision will trigger reconciliation.
         repo = t.branch.repository
         inv = inventory.Inventory(revision_id=b'missing')
-        inv.root.revision='missing'
+        inv.root.revision=b'missing'
         repo.lock_write()
         repo.start_write_group()
-        repo.add_inventory('missing', inv, [])
+        repo.add_inventory(b'missing', inv, [])
         repo.commit_write_group()
         repo.unlock()
         (out, err) = self.run_bzr('reconcile')
 
=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2018-06-15 13:10:28 +0000
+++ breezy/tests/per_branch/test_branch.py	2018-06-21 23:03:57 +0000
@@ -74,7 +74,7 @@
         graph = tree.branch.repository.get_graph()
         ancestry_graph = graph.get_parent_map(
             tree.branch.repository.all_revision_ids())
-        self.assertEqual({revmap['1']: ('null:',),
+        self.assertEqual({revmap['1']: (b'null:',),
                           revmap['2']: (revmap['1'], ),
                           revmap['1.1.1']: (revmap['1'], ),
                           revmap['3']: (revmap['2'], revmap['1.1.1'], ),
@@ -213,9 +213,9 @@
         if not wt.branch.repository._format.supports_ghosts:
             raise tests.TestNotApplicable("repository format does not "
                 "support ghosts")
-        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
+        wt.set_parent_ids([b'non:existent@rev--ision--0--2'],
             allow_leftmost_as_ghost=True)
-        self.assertEqual(['non:existent@rev--ision--0--2'],
+        self.assertEqual([b'non:existent@rev--ision--0--2'],
             wt.get_parent_ids())
         rev_id = wt.commit('commit against a ghost first parent.')
         rev = wt.branch.repository.get_revision(rev_id)
@@ -230,15 +230,15 @@
             raise tests.TestNotApplicable("repository format does not "
                 "support ghosts")
         wt.set_parent_ids([
-                'foo@azkhazan-123123-abcabc',
-                'wibble@fofof--20050401--1928390812',
+                b'foo@azkhazan-123123-abcabc',
+                b'wibble@fofof--20050401--1928390812',
             ],
             allow_leftmost_as_ghost=True)
         rev_id = wt.commit("commit from ghost base with one merge")
         # the revision should have been committed with two parents
         rev = wt.branch.repository.get_revision(rev_id)
-        self.assertEqual(['foo@azkhazan-123123-abcabc',
-            'wibble@fofof--20050401--1928390812'],
+        self.assertEqual([b'foo@azkhazan-123123-abcabc',
+            b'wibble@fofof--20050401--1928390812'],
             rev.parent_ids)
 
     def test_bad_revision(self):
 
=== modified file 'breezy/tests/per_branch/test_check.py'
--- breezy/tests/per_branch/test_check.py	2017-06-05 20:48:31 +0000
+++ breezy/tests/per_branch/test_check.py	2018-06-21 23:03:57 +0000
@@ -60,7 +60,7 @@
         result = tree.branch.check(refs)
         ui.ui_factory = tests.TestUIFactory(stdout=BytesIO())
         result.report_results(True)
-        self.assertContainsRe('revno does not match len',
+        self.assertContainsRe(b'revno does not match len',
             ui.ui_factory.stdout.getvalue())
 
     def test_check_branch_report_results(self):
 
=== modified file 'breezy/tests/per_branch/test_commit.py'
--- breezy/tests/per_branch/test_commit.py	2018-03-20 07:41:20 +0000
+++ breezy/tests/per_branch/test_commit.py	2018-06-21 23:03:57 +0000
@@ -189,20 +189,20 @@
             # setting up a playground
             tree.add('rootfile')
             rootfile_id = tree.path2id('rootfile')
-            tree.put_file_bytes_non_atomic('rootfile', 'abc')
+            tree.put_file_bytes_non_atomic('rootfile', b'abc')
             tree.add('dir')
             dir_id = tree.path2id('dir')
             tree.add('dir/subfile')
             dir_subfile_id = tree.path2id('dir/subfile')
-            tree.put_file_bytes_non_atomic('to_be_unversioned', 'blah')
+            tree.put_file_bytes_non_atomic('to_be_unversioned', b'blah')
             tree.add(['to_be_unversioned'])
             to_be_unversioned_id = tree.path2id('to_be_unversioned')
-            tree.put_file_bytes_non_atomic('dir/subfile', 'def')
+            tree.put_file_bytes_non_atomic('dir/subfile', b'def')
             revid1 = tree.commit('first revision')
 
         with tree.lock_write():
             # making changes
-            tree.put_file_bytes_non_atomic('rootfile', 'jkl')
+            tree.put_file_bytes_non_atomic('rootfile', b'jkl')
             tree.rename_one('dir/subfile', 'dir/subfile_renamed')
             tree.unversion(['to_be_unversioned'])
             tree.mkdir('added_dir')
 
=== modified file 'breezy/tests/per_branch/test_iter_merge_sorted_revisions.py'
--- breezy/tests/per_branch/test_iter_merge_sorted_revisions.py	2018-03-27 00:51:45 +0000
+++ breezy/tests/per_branch/test_iter_merge_sorted_revisions.py	2018-06-21 23:03:57 +0000
@@ -81,47 +81,47 @@
 
     def test_merge_sorted_range(self):
         self.assertIterRevids(['1.1.1'],
-                              start_revision_id=b'1.1.1', stop_revision_id=b'1')
+                              start_revision_id='1.1.1', stop_revision_id='1')
 
     def test_merge_sorted_range_start_only(self):
         self.assertIterRevids(['1.1.1', '1'],
-                              start_revision_id=b'1.1.1')
+                              start_revision_id='1.1.1')
 
     def test_merge_sorted_range_stop_exclude(self):
         self.assertIterRevids(['3', '1.1.1', '2'], stop_revision_id=b'1')
 
     def test_merge_sorted_range_stop_include(self):
         self.assertIterRevids(['3', '1.1.1', '2'],
-                              stop_revision_id=b'2', stop_rule='include')
+                              stop_revision_id='2', stop_rule='include')
 
     def test_merge_sorted_range_stop_with_merges(self):
         self.assertIterRevids(['3', '1.1.1'],
-                              stop_revision_id=b'3', stop_rule='with-merges')
+                              stop_revision_id='3', stop_rule='with-merges')
 
     def test_merge_sorted_range_stop_with_merges_can_show_non_parents(self):
         # 1.1.1 gets logged before the end revision is reached.
         # so it is returned even though 1.1.1 is not a parent of 2.
         self.assertIterRevids(['3', '1.1.1', '2'],
-                              stop_revision_id=b'2', stop_rule='with-merges')
+                              stop_revision_id='2', stop_rule='with-merges')
 
     def test_merge_sorted_range_stop_with_merges_ignore_non_parents(self):
         # 2 is not a parent of 1.1.1 so it must not be returned
         self.assertIterRevids(['3', '1.1.1'],
-                              stop_revision_id=b'1.1.1', stop_rule='with-merges')
+                              stop_revision_id='1.1.1', stop_rule='with-merges')
 
     def test_merge_sorted_single_stop_exclude(self):
         # from X..X exclusive is an empty result
-        self.assertIterRevids([], start_revision_id=b'3', stop_revision_id=b'3')
+        self.assertIterRevids([], start_revision_id='3', stop_revision_id='3')
 
     def test_merge_sorted_single_stop_include(self):
         # from X..X inclusive is [X]
         self.assertIterRevids(['3'],
-                              start_revision_id=b'3', stop_revision_id=b'3',
+                              start_revision_id='3', stop_revision_id='3',
                               stop_rule='include')
 
     def test_merge_sorted_single_stop_with_merges(self):
         self.assertIterRevids(['3', '1.1.1'],
-                              start_revision_id=b'3', stop_revision_id=b'3',
+                              start_revision_id='3', stop_revision_id='3',
                               stop_rule='with-merges')
 
     def test_merge_sorted_forward(self):
@@ -129,25 +129,25 @@
 
     def test_merge_sorted_range_forward(self):
         self.assertIterRevids(['1.1.1'],
-                              start_revision_id=b'1.1.1', stop_revision_id=b'1',
+                              start_revision_id='1.1.1', stop_revision_id='1',
                               direction='forward')
 
     def test_merge_sorted_range_start_only_forward(self):
         self.assertIterRevids(['1', '1.1.1'],
-                              start_revision_id=b'1.1.1', direction='forward')
+                              start_revision_id='1.1.1', direction='forward')
 
     def test_merge_sorted_range_stop_exclude_forward(self):
         self.assertIterRevids(['2', '1.1.1', '3'],
-                              stop_revision_id=b'1', direction='forward')
+                              stop_revision_id='1', direction='forward')
 
     def test_merge_sorted_range_stop_include_forward(self):
         self.assertIterRevids(['2', '1.1.1', '3'],
-                              stop_revision_id=b'2', stop_rule='include',
+                              stop_revision_id='2', stop_rule='include',
                               direction='forward')
 
     def test_merge_sorted_range_stop_with_merges_forward(self):
         self.assertIterRevids(['1.1.1', '3'],
-                              stop_revision_id=b'3', stop_rule='with-merges',
+                              stop_revision_id='3', stop_rule='with-merges',
                               direction='forward')
 
 
@@ -303,7 +303,7 @@
                               branch)
         # 3 and 2.1.2 are not part of 2.2.1 ancestry and should not appear
         self.assertIterRevids(['2.2.1', '2.1.1', '2', '1.1.1', '1'],
-                              branch, start_revision_id=b'2.2.1',
+                              branch, start_revision_id='2.2.1',
                               stop_rule='with-merges')
 
     def test_merge_sorted_with_different_depths_merge(self):
@@ -317,7 +317,7 @@
         # 3 (and its descendants) and 2.1.2 are not part of 2.2.1 ancestry and
         # should not appear
         self.assertIterRevids(['2.2.1', '2.1.1', '2', '1'],
-                              branch, start_revision_id=b'2.2.1',
+                              branch, start_revision_id='2.2.1',
                               stop_rule='with-merges')
 
     def test_merge_sorted_exclude_ancestry(self):
@@ -329,6 +329,6 @@
         self.assertIterRevids(['1.1.2', '1.2.1'],
                               branch,
                               stop_rule='with-merges-without-common-ancestry',
-                              start_revision_id=b'1.1.2',
-                              stop_revision_id=b'1.1.1')
+                              start_revision_id='1.1.2',
+                              stop_revision_id='1.1.1')
 
 
=== modified file 'breezy/tests/per_branch/test_revision_id_to_dotted_revno.py'
--- breezy/tests/per_branch/test_revision_id_to_dotted_revno.py	2017-08-07 21:14:18 +0000
+++ breezy/tests/per_branch/test_revision_id_to_dotted_revno.py	2018-06-21 23:03:57 +0000
@@ -26,11 +26,11 @@
     def test_lookup_dotted_revno(self):
         tree, revmap = self.create_tree_with_merge()
         the_branch = tree.branch
-        self.assertEqual((0,), the_branch.revision_id_to_dotted_revno('null:'))
+        self.assertEqual((0,), the_branch.revision_id_to_dotted_revno(b'null:'))
         self.assertEqual((1,), the_branch.revision_id_to_dotted_revno(revmap['1']))
         self.assertEqual((2,), the_branch.revision_id_to_dotted_revno(revmap['2']))
         self.assertEqual((3,), the_branch.revision_id_to_dotted_revno(revmap['3']))
         self.assertEqual((1, 1, 1), the_branch.revision_id_to_dotted_revno(
             revmap['1.1.1']))
         self.assertRaises(errors.NoSuchRevision,
-                          the_branch.revision_id_to_dotted_revno, 'rev-1.0.2')
+                          the_branch.revision_id_to_dotted_revno, b'rev-1.0.2')
 
=== modified file 'breezy/tests/per_foreign_vcs/test_branch.py'
--- breezy/tests/per_foreign_vcs/test_branch.py	2017-11-19 18:55:26 +0000
+++ breezy/tests/per_foreign_vcs/test_branch.py	2018-06-21 23:03:57 +0000
@@ -146,4 +146,4 @@
         self.assertIsInstance(self.branch_format.get_format_description(), str)
 
     def test_network_name(self):
-        self.assertIsInstance(self.branch_format.network_name(), str)
+        self.assertIsInstance(self.branch_format.network_name(), bytes)
 
=== modified file 'breezy/tests/per_interbranch/test_push.py'
--- breezy/tests/per_interbranch/test_push.py	2018-03-27 00:51:45 +0000
+++ breezy/tests/per_interbranch/test_push.py	2018-06-21 23:03:57 +0000
@@ -267,10 +267,10 @@
         builder.start_series()
         revid1 = builder.build_snapshot(None, [
             ('add', ('', None, 'directory', '')),
-            ('add', ('filename', None, 'file', 'content\n'))])
+            ('add', ('filename', None, 'file', b'content\n'))])
         revid2 = builder.build_snapshot([revid1], [])
         revid3 = builder.build_snapshot([revid2],
-            [('modify', ('filename', 'new-content\n'))])
+            [('modify', ('filename', b'new-content\n'))])
         builder.finish_series()
         trunk = builder.get_branch()
         # Sprout rev-1 to "trunk", so that we can stack on it.
 
=== modified file 'breezy/tests/per_interrepository/test_fetch.py'
--- breezy/tests/per_interrepository/test_fetch.py	2018-06-21 17:53:38 +0000
+++ breezy/tests/per_interrepository/test_fetch.py	2018-06-21 23:03:57 +0000
@@ -161,10 +161,10 @@
         builder = self.make_branch_builder('full-branch')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', '')),
-            ('add', ('file', 'file-id', 'file', 'content\n'))],
+            ('add', ('', b'root-id', 'directory', '')),
+            ('add', ('file', b'file-id', 'file', b'content\n'))],
             revision_id=b'first')
-        builder.build_snapshot(['first'], [
+        builder.build_snapshot([b'first'], [
             ('modify', ('file', b'second content\n'))],
             revision_id=b'second')
         builder.build_snapshot([b'second'], [
@@ -174,19 +174,23 @@
         branch = builder.get_branch()
         repo = self.make_repository('stacking-base')
         trunk = repo.controldir.create_branch()
-        trunk.repository.fetch(branch.repository, 'second')
+        trunk.repository.fetch(branch.repository, b'second')
         repo = self.make_repository('stacked')
         stacked_branch = repo.controldir.create_branch()
         stacked_branch.set_stacked_on_url(trunk.base)
-        stacked_branch.repository.fetch(branch.repository, 'third')
+        stacked_branch.repository.fetch(branch.repository, b'third')
         target = self.make_to_repository('target')
+<<<<<<< TREE
         try:
             target.fetch(stacked_branch.repository, 'third')
         except errors.NoRoundtrippingSupport:
             raise TestNotApplicable('roundtripping not supported')
+=======
+        target.fetch(stacked_branch.repository, b'third')
+>>>>>>> MERGE-SOURCE
         target.lock_read()
         self.addCleanup(target.unlock)
-        all_revs = {'first', 'second', 'third'}
+        all_revs = {b'first', b'second', b'third'}
         self.assertEqual(all_revs, set(target.get_parent_map(all_revs)))
 
     def test_fetch_parent_inventories_at_stacking_boundary_smart(self):
 
=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2018-05-13 02:18:13 +0000
+++ breezy/tests/per_intertree/test_compare.py	2018-06-21 23:03:57 +0000
@@ -793,14 +793,14 @@
         tree1.mkdir('changing/unchanging', b'mid-id')
         tree1.add(['changing/unchanging/file'], [b'file-id'], ['file'])
         tree1.put_file_bytes_non_atomic(
-                'changing/unchanging/file', 'a file', file_id='file-id')
+                'changing/unchanging/file', b'a file', file_id=b'file-id')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(tree1.get_root_id())
         tree2.mkdir('changed', b'parent-id')
         tree2.mkdir('changed/unchanging', b'mid-id')
         tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
         tree2.put_file_bytes_non_atomic(
-                'changed/unchanging/file', 'changed content', file_id=b'file-id')
+                'changed/unchanging/file', b'changed content', file_id=b'file-id')
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         # parent-id has changed, as has file-id
         root_id = tree1.path2id('')
@@ -820,15 +820,15 @@
         tree1.mkdir('changed/unchanging', b'mid-id')
         tree1.add(['changed/unchanging/file'], [b'file-id'], ['file'])
         tree1.put_file_bytes_non_atomic(
-                'changed/unchanging/file', 'a file',
-                'file-id')
+                'changed/unchanging/file', b'a file',
+                b'file-id')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(b'new')
         tree2.mkdir('changed', b'parent-id')
         tree2.mkdir('changed/unchanging', b'mid-id')
         tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
         tree2.put_file_bytes_non_atomic(
-                'changed/unchanging/file', 'changed content', file_id=b'file-id')
+                'changed/unchanging/file', b'changed content', file_id=b'file-id')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # old is gone, new is added, parent-id has changed(reparented), as has
         # file-id(content)
@@ -874,12 +874,12 @@
         # it must be emitted as a change.
         tree1 = self.make_branch_and_tree('1')
         tree1.add(['a'], [b'a-id'], ['file'])
-        tree1.put_file_bytes_non_atomic('a', 'a file')
+        tree1.put_file_bytes_non_atomic('a', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
         tree2.set_root_id(tree1.get_root_id())
         tree2.mkdir('a', b'b-id')
         tree2.add(['a/c'], [b'c-id'], ['file'])
-        tree2.put_file_bytes_non_atomic('a/c', 'another file')
+        tree2.put_file_bytes_non_atomic('a/c', b'another file')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # a-id is gone, b-id and c-id are added.
         self.assertEqualIterChanges(
@@ -900,7 +900,7 @@
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/reparented', b'reparented-id')
         tree2.add(['b'], [b'a-old-id'], ['file'])
-        tree2.put_file_bytes_non_atomic('b', '')
+        tree2.put_file_bytes_non_atomic('b', b'')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
         # a-old-id is kind-changed, a-new-id is added, reparented-id is renamed,
         # deleted-id is gone
 
=== modified file 'breezy/tests/per_pack_repository.py'
--- breezy/tests/per_pack_repository.py	2018-05-27 18:00:21 +0000
+++ breezy/tests/per_pack_repository.py	2018-06-21 23:03:57 +0000
@@ -199,8 +199,8 @@
         index = self.index_class(trans, 'pack-names', None)
         self.assertEqual(9, len(list(index.iter_all_entries())))
         # insert some files in obsolete_packs which should be removed by pack.
-        trans.put_bytes('obsolete_packs/foo', '123')
-        trans.put_bytes('obsolete_packs/bar', '321')
+        trans.put_bytes('obsolete_packs/foo', b'123')
+        trans.put_bytes('obsolete_packs/bar', b'321')
         # committing one more should coalesce to 1 of 10.
         tree.commit('commit triggering pack')
         index = self.index_class(trans, 'pack-names', None)
@@ -275,7 +275,7 @@
         repo_transport = bzrdir.get_repository_transport(None)
         self.assertTrue(repo_transport.has('obsolete_packs'))
         # these files are in use by another client and typically can't be deleted
-        repo_transport.put_bytes('obsolete_packs/.nfsblahblah', 'contents')
+        repo_transport.put_bytes('obsolete_packs/.nfsblahblah', b'contents')
         repo._pack_collection._clear_obsolete_packs()
         self.assertTrue(repo_transport.has('obsolete_packs/.nfsblahblah'))
 
 
=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
--- breezy/tests/per_repository/test_commit_builder.py	2018-05-05 15:49:41 +0000
+++ breezy/tests/per_repository/test_commit_builder.py	2018-06-21 23:03:57 +0000
@@ -556,7 +556,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['file'])
         def change_file():
-            tree.put_file_bytes_non_atomic('file', 'new content')
+            tree.put_file_bytes_non_atomic('file', b'new content')
         self._add_commit_change_check_changed(tree, ('file', 'file'), change_file,
             expect_fs_hash=True)
 
 
=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2018-06-15 13:10:28 +0000
+++ breezy/tests/per_repository/test_repository.py	2018-06-21 23:03:57 +0000
@@ -44,6 +44,7 @@
     )
 from ...sixish import (
     BytesIO,
+    text_type,
     )
 from .. import (
     per_repository,
@@ -416,7 +417,7 @@
             self.assertEqual(rev.message, message)
         # insist the class is unicode no matter what came in for
         # consistency.
-        self.assertIsInstance(rev.message, unicode)
+        self.assertIsInstance(rev.message, text_type)
 
     def test_commit_unicode_message(self):
         # a siple unicode message should be preserved
 
=== modified file 'breezy/tests/per_repository_reference/test_fetch.py'
--- breezy/tests/per_repository_reference/test_fetch.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/per_repository_reference/test_fetch.py	2018-06-21 23:03:57 +0000
@@ -61,25 +61,25 @@
         # Use 'make_branch' which gives us a bzr:// branch when appropriate,
         # rather than creating a branch-on-disk
         stack_b = self.make_branch('stack-on')
-        stack_b.pull(source_b, stop_revision='B-id')
+        stack_b.pull(source_b, stop_revision=b'B-id')
         target_b = self.make_branch('target')
         target_b.set_stacked_on_url('../stack-on')
-        target_b.pull(source_b, stop_revision='C-id')
+        target_b.pull(source_b, stop_revision=b'C-id')
         # At this point, we should have a target branch, with 1 revision, on
         # top of the source.
         final_b = self.make_branch('final')
         final_b.pull(target_b)
         final_b.lock_read()
         self.addCleanup(final_b.unlock)
-        self.assertEqual('C-id', final_b.last_revision())
-        text_keys = [('a-id', 'A-id'), ('a-id', 'B-id'), ('a-id', 'C-id')]
+        self.assertEqual(b'C-id', final_b.last_revision())
+        text_keys = [(b'a-id', b'A-id'), (b'a-id', b'B-id'), (b'a-id', b'C-id')]
         stream = final_b.repository.texts.get_record_stream(text_keys,
             'unordered', True)
         records = sorted([(r.key, r.get_bytes_as('fulltext')) for r in stream])
         self.assertEqual([
-            (('a-id', 'A-id'), ''.join(content[:-2])),
-            (('a-id', 'B-id'), ''.join(content[:-1])),
-            (('a-id', 'C-id'), ''.join(content)),
+            ((b'a-id', b'A-id'), b''.join(content[:-2])),
+            ((b'a-id', b'B-id'), b''.join(content[:-1])),
+            ((b'a-id', b'C-id'), b''.join(content)),
             ], records)
 
     def test_sprout_from_smart_stacked_with_short_history(self):
@@ -97,7 +97,7 @@
         target_bzrdir.create_repository()
         target_b = target_bzrdir.create_branch()
         target_b.set_stacked_on_url('../stack-on')
-        target_b.pull(source_b, stop_revision='C-id')
+        target_b.pull(source_b, stop_revision=b'C-id')
         # Now we should be able to branch from the remote location to a local
         # location
         final_b = target_b.controldir.sprout('final').open_branch()
@@ -114,16 +114,16 @@
         builder = self.make_branch_builder('source')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('file', 'file-id', 'file', 'content\n'))],
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('file', b'file-id', 'file', b'content\n'))],
             revision_id=b'A-id')
-        builder.build_snapshot(['A-id', 'ghost-id'], [], revision_id=b'B-id')
+        builder.build_snapshot([b'A-id', b'ghost-id'], [], revision_id=b'B-id')
         builder.finish_series()
         source_b = builder.get_branch()
         source_b.lock_read()
         self.addCleanup(source_b.unlock)
         base = self.make_branch('base')
-        base.pull(source_b, stop_revision='A-id')
+        base.pull(source_b, stop_revision=b'A-id')
         stacked = self.make_branch('stacked')
         stacked.set_stacked_on_url('../base')
         return source_b, base, stacked
@@ -131,7 +131,7 @@
     def test_fetch_with_ghost_stacked(self):
         (source_b, base,
          stacked) = self.make_source_with_ghost_and_stacked_target()
-        stacked.pull(source_b, stop_revision='B-id')
+        stacked.pull(source_b, stop_revision=b'B-id')
 
     def test_fetch_into_smart_stacked_with_ghost(self):
         (source_b, base,
@@ -142,7 +142,7 @@
         stacked = branch.Branch.open(trans.base)
         stacked.lock_write()
         self.addCleanup(stacked.unlock)
-        stacked.pull(source_b, stop_revision='B-id')
+        stacked.pull(source_b, stop_revision=b'B-id')
 
     def test_fetch_to_stacked_from_smart_with_ghost(self):
         (source_b, base,
@@ -153,7 +153,7 @@
         source_b = branch.Branch.open(trans.base)
         source_b.lock_read()
         self.addCleanup(source_b.unlock)
-        stacked.pull(source_b, stop_revision='B-id')
+        stacked.pull(source_b, stop_revision=b'B-id')
 
 
 class TestFetchFromRepoWithUnconfiguredFallbacks(TestFetchBase):
@@ -163,10 +163,10 @@
         # Use 'make_branch' which gives us a bzr:// branch when appropriate,
         # rather than creating a branch-on-disk
         stack_b = self.make_branch('stack-on')
-        stack_b.pull(source_b, stop_revision='B-id')
+        stack_b.pull(source_b, stop_revision=b'B-id')
         stacked_b = self.make_branch('stacked')
         stacked_b.set_stacked_on_url('../stack-on')
-        stacked_b.pull(source_b, stop_revision='C-id')
+        stacked_b.pull(source_b, stop_revision=b'C-id')
         return stacked_b.repository
 
     def test_fetch_everything_includes_parent_invs(self):
@@ -182,9 +182,9 @@
             target.revisions.keys())
         self.assertEqual(repo_missing_fallbacks.inventories.keys(),
             target.inventories.keys())
-        self.assertEqual(['C-id'],
+        self.assertEqual([b'C-id'],
             sorted(k[-1] for k in target.revisions.keys()))
-        self.assertEqual(['B-id', 'C-id'],
+        self.assertEqual([b'B-id', b'C-id'],
             sorted(k[-1] for k in target.inventories.keys()))
 
 
 
=== modified file 'breezy/tests/per_repository_reference/test_graph.py'
--- breezy/tests/per_repository_reference/test_graph.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/per_repository_reference/test_graph.py	2018-06-21 23:03:57 +0000
@@ -57,19 +57,19 @@
         builder = self.make_branch_builder('source')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'directory', 'root-id', None))],
+            ('add', ('', 'directory', b'root-id', None))],
             revision_id=b'A')
-        builder.build_snapshot(['A'], [], revision_id=b'B')
-        builder.build_snapshot(['B'], [], revision_id=b'C')
-        builder.build_snapshot(['C'], [], revision_id=b'D')
-        builder.build_snapshot(['D'], [], revision_id=b'E')
-        builder.build_snapshot(['E'], [], revision_id=b'F')
+        builder.build_snapshot([b'A'], [], revision_id=b'B')
+        builder.build_snapshot([b'B'], [], revision_id=b'C')
+        builder.build_snapshot([b'C'], [], revision_id=b'D')
+        builder.build_snapshot([b'D'], [], revision_id=b'E')
+        builder.build_snapshot([b'E'], [], revision_id=b'F')
         source_b = builder.get_branch()
         master_b = self.make_branch('master')
-        master_b.pull(source_b, stop_revision='E')
+        master_b.pull(source_b, stop_revision=b'E')
         stacked_b = self.make_branch('stacked')
         stacked_b.set_stacked_on_url('../master')
-        stacked_b.pull(source_b, stop_revision='F')
+        stacked_b.pull(source_b, stop_revision=b'F')
         builder.finish_series()
         return master_b, stacked_b
 
 
=== modified file 'breezy/tests/per_repository_reference/test_unlock.py'
--- breezy/tests/per_repository_reference/test_unlock.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/per_repository_reference/test_unlock.py	2018-06-21 23:03:57 +0000
@@ -35,24 +35,24 @@
         if not repo._format.supports_external_lookups:
             raise tests.TestNotApplicable('format does not support stacking')
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('file', 'file-id', 'file', 'contents\n'))],
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('file', b'file-id', 'file', b'contents\n'))],
             revision_id=b'A-id')
-        builder.build_snapshot(['A-id'], [
-            ('modify', ('file', 'new-content\n'))],
+        builder.build_snapshot([b'A-id'], [
+            ('modify', ('file', b'new-content\n'))],
             revision_id=b'B-id')
-        builder.build_snapshot(['B-id'], [
-            ('modify', ('file', 'yet more content\n'))],
+        builder.build_snapshot([b'B-id'], [
+            ('modify', ('file', b'yet more content\n'))],
             revision_id=b'C-id')
         builder.finish_series()
         source_b = builder.get_branch()
         source_b.lock_read()
         self.addCleanup(source_b.unlock)
         base = self.make_branch('base')
-        base.pull(source_b, stop_revision='B-id')
+        base.pull(source_b, stop_revision=b'B-id')
         stacked = self.make_branch('stacked')
         stacked.set_stacked_on_url('../base')
-        stacked.pull(source_b, stop_revision='C-id')
+        stacked.pull(source_b, stop_revision=b'C-id')
 
         return base, stacked
 
 
=== modified file 'breezy/tests/per_repository_vf/test_check_reconcile.py'
--- breezy/tests/per_repository_vf/test_check_reconcile.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/per_repository_vf/test_check_reconcile.py	2018-06-21 23:03:57 +0000
@@ -99,10 +99,10 @@
     """
 
     def all_versions_after_reconcile(self):
-        return ('rev1a', )
+        return (b'rev1a', )
 
     def populated_parents(self):
-        return (((), 'rev1a'), )
+        return (((), b'rev1a'), )
 
     def corrected_parents(self):
         # Same as the populated parents, because there was nothing wrong.
@@ -114,22 +114,22 @@
     def populate_repository(self, repo):
         # make rev1a: A well-formed revision, containing 'a-file'
         inv = self.make_one_file_inventory(
-            repo, 'rev1a', [], root_revision='rev1a')
-        self.add_revision(repo, 'rev1a', inv, [])
+            repo, b'rev1a', [], root_revision=b'rev1a')
+        self.add_revision(repo, b'rev1a', inv, [])
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'rev1a'): True})
-        result.update({('a-file-id', 'rev1a'): True})
+            result.update({(b'TREE_ROOT', b'rev1a'): True})
+        result.update({(b'a-file-id', b'rev1a'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'rev1a'):[NULL_REVISION]}
+        return {(b'a-file-id', b'rev1a'):[NULL_REVISION]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'rev1a'):[NULL_REVISION]}
+        return {(b'TREE_ROOT', b'rev1a'):[NULL_REVISION]}
 
 
 class FileParentIsNotInRevisionAncestryScenario(BrokenRepoScenario):
@@ -164,39 +164,39 @@
     def populate_repository(self, repo):
         # make rev1a: A well-formed revision, containing 'a-file'
         inv = self.make_one_file_inventory(
-            repo, 'rev1a', [], root_revision='rev1a')
-        self.add_revision(repo, 'rev1a', inv, [])
+            repo, b'rev1a', [], root_revision=b'rev1a')
+        self.add_revision(repo, b'rev1a', inv, [])
 
         # make rev1b, which has no Revision, but has an Inventory, and
         # a-file
         inv = self.make_one_file_inventory(
-            repo, 'rev1b', [], root_revision='rev1b')
-        repo.add_inventory('rev1b', inv, [])
+            repo, b'rev1b', [], root_revision=b'rev1b')
+        repo.add_inventory(b'rev1b', inv, [])
 
         # make rev2, with a-file.
         # a-file has 'rev1b' as an ancestor, even though this is not
         # mentioned by 'rev1a', making it an unreferenced ancestor
         inv = self.make_one_file_inventory(
-            repo, 'rev2', ['rev1a', 'rev1b'])
-        self.add_revision(repo, 'rev2', inv, ['rev1a'])
+            repo, b'rev2', [b'rev1a', b'rev1b'])
+        self.add_revision(repo, b'rev2', inv, [b'rev1a'])
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'rev1a'): True,
-                           ('TREE_ROOT', 'rev2'): True})
-        result.update({('a-file-id', 'rev1a'): True,
-                       ('a-file-id', 'rev2'): True})
+            result.update({(b'TREE_ROOT', b'rev1a'): True,
+                           (b'TREE_ROOT', b'rev2'): True})
+        result.update({(b'a-file-id', b'rev1a'): True,
+                       (b'a-file-id', b'rev2'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'rev1a'):[NULL_REVISION],
-                ('a-file-id', 'rev2'):[('a-file-id', 'rev1a')]}
+        return {(b'a-file-id', b'rev1a'):[NULL_REVISION],
+                (b'a-file-id', b'rev2'):[(b'a-file-id', b'rev1a')]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'rev1a'):[NULL_REVISION],
-                ('TREE_ROOT', 'rev2'):[('TREE_ROOT', 'rev1a')]}
+        return {(b'TREE_ROOT', b'rev1a'):[NULL_REVISION],
+                (b'TREE_ROOT', b'rev2'):[(b'TREE_ROOT', b'rev1a')]}
 
 
 class FileParentHasInaccessibleInventoryScenario(BrokenRepoScenario):
@@ -327,15 +327,15 @@
     def populate_repository(self, repo):
         # make rev1a: A well-formed revision, containing 'a-file'
         inv = self.make_one_file_inventory(
-            repo, 'rev1a', [], root_revision='rev1a')
-        self.add_revision(repo, 'rev1a', inv, [])
+            repo, b'rev1a', [], root_revision=b'rev1a')
+        self.add_revision(repo, b'rev1a', inv, [])
 
         # make rev2, with a-file.
         # a-file is unmodified from rev1a, and an unreferenced rev2 file
         # version is present in the repository.
         self.make_one_file_inventory(
-            repo, 'rev2', ['rev1a'], inv_revision='rev1a')
-        self.add_revision(repo, 'rev2', inv, ['rev1a'])
+            repo, b'rev2', [b'rev1a'], inv_revision=b'rev1a')
+        self.add_revision(repo, b'rev2', inv, [b'rev1a'])
 
         # make rev3 with a-file
         # a-file has 'rev2' as its ancestor, but the revision in 'rev2' was
@@ -344,8 +344,8 @@
         # ghost, so only the details from rev1a are available for
         # determining whether a delta is acceptable, or a full is needed,
         # and what the correct parents are.
-        inv = self.make_one_file_inventory(repo, 'rev3', ['rev2'])
-        self.add_revision(repo, 'rev3', inv, ['rev1c', 'rev1a'])
+        inv = self.make_one_file_inventory(repo, b'rev3', [b'rev2'])
+        self.add_revision(repo, b'rev3', inv, [b'rev1c', b'rev1a'])
 
         # In rev2b, the true last-modifying-revision of a-file is rev1a,
         # inherited from rev2, but there is a version rev2b of the file, which
@@ -354,8 +354,8 @@
         # a-file-rev2b.
         # ??? This is to test deduplication in fixing rev4
         inv = self.make_one_file_inventory(
-            repo, 'rev2b', ['rev1a'], inv_revision='rev1a')
-        self.add_revision(repo, 'rev2b', inv, ['rev1a'])
+            repo, b'rev2b', [b'rev1a'], inv_revision=b'rev1a')
+        self.add_revision(repo, b'rev2b', inv, [b'rev1a'])
 
         # rev4 is for testing that when the last modified of a file in
         # multiple parent revisions is the same, that it only appears once
@@ -365,13 +365,13 @@
         # a-file, and is a merge of rev2 and rev2b, so it should end up with
         # a parent of just rev1a - the starting file parents list is simply
         # completely wrong.
-        inv = self.make_one_file_inventory(repo, 'rev4', ['rev2'])
-        self.add_revision(repo, 'rev4', inv, ['rev2', 'rev2b'])
+        inv = self.make_one_file_inventory(repo, b'rev4', [b'rev2'])
+        self.add_revision(repo, b'rev4', inv, [b'rev2', b'rev2b'])
 
         # rev2c changes a-file from rev1a, so the version it of a-file it
         # introduces is a head revision when rev5 is checked.
-        inv = self.make_one_file_inventory(repo, 'rev2c', ['rev1a'])
-        self.add_revision(repo, 'rev2c', inv, ['rev1a'])
+        inv = self.make_one_file_inventory(repo, b'rev2c', [b'rev1a'])
+        self.add_revision(repo, b'rev2c', inv, [b'rev1a'])
 
         # rev5 descends from rev2 and rev2c; as rev2 does not alter a-file,
         # but rev2c does, this should use rev2c as the parent for the per
@@ -379,44 +379,44 @@
         # available, because we use the heads of the revision parents for
         # the inventory modification revisions of the file to determine the
         # parents for the per file graph.
-        inv = self.make_one_file_inventory(repo, 'rev5', ['rev2', 'rev2c'])
-        self.add_revision(repo, 'rev5', inv, ['rev2', 'rev2c'])
+        inv = self.make_one_file_inventory(repo, b'rev5', [b'rev2', b'rev2c'])
+        self.add_revision(repo, b'rev5', inv, [b'rev2', b'rev2c'])
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'rev1a'): True,
-                           ('TREE_ROOT', 'rev2'): True,
-                           ('TREE_ROOT', 'rev2b'): True,
-                           ('TREE_ROOT', 'rev2c'): True,
-                           ('TREE_ROOT', 'rev3'): True,
-                           ('TREE_ROOT', 'rev4'): True,
-                           ('TREE_ROOT', 'rev5'): True})
-        result.update({('a-file-id', 'rev1a'): True,
-                       ('a-file-id', 'rev2c'): True,
-                       ('a-file-id', 'rev3'): True,
-                       ('a-file-id', 'rev4'): True,
-                       ('a-file-id', 'rev5'): True})
+            result.update({(b'TREE_ROOT', b'rev1a'): True,
+                           (b'TREE_ROOT', b'rev2'): True,
+                           (b'TREE_ROOT', b'rev2b'): True,
+                           (b'TREE_ROOT', b'rev2c'): True,
+                           (b'TREE_ROOT', b'rev3'): True,
+                           (b'TREE_ROOT', b'rev4'): True,
+                           (b'TREE_ROOT', b'rev5'): True})
+        result.update({(b'a-file-id', b'rev1a'): True,
+                       (b'a-file-id', b'rev2c'): True,
+                       (b'a-file-id', b'rev3'): True,
+                       (b'a-file-id', b'rev4'): True,
+                       (b'a-file-id', b'rev5'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'rev1a'): [NULL_REVISION],
-                 ('a-file-id', 'rev2c'): [('a-file-id', 'rev1a')],
-                 ('a-file-id', 'rev3'): [('a-file-id', 'rev1a')],
-                 ('a-file-id', 'rev4'): [('a-file-id', 'rev1a')],
-                 ('a-file-id', 'rev5'): [('a-file-id', 'rev2c')]}
+        return {(b'a-file-id', b'rev1a'): [NULL_REVISION],
+                 (b'a-file-id', b'rev2c'): [(b'a-file-id', b'rev1a')],
+                 (b'a-file-id', b'rev3'): [(b'a-file-id', b'rev1a')],
+                 (b'a-file-id', b'rev4'): [(b'a-file-id', b'rev1a')],
+                 (b'a-file-id', b'rev5'): [(b'a-file-id', b'rev2c')]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'rev1a'): [NULL_REVISION],
-                ('TREE_ROOT', 'rev2'): [('TREE_ROOT', 'rev1a')],
-                ('TREE_ROOT', 'rev2b'): [('TREE_ROOT', 'rev1a')],
-                ('TREE_ROOT', 'rev2c'): [('TREE_ROOT', 'rev1a')],
-                ('TREE_ROOT', 'rev3'): [('TREE_ROOT', 'rev1a')],
-                ('TREE_ROOT', 'rev4'):
-                    [('TREE_ROOT', 'rev2'), ('TREE_ROOT', 'rev2b')],
-                ('TREE_ROOT', 'rev5'):
-                    [('TREE_ROOT', 'rev2'), ('TREE_ROOT', 'rev2c')]}
+        return {(b'TREE_ROOT', b'rev1a'): [NULL_REVISION],
+                (b'TREE_ROOT', b'rev2'): [(b'TREE_ROOT', b'rev1a')],
+                (b'TREE_ROOT', b'rev2b'): [(b'TREE_ROOT', b'rev1a')],
+                (b'TREE_ROOT', b'rev2c'): [(b'TREE_ROOT', b'rev1a')],
+                (b'TREE_ROOT', b'rev3'): [(b'TREE_ROOT', b'rev1a')],
+                (b'TREE_ROOT', b'rev4'):
+                    [(b'TREE_ROOT', b'rev2'), (b'TREE_ROOT', b'rev2b')],
+                (b'TREE_ROOT', b'rev5'):
+                    [(b'TREE_ROOT', b'rev2'), (b'TREE_ROOT', b'rev2c')]}
 
 
 class UnreferencedFileParentsFromNoOpMergeScenario(BrokenRepoScenario):
@@ -427,28 +427,28 @@
     """
 
     def all_versions_after_reconcile(self):
-        return ('rev1a', 'rev1b', 'rev2', 'rev4')
+        return (b'rev1a', b'rev1b', b'rev2', b'rev4')
 
     def populated_parents(self):
         return (
-            ((), 'rev1a'),
-            ((), 'rev1b'),
-            (('rev1a', 'rev1b'), 'rev2'),
-            (None, 'rev3'),
-            (('rev2',), 'rev4'),
+            ((), b'rev1a'),
+            ((), b'rev1b'),
+            ((b'rev1a', b'rev1b'), b'rev2'),
+            (None, b'rev3'),
+            ((b'rev2',), b'rev4'),
             )
 
     def corrected_parents(self):
         return (
-            ((), 'rev1a'),
-            ((), 'rev1b'),
-            ((), 'rev2'),
-            (None, 'rev3'),
-            (('rev2',), 'rev4'),
+            ((), b'rev1a'),
+            ((), b'rev1b'),
+            ((), b'rev2'),
+            (None, b'rev3'),
+            ((b'rev2',), b'rev4'),
             )
 
     def corrected_fulltexts(self):
-        return ['rev2']
+        return [b'rev2']
 
     def check_regexes(self, repo):
         return []
@@ -456,65 +456,66 @@
     def populate_repository(self, repo):
         # make rev1a: A well-formed revision, containing 'a-file'
         inv1a = self.make_one_file_inventory(
-            repo, 'rev1a', [], root_revision='rev1a')
-        self.add_revision(repo, 'rev1a', inv1a, [])
+            repo, b'rev1a', [], root_revision=b'rev1a')
+        self.add_revision(repo, b'rev1a', inv1a, [])
 
         # make rev1b: A well-formed revision, containing 'a-file'
         # rev1b of a-file has the exact same contents as rev1a.
-        file_contents = repo.texts.get_record_stream([('a-file-id', 'rev1a')],
-            "unordered", False).next().get_bytes_as('fulltext')
+        file_contents = next(
+                repo.texts.get_record_stream([(b'a-file-id', b'rev1a')],
+                    "unordered", False)).get_bytes_as('fulltext')
         inv = self.make_one_file_inventory(
-            repo, 'rev1b', [], root_revision='rev1b',
+            repo, b'rev1b', [], root_revision=b'rev1b',
             file_contents=file_contents)
-        self.add_revision(repo, 'rev1b', inv, [])
+        self.add_revision(repo, b'rev1b', inv, [])
 
         # make rev2, a merge of rev1a and rev1b, with a-file.
         # a-file is unmodified from rev1a and rev1b, but a new version is
         # wrongly present anyway.
         inv = self.make_one_file_inventory(
-            repo, 'rev2', ['rev1a', 'rev1b'], inv_revision='rev1a',
+            repo, b'rev2', [b'rev1a', b'rev1b'], inv_revision=b'rev1a',
             file_contents=file_contents)
-        self.add_revision(repo, 'rev2', inv, ['rev1a', 'rev1b'])
+        self.add_revision(repo, b'rev2', inv, [b'rev1a', b'rev1b'])
 
         # rev3: a-file unchanged from rev2, but wrongly referencing rev2 of the
         # file in its inventory.
         inv = self.make_one_file_inventory(
-            repo, 'rev3', ['rev2'], inv_revision='rev2',
+            repo, b'rev3', [b'rev2'], inv_revision=b'rev2',
             file_contents=file_contents, make_file_version=False)
-        self.add_revision(repo, 'rev3', inv, ['rev2'])
+        self.add_revision(repo, b'rev3', inv, [b'rev2'])
 
         # rev4: a modification of a-file on top of rev3.
-        inv = self.make_one_file_inventory(repo, 'rev4', ['rev2'])
-        self.add_revision(repo, 'rev4', inv, ['rev3'])
+        inv = self.make_one_file_inventory(repo, b'rev4', [b'rev2'])
+        self.add_revision(repo, b'rev4', inv, [b'rev3'])
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'rev1a'): True,
-                           ('TREE_ROOT', 'rev1b'): True,
-                           ('TREE_ROOT', 'rev2'): True,
-                           ('TREE_ROOT', 'rev3'): True,
-                           ('TREE_ROOT', 'rev4'): True})
-        result.update({('a-file-id', 'rev1a'): True,
-                       ('a-file-id', 'rev1b'): True,
-                       ('a-file-id', 'rev2'): False,
-                       ('a-file-id', 'rev4'): True})
+            result.update({(b'TREE_ROOT', b'rev1a'): True,
+                           (b'TREE_ROOT', b'rev1b'): True,
+                           (b'TREE_ROOT', b'rev2'): True,
+                           (b'TREE_ROOT', b'rev3'): True,
+                           (b'TREE_ROOT', b'rev4'): True})
+        result.update({(b'a-file-id', b'rev1a'): True,
+                       (b'a-file-id', b'rev1b'): True,
+                       (b'a-file-id', b'rev2'): False,
+                       (b'a-file-id', b'rev4'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'rev1a'): [NULL_REVISION],
-                ('a-file-id', 'rev1b'): [NULL_REVISION],
-                ('a-file-id', 'rev2'): [NULL_REVISION],
-                ('a-file-id', 'rev4'): [('a-file-id', 'rev2')]}
+        return {(b'a-file-id', b'rev1a'): [NULL_REVISION],
+                (b'a-file-id', b'rev1b'): [NULL_REVISION],
+                (b'a-file-id', b'rev2'): [NULL_REVISION],
+                (b'a-file-id', b'rev4'): [(b'a-file-id', b'rev2')]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'rev1a'): [NULL_REVISION],
-                ('TREE_ROOT', 'rev1b'): [NULL_REVISION],
-                ('TREE_ROOT', 'rev2'):
-                    [('TREE_ROOT', 'rev1a'), ('TREE_ROOT', 'rev1b')],
-                ('TREE_ROOT', 'rev3'): [('TREE_ROOT', 'rev2')],
-                ('TREE_ROOT', 'rev4'): [('TREE_ROOT', 'rev3')]}
+        return {(b'TREE_ROOT', b'rev1a'): [NULL_REVISION],
+                (b'TREE_ROOT', b'rev1b'): [NULL_REVISION],
+                (b'TREE_ROOT', b'rev2'):
+                    [(b'TREE_ROOT', b'rev1a'), (b'TREE_ROOT', b'rev1b')],
+                (b'TREE_ROOT', b'rev3'): [(b'TREE_ROOT', b'rev2')],
+                (b'TREE_ROOT', b'rev4'): [(b'TREE_ROOT', b'rev3')]}
 
 
 class TooManyParentsScenario(BrokenRepoScenario):
@@ -525,19 +526,19 @@
     """
 
     def all_versions_after_reconcile(self):
-        return ('bad-parent', 'good-parent', 'broken-revision')
+        return (b'bad-parent', b'good-parent', b'broken-revision')
 
     def populated_parents(self):
         return (
-            ((), 'bad-parent'),
-            (('bad-parent',), 'good-parent'),
-            (('good-parent', 'bad-parent'), 'broken-revision'))
+            ((), b'bad-parent'),
+            ((b'bad-parent',), b'good-parent'),
+            ((b'good-parent', b'bad-parent'), b'broken-revision'))
 
     def corrected_parents(self):
         return (
-            ((), 'bad-parent'),
-            (('bad-parent',), 'good-parent'),
-            (('good-parent',), 'broken-revision'))
+            ((), b'bad-parent'),
+            ((b'bad-parent',), b'good-parent'),
+            ((b'good-parent',), b'broken-revision'))
 
     def check_regexes(self, repo):
         if repo.supports_rich_root():
@@ -554,40 +555,40 @@
 
     def populate_repository(self, repo):
         inv = self.make_one_file_inventory(
-            repo, 'bad-parent', (), root_revision='bad-parent')
-        self.add_revision(repo, 'bad-parent', inv, ())
-
-        inv = self.make_one_file_inventory(
-            repo, 'good-parent', ('bad-parent',))
-        self.add_revision(repo, 'good-parent', inv, ('bad-parent',))
-
-        inv = self.make_one_file_inventory(
-            repo, 'broken-revision', ('good-parent', 'bad-parent'))
-        self.add_revision(repo, 'broken-revision', inv, ('good-parent',))
+            repo, b'bad-parent', (), root_revision=b'bad-parent')
+        self.add_revision(repo, b'bad-parent', inv, ())
+
+        inv = self.make_one_file_inventory(
+            repo, b'good-parent', (b'bad-parent',))
+        self.add_revision(repo, b'good-parent', inv, (b'bad-parent',))
+
+        inv = self.make_one_file_inventory(
+            repo, b'broken-revision', (b'good-parent', b'bad-parent'))
+        self.add_revision(repo, b'broken-revision', inv, (b'good-parent',))
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'bad-parent'): True,
-                           ('TREE_ROOT', 'broken-revision'): True,
-                           ('TREE_ROOT', 'good-parent'): True})
-        result.update({('a-file-id', 'bad-parent'): True,
-                       ('a-file-id', 'broken-revision'): True,
-                       ('a-file-id', 'good-parent'): True})
+            result.update({(b'TREE_ROOT', b'bad-parent'): True,
+                           (b'TREE_ROOT', b'broken-revision'): True,
+                           (b'TREE_ROOT', b'good-parent'): True})
+        result.update({(b'a-file-id', b'bad-parent'): True,
+                       (b'a-file-id', b'broken-revision'): True,
+                       (b'a-file-id', b'good-parent'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'bad-parent'): [NULL_REVISION],
-                ('a-file-id', 'broken-revision'):
-                    [('a-file-id', 'good-parent')],
-                ('a-file-id', 'good-parent'): [('a-file-id', 'bad-parent')]}
+        return {(b'a-file-id', b'bad-parent'): [NULL_REVISION],
+                (b'a-file-id', b'broken-revision'):
+                    [(b'a-file-id', b'good-parent')],
+                (b'a-file-id', b'good-parent'): [('a-file-id', 'bad-parent')]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'bad-parent'): [NULL_REVISION],
-                ('TREE_ROOT', 'broken-revision'):
-                    [('TREE_ROOT', 'good-parent')],
-                ('TREE_ROOT', 'good-parent'): [('TREE_ROOT', 'bad-parent')]}
+        return {(b'TREE_ROOT', b'bad-parent'): [NULL_REVISION],
+                (b'TREE_ROOT', b'broken-revision'):
+                    [(b'TREE_ROOT', 'good-parent')],
+                (b'TREE_ROOT', b'good-parent'): [(b'TREE_ROOT', b'bad-parent')]}
 
 
 class ClaimedFileParentDidNotModifyFileScenario(BrokenRepoScenario):
@@ -601,19 +602,19 @@
     """
 
     def all_versions_after_reconcile(self):
-        return ('basis', 'current')
+        return (b'basis', b'current')
 
     def populated_parents(self):
         return (
-            ((), 'basis'),
-            (('basis',), 'modified-something-else'),
-            (('modified-something-else',), 'current'))
+            ((), b'basis'),
+            ((b'basis',), b'modified-something-else'),
+            ((b'modified-something-else',), b'current'))
 
     def corrected_parents(self):
         return (
-            ((), 'basis'),
-            (None, 'modified-something-else'),
-            (('basis',), 'current'))
+            ((), b'basis'),
+            (None, b'modified-something-else'),
+            ((b'basis',), b'current'))
 
     def check_regexes(self, repo):
         if repo.supports_rich_root():
@@ -629,44 +630,44 @@
             )
 
     def populate_repository(self, repo):
-        inv = self.make_one_file_inventory(repo, 'basis', ())
-        self.add_revision(repo, 'basis', inv, ())
+        inv = self.make_one_file_inventory(repo, b'basis', ())
+        self.add_revision(repo, b'basis', inv, ())
 
         # 'modified-something-else' is a correctly recorded revision, but it
         # does not modify the file we are looking at, so the inventory for that
         # file in this revision points to 'basis'.
         inv = self.make_one_file_inventory(
-            repo, 'modified-something-else', ('basis',), inv_revision='basis')
-        self.add_revision(repo, 'modified-something-else', inv, ('basis',))
+            repo, b'modified-something-else', (b'basis',), inv_revision=b'basis')
+        self.add_revision(repo, b'modified-something-else', inv, (b'basis',))
 
         # The 'current' revision has 'modified-something-else' as its parent,
         # but the 'current' version of 'a-file' should have 'basis' as its
         # parent.
         inv = self.make_one_file_inventory(
-            repo, 'current', ('modified-something-else',))
-        self.add_revision(repo, 'current', inv, ('modified-something-else',))
+            repo, b'current', (b'modified-something-else',))
+        self.add_revision(repo, b'current', inv, (b'modified-something-else',))
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'basis'): True,
-                           ('TREE_ROOT', 'current'): True,
-                           ('TREE_ROOT', 'modified-something-else'): True})
-        result.update({('a-file-id', 'basis'): True,
-                       ('a-file-id', 'current'): True})
+            result.update({(b'TREE_ROOT', b'basis'): True,
+                           (b'TREE_ROOT', b'current'): True,
+                           (b'TREE_ROOT', b'modified-something-else'): True})
+        result.update({(b'a-file-id', b'basis'): True,
+                       (b'a-file-id', b'current'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'basis'): [NULL_REVISION],
-                ('a-file-id', 'current'): [('a-file-id', 'basis')]}
+        return {(b'a-file-id', b'basis'): [NULL_REVISION],
+                (b'a-file-id', b'current'): [(b'a-file-id', b'basis')]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'basis'): ['null:'],
-                ('TREE_ROOT', 'current'):
-                    [('TREE_ROOT', 'modified-something-else')],
-                ('TREE_ROOT', 'modified-something-else'):
-                    [('TREE_ROOT', 'basis')]}
+        return {(b'TREE_ROOT', b'basis'): [b'null:'],
+                (b'TREE_ROOT', b'current'):
+                    [(b'TREE_ROOT', b'modified-something-else')],
+                (b'TREE_ROOT', b'modified-something-else'):
+                    [(b'TREE_ROOT', b'basis')]}
 
 
 class IncorrectlyOrderedParentsScenario(BrokenRepoScenario):
@@ -682,22 +683,22 @@
     """
 
     def all_versions_after_reconcile(self):
-        return ['parent-1', 'parent-2', 'broken-revision-1-2',
-                'broken-revision-2-1']
+        return [b'parent-1', b'parent-2', b'broken-revision-1-2',
+                b'broken-revision-2-1']
 
     def populated_parents(self):
         return (
-            ((), 'parent-1'),
-            ((), 'parent-2'),
-            (('parent-2', 'parent-1'), 'broken-revision-1-2'),
-            (('parent-1', 'parent-2'), 'broken-revision-2-1'))
+            ((), b'parent-1'),
+            ((), b'parent-2'),
+            ((b'parent-2', b'parent-1'), b'broken-revision-1-2'),
+            ((b'parent-1', b'parent-2'), b'broken-revision-2-1'))
 
     def corrected_parents(self):
         return (
-            ((), 'parent-1'),
-            ((), 'parent-2'),
-            (('parent-1', 'parent-2'), 'broken-revision-1-2'),
-            (('parent-2', 'parent-1'), 'broken-revision-2-1'))
+            ((), b'parent-1'),
+            ((), b'parent-2'),
+            ((b'parent-1', b'parent-2'), b'broken-revision-1-2'),
+            ((b'parent-2', b'parent-1'), b'broken-revision-2-1'))
 
     def check_regexes(self, repo):
         if repo.supports_rich_root():
@@ -716,51 +717,51 @@
             r"\('parent-2', 'parent-1'\)")
 
     def populate_repository(self, repo):
-        inv = self.make_one_file_inventory(repo, 'parent-1', [])
-        self.add_revision(repo, 'parent-1', inv, [])
-
-        inv = self.make_one_file_inventory(repo, 'parent-2', [])
-        self.add_revision(repo, 'parent-2', inv, [])
-
-        inv = self.make_one_file_inventory(
-            repo, 'broken-revision-1-2', ['parent-2', 'parent-1'])
-        self.add_revision(
-            repo, 'broken-revision-1-2', inv, ['parent-1', 'parent-2'])
-
-        inv = self.make_one_file_inventory(
-            repo, 'broken-revision-2-1', ['parent-1', 'parent-2'])
-        self.add_revision(
-            repo, 'broken-revision-2-1', inv, ['parent-2', 'parent-1'])
+        inv = self.make_one_file_inventory(repo, b'parent-1', [])
+        self.add_revision(repo, b'parent-1', inv, [])
+
+        inv = self.make_one_file_inventory(repo, b'parent-2', [])
+        self.add_revision(repo, b'parent-2', inv, [])
+
+        inv = self.make_one_file_inventory(
+            repo, b'broken-revision-1-2', [b'parent-2', b'parent-1'])
+        self.add_revision(
+            repo, b'broken-revision-1-2', inv, [b'parent-1', b'parent-2'])
+
+        inv = self.make_one_file_inventory(
+            repo, b'broken-revision-2-1', [b'parent-1', b'parent-2'])
+        self.add_revision(
+            repo, b'broken-revision-2-1', inv, [b'parent-2', b'parent-1'])
         self.versioned_root = repo.supports_rich_root()
 
     def repository_text_key_references(self):
         result = {}
         if self.versioned_root:
-            result.update({('TREE_ROOT', 'broken-revision-1-2'): True,
-                           ('TREE_ROOT', 'broken-revision-2-1'): True,
-                           ('TREE_ROOT', 'parent-1'): True,
-                           ('TREE_ROOT', 'parent-2'): True})
-        result.update({('a-file-id', 'broken-revision-1-2'): True,
-                       ('a-file-id', 'broken-revision-2-1'): True,
-                       ('a-file-id', 'parent-1'): True,
-                       ('a-file-id', 'parent-2'): True})
+            result.update({(b'TREE_ROOT', b'broken-revision-1-2'): True,
+                           (b'TREE_ROOT', b'broken-revision-2-1'): True,
+                           (b'TREE_ROOT', b'parent-1'): True,
+                           (b'TREE_ROOT', b'parent-2'): True})
+        result.update({(b'a-file-id', b'broken-revision-1-2'): True,
+                       (b'a-file-id', b'broken-revision-2-1'): True,
+                       (b'a-file-id', b'parent-1'): True,
+                       (b'a-file-id', b'parent-2'): True})
         return result
 
     def repository_text_keys(self):
-        return {('a-file-id', 'broken-revision-1-2'):
-                    [('a-file-id', 'parent-1'), ('a-file-id', 'parent-2')],
-                ('a-file-id', 'broken-revision-2-1'):
-                    [('a-file-id', 'parent-2'), ('a-file-id', 'parent-1')],
-                ('a-file-id', 'parent-1'): [NULL_REVISION],
-                ('a-file-id', 'parent-2'): [NULL_REVISION]}
+        return {(b'a-file-id', b'broken-revision-1-2'):
+                    [(b'a-file-id', b'parent-1'), (b'a-file-id', b'parent-2')],
+                (b'a-file-id', b'broken-revision-2-1'):
+                    [(b'a-file-id', b'parent-2'), (b'a-file-id', b'parent-1')],
+                (b'a-file-id', b'parent-1'): [NULL_REVISION],
+                (b'a-file-id', b'parent-2'): [NULL_REVISION]}
 
     def versioned_repository_text_keys(self):
-        return {('TREE_ROOT', 'broken-revision-1-2'):
-                    [('TREE_ROOT', 'parent-1'), ('TREE_ROOT', 'parent-2')],
-                ('TREE_ROOT', 'broken-revision-2-1'):
-                    [('TREE_ROOT', 'parent-2'), ('TREE_ROOT', 'parent-1')],
-                ('TREE_ROOT', 'parent-1'): [NULL_REVISION],
-                ('TREE_ROOT', 'parent-2'): [NULL_REVISION]}
+        return {(b'TREE_ROOT', b'broken-revision-1-2'):
+                    [(b'TREE_ROOT', b'parent-1'), (b'TREE_ROOT', b'parent-2')],
+                (b'TREE_ROOT', b'broken-revision-2-1'):
+                    [(b'TREE_ROOT', b'parent-2'), (b'TREE_ROOT', b'parent-1')],
+                (b'TREE_ROOT', b'parent-1'): [NULL_REVISION],
+                (b'TREE_ROOT', b'parent-2'): [NULL_REVISION]}
 
 
 all_broken_scenario_classes = [
@@ -792,8 +793,7 @@
     def make_populated_repository(self, factory):
         """Create a new repository populated by the given factory."""
         repo = self.make_repository('broken-repo')
-        repo.lock_write()
-        try:
+        with repo.lock_write():
             repo.start_write_group()
             try:
                 factory(repo)
@@ -802,8 +802,6 @@
             except:
                 repo.abort_write_group()
                 raise
-        finally:
-            repo.unlock()
 
     def add_revision(self, repo, revision_id, inv, parent_ids):
         """Add a revision with a given inventory and parents to a repository.
@@ -847,15 +845,15 @@
         inv = Inventory(revision_id=revision)
         if root_revision is not None:
             inv.root.revision = root_revision
-        file_id = 'a-file-id'
-        entry = InventoryFile(file_id, 'a file name', 'TREE_ROOT')
+        file_id = b'a-file-id'
+        entry = InventoryFile(file_id, 'a file name', b'TREE_ROOT')
         if inv_revision is not None:
             entry.revision = inv_revision
         else:
             entry.revision = revision
         entry.text_size = 0
         if file_contents is None:
-            file_contents = '%sline\n' % entry.revision
+            file_contents = b'%sline\n' % entry.revision
         entry.text_sha1 = osutils.sha_string(file_contents)
         inv.add(entry)
         if make_file_version:
@@ -869,13 +867,13 @@
                     "Format does not support text parent reconciliation")
 
     def file_parents(self, repo, revision_id):
-        key = ('a-file-id', revision_id)
+        key = (b'a-file-id', revision_id)
         parent_map = repo.texts.get_parent_map([key])
         return tuple(parent[-1] for parent in parent_map[key])
 
     def assertFileVersionAbsent(self, repo, revision_id):
         self.assertEqual({},
-            repo.texts.get_parent_map([('a-file-id', revision_id)]))
+            repo.texts.get_parent_map([(b'a-file-id', revision_id)]))
 
     def assertParentsMatch(self, expected_parents_for_versions, repo,
                            when_description):
@@ -907,7 +905,7 @@
 
         :returns: A dict of `{version: hash}`.
         """
-        keys = [('a-file-id', version) for version in versions]
+        keys = [(b'a-file-id', version) for version in versions]
         return repo.texts.get_sha1s(keys)
 
     def test_reconcile_behaviour(self):
@@ -915,19 +913,15 @@
         and after.
         """
         repo, scenario = self.prepare_test_repository()
-        repo.lock_read()
-        try:
+        with repo.lock_read():
             self.assertParentsMatch(scenario.populated_parents(), repo,
-                'before')
+                b'before')
             vf_shas = self.shas_for_versions_of_file(
                 repo, scenario.all_versions_after_reconcile())
-        finally:
-            repo.unlock()
         result = repo.reconcile(thorough=True)
-        repo.lock_read()
-        try:
+        with repo.lock_read():
             self.assertParentsMatch(scenario.corrected_parents(), repo,
-                'after')
+                b'after')
             # The contents of the versions in the versionedfile should be the
             # same after the reconcile.
             self.assertEqual(
@@ -943,14 +937,12 @@
             # (we specify it this way because a store can use arbitrary
             # compression pointers in principle.
             for file_version in scenario.corrected_fulltexts():
-                key = ('a-file-id', file_version)
+                key = (b'a-file-id', file_version)
                 self.assertEqual({key:()}, repo.texts.get_parent_map([key]))
                 self.assertIsInstance(
                     repo.texts.get_record_stream([key], 'unordered',
                         True).next().get_bytes_as('fulltext'),
                     str)
-        finally:
-            repo.unlock()
 
     def test_check_behaviour(self):
         """Populate a repository and check it, and verify the output."""
 
=== modified file 'breezy/tests/per_repository_vf/test_fileid_involved.py'
--- breezy/tests/per_repository_vf/test_fileid_involved.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/per_repository_vf/test_fileid_involved.py	2018-06-21 23:03:57 +0000
@@ -96,32 +96,32 @@
             raise tests.TestNotApplicable('format does not support stacking')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('file', 'file-id', 'file', 'contents\n'))],
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('file', b'file-id', 'file', b'contents\n'))],
             revision_id=b'A-id')
-        builder.build_snapshot(['A-id'], [
-            ('modify', ('file', 'new-content\n'))],
+        builder.build_snapshot([b'A-id'], [
+            ('modify', ('file', b'new-content\n'))],
             revision_id=b'B-id')
-        builder.build_snapshot(['B-id'], [
-            ('modify', ('file', 'yet more content\n'))],
+        builder.build_snapshot([b'B-id'], [
+            ('modify', ('file', b'yet more content\n'))],
             revision_id=b'C-id')
         builder.finish_series()
         source_b = builder.get_branch()
         source_b.lock_read()
         self.addCleanup(source_b.unlock)
         base = self.make_branch('base')
-        base.pull(source_b, stop_revision='B-id')
+        base.pull(source_b, stop_revision=b'B-id')
         stacked = self.make_branch('stacked')
         stacked.set_stacked_on_url('../base')
-        stacked.pull(source_b, stop_revision='C-id')
+        stacked.pull(source_b, stop_revision=b'C-id')
 
         stacked.lock_read()
         self.addCleanup(stacked.unlock)
         repo = stacked.repository
-        keys = {'file-id': {'A-id'}}
+        keys = {'file-id': {b'A-id'}}
         if stacked.repository.supports_rich_root():
-            keys['root-id'] = {'A-id'}
-        self.assertEqual(keys, repo.fileids_altered_by_revision_ids(['A-id']))
+            keys['root-id'] = {b'A-id'}
+        self.assertEqual(keys, repo.fileids_altered_by_revision_ids([b'A-id']))
 
 
 class FileIdInvolvedBase(TestCaseWithRepository):
 
=== modified file 'breezy/tests/per_repository_vf/test_repository.py'
--- breezy/tests/per_repository_vf/test_repository.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/per_repository_vf/test_repository.py	2018-06-21 23:03:57 +0000
@@ -265,13 +265,12 @@
         """Test the basic behaviour of the text store."""
         tree = self.make_branch_and_tree('tree')
         repo = tree.branch.repository
-        file_id = "Foo:Bar"
+        file_id = b"Foo:Bar"
         file_key = (file_id,)
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             self.assertEqual(set(), set(repo.texts.keys()))
             tree.add(['foo'], [file_id], ['file'])
-            tree.put_file_bytes_non_atomic('foo', 'content\n', file_id=file_id)
+            tree.put_file_bytes_non_atomic('foo', b'content\n', file_id=file_id)
             try:
                 rev_key = (tree.commit("foo"),)
             except errors.IllegalPath:
@@ -290,20 +289,18 @@
             self.assertEqual(keys, set(repo.texts.keys()))
             self.assertEqual(parents,
                 repo.texts.get_parent_map(repo.texts.keys()))
-        finally:
-            tree.unlock()
         tree2 = self.make_branch_and_tree('tree2')
         tree2.pull(tree.branch)
-        tree2.put_file_bytes_non_atomic('foo', 'right\n', file_id='Foo:Bar')
+        tree2.put_file_bytes_non_atomic('foo', b'right\n', file_id=b'Foo:Bar')
         right_key = (tree2.commit('right'),)
         keys.add(file_key + right_key)
         parents[file_key + right_key] = (file_key + rev_key,)
-        tree.put_file_bytes_non_atomic('foo', 'left\n', file_id='Foo:Bar')
+        tree.put_file_bytes_non_atomic('foo', b'left\n', file_id=b'Foo:Bar')
         left_key = (tree.commit('left'),)
         keys.add(file_key + left_key)
         parents[file_key + left_key] = (file_key + rev_key,)
         tree.merge_from_branch(tree2.branch)
-        tree.put_file_bytes_non_atomic('foo', 'merged\n', file_id='Foo:Bar')
+        tree.put_file_bytes_non_atomic('foo', b'merged\n', file_id=b'Foo:Bar')
         try:
             tree.auto_resolve()
         except errors.UnsupportedOperation:
 
=== modified file 'breezy/tests/per_transport.py'
--- breezy/tests/per_transport.py	2018-04-01 18:29:09 +0000
+++ breezy/tests/per_transport.py	2018-06-21 23:03:57 +0000
@@ -174,9 +174,9 @@
         t = self.get_transport()
 
         files = ['a']
-        content = 'contents of a\n'
+        content = b'contents of a\n'
         self.build_tree(['a'], transport=t, line_endings='binary')
-        self.check_transport_contents('contents of a\n', t, 'a')
+        self.check_transport_contents(b'contents of a\n', t, 'a')
         f = t.get('a')
         self.assertEqual(content, f.read())
 
@@ -220,13 +220,13 @@
         t = self.get_transport()
 
         files = ['a', 'b', 'e', 'g']
-        contents = ['contents of a\n',
-                    'contents of b\n',
-                    'contents of e\n',
-                    'contents of g\n',
+        contents = [b'contents of a\n',
+                    b'contents of b\n',
+                    b'contents of e\n',
+                    b'contents of g\n',
                     ]
         self.build_tree(files, transport=t, line_endings='binary')
-        self.check_transport_contents('contents of a\n', t, 'a')
+        self.check_transport_contents(b'contents of a\n', t, 'a')
 
         for content, fname in zip(contents, files):
             self.assertEqual(content, t.get_bytes(fname))
@@ -272,11 +272,11 @@
 
         t.put_bytes('a', b'some text for a\n')
         self.assertTrue(t.has('a'))
-        self.check_transport_contents('some text for a\n', t, 'a')
+        self.check_transport_contents(b'some text for a\n', t, 'a')
 
         # The contents should be overwritten
         t.put_bytes('a', b'new text for a\n')
-        self.check_transport_contents('new text for a\n', t, 'a')
+        self.check_transport_contents(b'new text for a\n', t, 'a')
 
         self.assertRaises(NoSuchFile,
                           t.put_bytes, 'path/doesnt/exist/c', b'contents')
@@ -286,37 +286,37 @@
 
         if t.is_readonly():
             self.assertRaises(TransportNotPossible,
-                    t.put_bytes_non_atomic, 'a', 'some text for a\n')
+                    t.put_bytes_non_atomic, 'a', b'some text for a\n')
             return
 
         self.assertFalse(t.has('a'))
-        t.put_bytes_non_atomic('a', 'some text for a\n')
+        t.put_bytes_non_atomic('a', b'some text for a\n')
         self.assertTrue(t.has('a'))
-        self.check_transport_contents('some text for a\n', t, 'a')
+        self.check_transport_contents(b'some text for a\n', t, 'a')
         # Put also replaces contents
-        t.put_bytes_non_atomic('a', 'new\ncontents for\na\n')
-        self.check_transport_contents('new\ncontents for\na\n', t, 'a')
+        t.put_bytes_non_atomic('a', b'new\ncontents for\na\n')
+        self.check_transport_contents(b'new\ncontents for\na\n', t, 'a')
 
         # Make sure we can create another file
-        t.put_bytes_non_atomic('d', 'contents for\nd\n')
+        t.put_bytes_non_atomic('d', b'contents for\nd\n')
         # And overwrite 'a' with empty contents
-        t.put_bytes_non_atomic('a', '')
-        self.check_transport_contents('contents for\nd\n', t, 'd')
-        self.check_transport_contents('', t, 'a')
+        t.put_bytes_non_atomic('a', b'')
+        self.check_transport_contents(b'contents for\nd\n', t, 'd')
+        self.check_transport_contents(b'', t, 'a')
 
         self.assertRaises(NoSuchFile, t.put_bytes_non_atomic, 'no/such/path',
-                                       'contents\n')
+                                       b'contents\n')
         # Now test the create_parent flag
         self.assertRaises(NoSuchFile, t.put_bytes_non_atomic, 'dir/a',
-                                       'contents\n')
+                                       b'contents\n')
         self.assertFalse(t.has('dir/a'))
-        t.put_bytes_non_atomic('dir/a', 'contents for dir/a\n',
+        t.put_bytes_non_atomic('dir/a', b'contents for dir/a\n',
                                create_parent_dir=True)
-        self.check_transport_contents('contents for dir/a\n', t, 'dir/a')
+        self.check_transport_contents(b'contents for dir/a\n', t, 'dir/a')
 
         # But we still get NoSuchFile if we can't make the parent dir
         self.assertRaises(NoSuchFile, t.put_bytes_non_atomic, 'not/there/a',
-                                       'contents\n',
+                                       b'contents\n',
                                        create_parent_dir=True)
 
     def test_put_bytes_permissions(self):
@@ -350,29 +350,29 @@
         if not t._can_roundtrip_unix_modebits():
             # Can't roundtrip, so no need to run this test
             return
-        t.put_bytes_non_atomic('mode644', 'test text\n', mode=0o644)
+        t.put_bytes_non_atomic('mode644', b'test text\n', mode=0o644)
         self.assertTransportMode(t, 'mode644', 0o644)
-        t.put_bytes_non_atomic('mode666', 'test text\n', mode=0o666)
+        t.put_bytes_non_atomic('mode666', b'test text\n', mode=0o666)
         self.assertTransportMode(t, 'mode666', 0o666)
-        t.put_bytes_non_atomic('mode600', 'test text\n', mode=0o600)
+        t.put_bytes_non_atomic('mode600', b'test text\n', mode=0o600)
         self.assertTransportMode(t, 'mode600', 0o600)
-        t.put_bytes_non_atomic('mode400', 'test text\n', mode=0o400)
+        t.put_bytes_non_atomic('mode400', b'test text\n', mode=0o400)
         self.assertTransportMode(t, 'mode400', 0o400)
 
         # The default permissions should be based on the current umask
         umask = osutils.get_umask()
-        t.put_bytes_non_atomic('nomode', 'test text\n', mode=None)
+        t.put_bytes_non_atomic('nomode', b'test text\n', mode=None)
         self.assertTransportMode(t, 'nomode', 0o666 & ~umask)
 
         # We should also be able to set the mode for a parent directory
         # when it is created
-        t.put_bytes_non_atomic('dir700/mode664', 'test text\n', mode=0o664,
+        t.put_bytes_non_atomic('dir700/mode664', b'test text\n', mode=0o664,
                                dir_mode=0o700, create_parent_dir=True)
         self.assertTransportMode(t, 'dir700', 0o700)
-        t.put_bytes_non_atomic('dir770/mode664', 'test text\n', mode=0o664,
+        t.put_bytes_non_atomic('dir770/mode664', b'test text\n', mode=0o664,
                                dir_mode=0o770, create_parent_dir=True)
         self.assertTransportMode(t, 'dir770', 0o770)
-        t.put_bytes_non_atomic('dir777/mode664', 'test text\n', mode=0o664,
+        t.put_bytes_non_atomic('dir777/mode664', b'test text\n', mode=0o664,
                                dir_mode=0o777, create_parent_dir=True)
         self.assertTransportMode(t, 'dir777', 0o777)
 
@@ -388,11 +388,11 @@
         # put_file returns the length of the data written
         self.assertEqual(16, result)
         self.assertTrue(t.has('a'))
-        self.check_transport_contents('some text for a\n', t, 'a')
+        self.check_transport_contents(b'some text for a\n', t, 'a')
         # Put also replaces contents
         result = t.put_file('a', BytesIO(b'new\ncontents for\na\n'))
         self.assertEqual(19, result)
-        self.check_transport_contents('new\ncontents for\na\n', t, 'a')
+        self.check_transport_contents(b'new\ncontents for\na\n', t, 'a')
         self.assertRaises(NoSuchFile,
                           t.put_file, 'path/doesnt/exist/c',
                               BytesIO(b'contents'))
@@ -408,17 +408,17 @@
         self.assertFalse(t.has('a'))
         t.put_file_non_atomic('a', BytesIO(b'some text for a\n'))
         self.assertTrue(t.has('a'))
-        self.check_transport_contents('some text for a\n', t, 'a')
+        self.check_transport_contents(b'some text for a\n', t, 'a')
         # Put also replaces contents
         t.put_file_non_atomic('a', BytesIO(b'new\ncontents for\na\n'))
-        self.check_transport_contents('new\ncontents for\na\n', t, 'a')
+        self.check_transport_contents(b'new\ncontents for\na\n', t, 'a')
 
         # Make sure we can create another file
         t.put_file_non_atomic('d', BytesIO(b'contents for\nd\n'))
         # And overwrite 'a' with empty contents
         t.put_file_non_atomic('a', BytesIO(b''))
-        self.check_transport_contents('contents for\nd\n', t, 'd')
-        self.check_transport_contents('', t, 'a')
+        self.check_transport_contents(b'contents for\nd\n', t, 'd')
+        self.check_transport_contents(b'', t, 'a')
 
         self.assertRaises(NoSuchFile, t.put_file_non_atomic, 'no/such/path',
                                        BytesIO(b'contents\n'))
@@ -428,7 +428,7 @@
         self.assertFalse(t.has('dir/a'))
         t.put_file_non_atomic('dir/a', BytesIO(b'contents for dir/a\n'),
                               create_parent_dir=True)
-        self.check_transport_contents('contents for dir/a\n', t, 'dir/a')
+        self.check_transport_contents(b'contents for dir/a\n', t, 'dir/a')
 
         # But we still get NoSuchFile if we can't make the parent dir
         self.assertRaises(NoSuchFile, t.put_file_non_atomic, 'not/there/a',
@@ -535,8 +535,8 @@
         # Test get/put in sub-directories
         t.put_bytes('dir_a/a', b'contents of dir_a/a')
         t.put_file('dir_b/b', BytesIO(b'contents of dir_b/b'))
-        self.check_transport_contents('contents of dir_a/a', t, 'dir_a/a')
-        self.check_transport_contents('contents of dir_b/b', t, 'dir_b/b')
+        self.check_transport_contents(b'contents of dir_a/a', t, 'dir_a/a')
+        self.check_transport_contents(b'contents of dir_b/b', t, 'dir_b/b')
 
         # mkdir of a dir with an absent parent
         self.assertRaises(NoSuchFile, t.mkdir, 'missing/dir')
@@ -681,7 +681,7 @@
         # And we can create new files, too
         self.assertEqual(0,
             t.append_file('c', BytesIO(b'some text\nfor a missing file\n')))
-        self.check_transport_contents('some text\nfor a missing file\n',
+        self.check_transport_contents(b'some text\nfor a missing file\n',
                                       t, 'c')
 
     def test_append_bytes(self):
@@ -908,14 +908,14 @@
         self.assertTrue(t.has('b'))
         self.assertFalse(t.has('a'))
 
-        self.check_transport_contents('a first file\n', t, 'b')
+        self.check_transport_contents(b'a first file\n', t, 'b')
         self.assertEqual([False, True], [t.has(n) for n in ['a', 'b']])
 
         # Overwrite a file
         t.put_bytes('c', b'c this file\n')
         t.move('c', 'b')
         self.assertFalse(t.has('c'))
-        self.check_transport_contents('c this file\n', t, 'b')
+        self.check_transport_contents(b'c this file\n', t, 'b')
 
         # TODO: Try to write a test for atomicity
         # TODO: Test moving into a non-existent subdirectory
@@ -928,7 +928,7 @@
 
         t.put_bytes('a', b'a file\n')
         t.copy('a', 'b')
-        self.check_transport_contents('a file\n', t, 'b')
+        self.check_transport_contents(b'a file\n', t, 'b')
 
         self.assertRaises(NoSuchFile, t.copy, 'c', 'd')
         os.mkdir('c')
@@ -937,7 +937,7 @@
         #self.assertRaises(Something, t.copy, 'a', 'c')
         t.put_bytes('d', b'text in d\n')
         t.copy('d', 'b')
-        self.check_transport_contents('text in d\n', t, 'b')
+        self.check_transport_contents(b'text in d\n', t, 'b')
 
     def test_connection_error(self):
         """ConnectionError is raised when connection is impossible.
@@ -1472,13 +1472,13 @@
             return
         transport.put_bytes('foo', b'bar')
         transport3 = self.get_transport()
-        self.check_transport_contents('bar', transport3, 'foo')
+        self.check_transport_contents(b'bar', transport3, 'foo')
 
         # now opening at a relative url should give use a sane result:
         transport.mkdir('newdir')
         transport5 = self.get_transport('newdir')
         transport6 = transport5.clone('..')
-        self.check_transport_contents('bar', transport6, 'foo')
+        self.check_transport_contents(b'bar', transport6, 'foo')
 
     def test_lock_write(self):
         """Test transport-level write locks.
 
=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2018-03-24 15:27:01 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2018-06-21 23:03:57 +0000
@@ -17,6 +17,7 @@
 """Tests for the test trees used by the per_tree tests."""
 
 from breezy import errors
+from breezy.sixish import text_type
 from breezy.tests import per_tree
 from breezy.tests import (
     TestNotApplicable,
@@ -318,7 +319,7 @@
 
         for expected, (path, ie) in zip(path_and_ids, path_entries):
             self.assertEqual(expected[0], path) # Paths should match
-            self.assertIsInstance(path, unicode)
+            self.assertIsInstance(path, text_type)
             self.assertEqual(expected[1], ie.file_id)
             self.assertIsInstance(ie.file_id, str)
             self.assertEqual(expected[2], ie.parent_id)
@@ -387,7 +388,7 @@
         for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,
                                                             path_entries):
             self.assertEqual(epath, path) # Paths should match
-            self.assertIsInstance(path, unicode)
+            self.assertIsInstance(path, text_type)
             self.assertIsInstance(ie.file_id, bytes)
             if wt.supports_setting_file_ids():
                 self.assertEqual(efid, ie.file_id)
 
=== modified file 'breezy/tests/per_workingtree/test_put_file.py'
--- breezy/tests/per_workingtree/test_put_file.py	2017-11-12 20:44:54 +0000
+++ breezy/tests/per_workingtree/test_put_file.py	2018-06-21 23:03:57 +0000
@@ -25,13 +25,13 @@
     def test_put_new_file(self):
         t = self.make_branch_and_tree('t1')
         t.add(['foo'], kinds=['file'])
-        t.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', t.get_file('foo').read())
+        t.put_file_bytes_non_atomic('foo', b'barshoom')
+        self.assertEqual(b'barshoom', t.get_file('foo').read())
 
     def test_put_existing_file(self):
         t = self.make_branch_and_tree('t1')
         t.add(['foo'], kinds=['file'])
-        t.put_file_bytes_non_atomic('foo', 'first-content')
-        t.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', t.get_file('foo').read())
+        t.put_file_bytes_non_atomic('foo', b'first-content')
+        t.put_file_bytes_non_atomic('foo', b'barshoom')
+        self.assertEqual(b'barshoom', t.get_file('foo').read())
 
 
=== modified file 'breezy/tests/test_cache_utf8.py'
--- breezy/tests/test_cache_utf8.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_cache_utf8.py	2018-06-21 23:03:57 +0000
@@ -19,6 +19,7 @@
 from .. import (
     cache_utf8,
     )
+from ..sixish import text_type
 from . import TestCase
 
 
@@ -105,7 +106,7 @@
         # objects.
         uni_x = cache_utf8.decode(x)
         self.assertEqual(u'simple text', uni_x)
-        self.assertIsInstance(uni_x, unicode)
+        self.assertIsInstance(uni_x, text_type)
 
         utf8_x = cache_utf8.encode(uni_x)
         self.assertIs(utf8_x, x)
 
=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_config.py	2018-06-21 23:03:57 +0000
@@ -44,6 +44,7 @@
     )
 from ..sixish import (
     BytesIO,
+    text_type,
     )
 from ..transport import remote as transport_remote
 from . import (
@@ -522,7 +523,7 @@
         self.assertEqual(config.config_dir(), self.brz_home)
 
     def test_config_dir_is_unicode(self):
-        self.assertIsInstance(config.config_dir(), unicode)
+        self.assertIsInstance(config.config_dir(), text_type)
 
     def test_config_filename(self):
         self.assertEqual(config.config_filename(),
@@ -554,7 +555,7 @@
         self.assertEqual(config.config_dir(), self.bzr_home)
 
     def test_config_dir_is_unicode(self):
-        self.assertIsInstance(config.config_dir(), unicode)
+        self.assertIsInstance(config.config_dir(), text_type)
 
     def test_config_filename(self):
         self.assertEqual(config.config_filename(),
 
=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_conflicts.py	2018-06-21 23:03:57 +0000
@@ -24,6 +24,7 @@
     osutils,
     tests,
     )
+from ..sixish import text_type
 from . import (
     script,
     scenarios,
@@ -129,7 +130,7 @@
     scenarios = scenarios.multiply_scenarios(vary_by_conflicts())
 
     def test_stringification(self):
-        text = unicode(self.conflict)
+        text = text_type(self.conflict)
         self.assertContainsString(text, self.conflict.path)
         self.assertContainsString(text.lower(), "conflict")
         self.assertContainsString(repr(self.conflict),
@@ -140,14 +141,14 @@
         o = conflicts.Conflict.factory(**p.as_stanza().as_dict())
         self.assertEqual(o, p)
 
-        self.assertIsInstance(o.path, unicode)
+        self.assertIsInstance(o.path, text_type)
 
         if o.file_id is not None:
             self.assertIsInstance(o.file_id, str)
 
         conflict_path = getattr(o, 'conflict_path', None)
         if conflict_path is not None:
-            self.assertIsInstance(conflict_path, unicode)
+            self.assertIsInstance(conflict_path, text_type)
 
         conflict_file_id = getattr(o, 'conflict_file_id', None)
         if conflict_file_id is not None:
@@ -174,7 +175,7 @@
 
     def test_stringification(self):
         for text, o in zip(example_conflicts.to_strings(), example_conflicts):
-            self.assertEqual(text, unicode(o))
+            self.assertEqual(text, text_type(o))
 
 
 # FIXME: The shell-like tests should be converted to real whitebox tests... or
@@ -303,17 +304,17 @@
 
         # Create an empty trunk
         builder.build_snapshot(None, [
-                ('add', ('', 'root-id', 'directory', ''))],
+                ('add', (u'', b'root-id', 'directory', ''))],
                 revision_id=b'start')
         # Add a minimal base content
         base_actions = self._get_actions(self._base_actions)()
-        builder.build_snapshot(['start'], base_actions, revision_id=b'base')
+        builder.build_snapshot([b'start'], base_actions, revision_id=b'base')
         # Modify the base content in branch
         actions_other = self._get_actions(self._other['actions'])()
-        builder.build_snapshot(['base'], actions_other, revision_id=b'other')
+        builder.build_snapshot([b'base'], actions_other, revision_id=b'other')
         # Modify the base content in trunk
         actions_this = self._get_actions(self._this['actions'])()
-        builder.build_snapshot(['base'], actions_this, revision_id=b'this')
+        builder.build_snapshot([b'base'], actions_this, revision_id=b'this')
         # builder.get_branch() tip is now 'this'
 
         builder.finish_series()
 
=== modified file 'breezy/tests/test_dirstate.py'
--- breezy/tests/test_dirstate.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_dirstate.py	2018-06-21 23:03:57 +0000
@@ -1105,7 +1105,7 @@
         try:
             tree1.add('')
             tree1.add(['a file'], [b'file-id'], ['file'])
-            tree1.put_file_bytes_non_atomic('a file', 'file-content')
+            tree1.put_file_bytes_non_atomic('a file', b'file-content')
             revid1 = tree1.commit('foo')
         finally:
             tree1.unlock()
@@ -1113,7 +1113,7 @@
         tree2 = memorytree.MemoryTree.create_on_branch(branch2)
         tree2.lock_write()
         try:
-            tree2.put_file_bytes_non_atomic('a file', 'new file-content')
+            tree2.put_file_bytes_non_atomic('a file', b'new file-content')
             revid2 = tree2.commit('foo')
             root_id = tree2.get_root_id()
         finally:
 
=== modified file 'breezy/tests/test_fetch.py'
--- breezy/tests/test_fetch.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_fetch.py	2018-06-21 23:03:57 +0000
@@ -149,14 +149,14 @@
         Convert(tree.basedir, knit2_format)
         tree = WorkingTree.open(tree.basedir)
         branch = self.make_branch('branch', format=knit2_format)
-        branch.pull(tree.branch, stop_revision='rev1')
+        branch.pull(tree.branch, stop_revision=b'rev1')
         repo = branch.repository
         repo.lock_read()
         try:
             # Make sure fetch retrieved only what we requested
-            self.assertEqual({('tree-root', 'rev1'):()},
+            self.assertEqual({(b'tree-root', b'rev1'):()},
                 repo.texts.get_parent_map(
-                    [('tree-root', 'rev1'), ('tree-root', 'rev2')]))
+                    [(b'tree-root', b'rev1'), (b'tree-root', b'rev2')]))
         finally:
             repo.unlock()
         branch.pull(tree.branch)
@@ -165,8 +165,8 @@
         repo.lock_read()
         try:
             # Make sure fetch retrieved only what we requested
-            self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
-                repo.texts.get_parent_map([('tree-root', 'rev2')]))
+            self.assertEqual({(b'tree-root', b'rev2'):((b'tree-root', b'rev1'),)},
+                repo.texts.get_parent_map([(b'tree-root', b'rev2')]))
         finally:
             repo.unlock()
 
 
=== modified file 'breezy/tests/test_inv.py'
--- breezy/tests/test_inv.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_inv.py	2018-06-21 23:03:57 +0000
@@ -23,6 +23,7 @@
     tests,
     workingtree,
     )
+from ..sixish import text_type
 from ..bzr import (
     chk_map,
     groupcompress,
@@ -1228,7 +1229,7 @@
                          b'file-rev-id\nabcdefgh\n100\nY', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
+        self.assertIsInstance(ie2.name, text_type)
         self.assertEqual(('filename', b'file-id', b'file-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
@@ -1245,7 +1246,7 @@
                          b'file-rev-id\n123456\n25\nN', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
+        self.assertIsInstance(ie2.name, text_type)
         self.assertEqual((b'\xce\xa9name', b'file-id', b'file-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
@@ -1257,7 +1258,7 @@
         self.assertEqual(b'dir: dir-id\nparent-id\ndirname\ndir-rev-id', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
+        self.assertIsInstance(ie2.name, text_type)
         self.assertEqual(('dirname', b'dir-id', b'dir-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
@@ -1271,7 +1272,7 @@
                          b'dir-rev-id', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
+        self.assertIsInstance(ie2.name, text_type)
         self.assertIs(ie2.parent_id, None)
         self.assertEqual(('dir\xce\xa9name', b'dir-id', b'dir-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
@@ -1286,8 +1287,8 @@
                          'link-rev-id\ntarget/path', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
-        self.assertIsInstance(ie2.symlink_target, unicode)
+        self.assertIsInstance(ie2.name, text_type)
+        self.assertIsInstance(ie2.symlink_target, text_type)
         self.assertEqual(('linkname', 'link-id', 'link-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
@@ -1301,8 +1302,8 @@
                          'link-rev-id\ntarget/\xce\xa9path', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
-        self.assertIsInstance(ie2.symlink_target, unicode)
+        self.assertIsInstance(ie2.name, text_type)
+        self.assertIsInstance(ie2.symlink_target, text_type)
         self.assertEqual(('link\xce\xa9name', 'link-id', 'link-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
@@ -1317,7 +1318,7 @@
                          'tree-rev-id\nref-rev-id', bytes)
         ie2 = inv._bytes_to_entry(bytes)
         self.assertEqual(ie, ie2)
-        self.assertIsInstance(ie2.name, unicode)
+        self.assertIsInstance(ie2.name, text_type)
         self.assertEqual(('tree\xce\xa9name', 'tree-root-id', 'tree-rev-id'),
                          inv._bytes_to_utf8name_key(bytes))
 
 
=== modified file 'breezy/tests/test_mail_client.py'
--- breezy/tests/test_mail_client.py	2017-07-16 01:55:39 +0000
+++ breezy/tests/test_mail_client.py	2018-06-21 23:03:57 +0000
@@ -21,6 +21,8 @@
     urlutils,
     osutils,
     )
+from ..sixish import text_type
+
 
 class TestMutt(tests.TestCase):
 
@@ -43,7 +45,7 @@
             ['-s', 'Hi there!', '-a', 'file%', '--', '[e-mail]'],
             cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -73,7 +75,7 @@
             "subject='Hi there!',to='[e-mail]'",
             ], cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -110,7 +112,7 @@
         if eclient.elisp_tmp_file is not None:
             self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
         for item in commandline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -139,7 +141,7 @@
              '--attach', 'file%'],
             cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -163,7 +165,7 @@
             ],
             cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -186,7 +188,7 @@
             ['-s', 'Hi there!', '--attach', 'file%', '[e-mail]'],
             cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
 
@@ -219,7 +221,7 @@
              'file%'],
             cmdline)
         for item in cmdline:
-            self.assertFalse(isinstance(item, unicode),
+            self.assertFalse(isinstance(item, text_type),
                 'Command-line item %r is unicode!' % item)
 
     def test_with_from(self):
 
=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/test_memorytree.py	2018-06-21 23:03:57 +0000
@@ -110,8 +110,8 @@
         tree.lock_write()
         tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
                   kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', tree.get_file('foo').read())
+        tree.put_file_bytes_non_atomic('foo', b'barshoom')
+        self.assertEqual(b'barshoom', tree.get_file('foo').read())
         tree.unlock()
 
     def test_put_existing_file(self):
@@ -120,9 +120,9 @@
         tree.lock_write()
         tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
                  kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'first-content')
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
-        self.assertEqual('barshoom', tree.get_file('foo').read())
+        tree.put_file_bytes_non_atomic('foo', b'first-content')
+        tree.put_file_bytes_non_atomic('foo', b'barshoom')
+        self.assertEqual(b'barshoom', tree.get_file('foo').read())
         tree.unlock()
 
     def test_add_in_subdir(self):
@@ -135,11 +135,11 @@
         # that *always* adds the directory as well. So if you want to create a
         # file in a subdirectory, you have to split out the 'mkdir()' calls
         # from the add and put_file_bytes_non_atomic calls. :(
-        tree.mkdir('adir', 'dir-id')
+        tree.mkdir('adir', b'dir-id')
         tree.add(['adir/afile'], [b'file-id'], ['file'])
         self.assertEqual('adir/afile', tree.id2path(b'file-id'))
         self.assertEqual('adir', tree.id2path(b'dir-id'))
-        tree.put_file_bytes_non_atomic('adir/afile', 'barshoom')
+        tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
 
     def test_commit_trivial(self):
         """Smoke test for commit on a MemoryTree.
@@ -152,7 +152,7 @@
         tree.lock_write()
         tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
                  kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'barshoom')
+        tree.put_file_bytes_non_atomic('foo', b'barshoom')
         revision_id = tree.commit('message baby')
         # the parents list for the tree should have changed.
         self.assertEqual([revision_id], tree.get_parent_ids())
@@ -161,7 +161,8 @@
         revtree = tree.branch.repository.revision_tree(revision_id)
         revtree.lock_read()
         self.addCleanup(revtree.unlock)
-        self.assertEqual('barshoom', revtree.get_file('foo').read())
+        with revtree.get_file('foo') as f:
+            self.assertEqual(b'barshoom', f.read())
 
     def test_unversion(self):
         """Some test for unversion of a memory tree."""
@@ -189,7 +190,7 @@
         tree.lock_write()
         self.addCleanup(tree.unlock)
         tree.add(['', 'foo'], [b'root-id', b'foo-id'], ['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', 'content\n')
+        tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
         tree.rename_one('foo', 'bar')
         self.assertEqual('bar', tree.id2path(b'foo-id'))
@@ -197,13 +198,13 @@
         self.assertRaises(errors.NoSuchFile,
                           tree._file_transport.get_bytes, 'foo')
         tree.commit('two', rev_id=b'rev-two')
-        self.assertEqual('content\n', tree._file_transport.get_bytes('bar'))
+        self.assertEqual(b'content\n', tree._file_transport.get_bytes('bar'))
         self.assertRaises(errors.NoSuchFile,
                           tree._file_transport.get_bytes, 'foo')
 
         rev_tree2 = tree.branch.repository.revision_tree(b'rev-two')
         self.assertEqual('bar', rev_tree2.id2path(b'foo-id'))
-        self.assertEqual('content\n', rev_tree2.get_file_text('bar'))
+        self.assertEqual(b'content\n', rev_tree2.get_file_text('bar'))
 
     def test_rename_file_to_subdir(self):
         tree = self.make_branch_and_memory_tree('branch')
@@ -212,7 +213,7 @@
         tree.add('')
         tree.mkdir('subdir', b'subdir-id')
         tree.add('foo', b'foo-id', 'file')
-        tree.put_file_bytes_non_atomic('foo', 'content\n')
+        tree.put_file_bytes_non_atomic('foo', b'content\n')
         tree.commit('one', rev_id=b'rev-one')
 
         tree.rename_one('foo', 'subdir/bar')
 
=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/test_osutils.py	2018-06-21 23:03:57 +0000
@@ -38,6 +38,7 @@
     )
 from ..sixish import (
     BytesIO,
+    text_type,
     )
 from . import (
     features,
@@ -405,7 +406,7 @@
         self.assertRaises(osutils.UnsupportedTimezoneFormat,
             osutils.format_date, 0, timezone='foo')
         self.assertIsInstance(osutils.format_date(0), str)
-        self.assertIsInstance(osutils.format_local_date(0), unicode)
+        self.assertIsInstance(osutils.format_local_date(0), text_type)
         # Testing for the actual value of the local weekday without
         # duplicating the code from format_date is difficult.
         # Instead blackbox.test_locale should check for localized
@@ -1397,11 +1398,11 @@
         # all abspaths are Unicode, and encode them back into utf8.
         for dirdetail, dirblock in osutils._walkdirs_utf8('.'):
             self.assertIsInstance(dirdetail[0], str)
-            if isinstance(dirdetail[1], unicode):
+            if isinstance(dirdetail[1], text_type):
                 dirdetail = (dirdetail[0], dirdetail[1].encode('utf8'))
                 dirblock = [list(info) for info in dirblock]
                 for info in dirblock:
-                    self.assertIsInstance(info[4], unicode)
+                    self.assertIsInstance(info[4], text_type)
                     info[4] = info[4].encode('utf8')
             new_dirblock = []
             for info in dirblock:
@@ -2137,13 +2138,13 @@
     def test_is_unicode(self):
         self.overrideEnv('BRZ_TEST_PATH', './anywhere at all/')
         path = osutils.path_from_environ('BRZ_TEST_PATH')
-        self.assertIsInstance(path, unicode)
+        self.assertIsInstance(path, text_type)
         self.assertEqual(u'./anywhere at all/', path)
 
     def test_posix_path_env_ascii(self):
         self.overrideEnv('BRZ_TEST_PATH', '/tmp')
         home = osutils._posix_path_from_environ('BRZ_TEST_PATH')
-        self.assertIsInstance(home, unicode)
+        self.assertIsInstance(home, text_type)
         self.assertEqual(u'/tmp', home)
 
     def test_posix_path_env_unicode(self):
@@ -2164,17 +2165,17 @@
 
     def test_is_unicode(self):
         home = osutils._get_home_dir()
-        self.assertIsInstance(home, unicode)
+        self.assertIsInstance(home, text_type)
 
     def test_posix_homeless(self):
         self.overrideEnv('HOME', None)
         home = osutils._get_home_dir()
-        self.assertIsInstance(home, unicode)
+        self.assertIsInstance(home, text_type)
 
     def test_posix_home_ascii(self):
         self.overrideEnv('HOME', '/home/test')
         home = osutils._posix_get_home_dir()
-        self.assertIsInstance(home, unicode)
+        self.assertIsInstance(home, text_type)
         self.assertEqual(u'/home/test', home)
 
     def test_posix_home_unicode(self):
@@ -2193,7 +2194,7 @@
 
     def test_is_unicode(self):
         user = osutils.getuser_unicode()
-        self.assertIsInstance(user, unicode)
+        self.assertIsInstance(user, text_type)
 
     def envvar_to_override(self):
         if sys.platform == "win32":
 
=== modified file 'breezy/tests/test_read_bundle.py'
--- breezy/tests/test_read_bundle.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/test_read_bundle.py	2018-06-21 23:03:57 +0000
@@ -22,6 +22,7 @@
 from .. import errors
 from ..sixish import (
     BytesIO,
+    text_type,
     )
 from .. import tests
 from .test_transport import TestTransportImplementation
@@ -88,7 +89,7 @@
 
     def test_read_mergeable_from_url(self):
         info = self.read_mergeable_from_url(
-            unicode(self.get_url(self.bundle_name)))
+            text_type(self.get_url(self.bundle_name)))
         revision = info.real_revisions[-1]
         self.assertEqual('commit-1', revision.revision_id)
 
@@ -107,6 +108,6 @@
             # transports (the test will fail even).
             raise tests.TestSkipped(
                 'Need a ConnectedTransport to test transport reuse')
-        url = unicode(self.get_url(self.bundle_name))
+        url = text_type(self.get_url(self.bundle_name))
         info = self.read_mergeable_from_url(url)
         self.assertEqual(1, len(self.possible_transports))
 
=== modified file 'breezy/tests/test_repository.py'
--- breezy/tests/test_repository.py	2018-05-22 02:05:12 +0000
+++ breezy/tests/test_repository.py	2018-06-21 23:03:57 +0000
@@ -242,8 +242,9 @@
         # empty revision-store directory
         # empty weaves directory
         t = control.get_repository_transport(None)
-        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
-                             t.get('format').read())
+        with t.get('format') as f:
+            self.assertEqualDiff(b'Bazaar-NG Knit Repository Format 1',
+                                 f.read())
         # XXX: no locks left when unlocked at the moment
         # self.assertEqualDiff('', t.get('lock').read())
         self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
@@ -251,8 +252,8 @@
         # Check per-file knits.
         branch = control.create_branch()
         tree = control.create_workingtree()
-        tree.add(['foo'], ['Nasty-IdC:'], ['file'])
-        tree.put_file_bytes_non_atomic('foo', '')
+        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, 'knits/e8/%254easty-%2549d%2543%253a',
             '\nfoo fulltext 0 81  :')
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2018-06-14 12:13:00 +0000
+++ breezy/tests/test_transform.py	2018-06-21 23:03:57 +0000
@@ -61,6 +61,7 @@
 from ..mutabletree import MutableTree
 from ..sixish import (
     BytesIO,
+    text_type,
     )
 from . import (
     features,
@@ -877,7 +878,7 @@
         raw_conflicts = resolve_conflicts(tt)
         cooked_conflicts = cook_conflicts(raw_conflicts, tt)
         tt.finalize()
-        conflicts_s = [unicode(c) for c in cooked_conflicts]
+        conflicts_s = [text_type(c) for c in cooked_conflicts]
         self.assertEqual(len(cooked_conflicts), len(conflicts_s))
         self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
                                          'Moved existing file to '
 
=== modified file 'breezy/tests/test_urlutils.py'
--- breezy/tests/test_urlutils.py	2018-05-27 18:00:21 +0000
+++ breezy/tests/test_urlutils.py	2018-06-21 23:03:57 +0000
@@ -23,6 +23,7 @@
 from ..errors import (
     PathNotChild,
     )
+from ..sixish import text_type
 from . import features, TestCaseInTempDir, TestCase, TestSkipped
 
 
@@ -411,7 +412,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, unicode))
+        self.assertFalse(isinstance(result, text_type))
 
     def test_win32_unc_path_to_url(self):
         self.requireFeature(features.win32_feature)
@@ -427,7 +428,7 @@
             raise TestSkipped("local encoding cannot handle unicode")
 
         self.assertEqual('file://HOST/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
-        self.assertFalse(isinstance(result, unicode))
+        self.assertFalse(isinstance(result, text_type))
 
     def test_win32_local_path_from_url(self):
         from_url = urlutils._win32_local_path_from_url
@@ -610,7 +611,7 @@
         # Test that URLs are converted to nice unicode strings for display
         def test(expected, url, encoding='utf-8'):
             disp_url = urlutils.unescape_for_display(url, encoding=encoding)
-            self.assertIsInstance(disp_url, unicode)
+            self.assertIsInstance(disp_url, text_type)
             self.assertEqual(expected, disp_url)
 
         test('http://foo', 'http://foo')
@@ -650,7 +651,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'), unicode))
+        self.assertFalse(isinstance(urlutils.escape(u'\xe5'), text_type))
 
     def test_escape_tildes(self):
         self.assertEqual('~foo', urlutils.escape('~foo'))
 
=== modified file 'breezy/tests/test_workingtree_4.py'
--- breezy/tests/test_workingtree_4.py	2018-06-14 12:13:00 +0000
+++ breezy/tests/test_workingtree_4.py	2018-06-21 23:03:57 +0000
@@ -281,17 +281,17 @@
         builder.start_series()
         self.addCleanup(builder.finish_series)
         builder.build_snapshot([], [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('a', 'a-id', 'file', 'content\n'))],
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('a', b'a-id', 'file', b'content\n'))],
             revision_id=b'A')
-        builder.build_snapshot(['A'], [
-            ('modify', ('a', 'new content\nfor a\n')),
-            ('add', ('b', 'b-id', 'file', 'b-content\n'))],
+        builder.build_snapshot([b'A'], [
+            ('modify', ('a', b'new content\nfor a\n')),
+            ('add', ('b', b'b-id', 'file', b'b-content\n'))],
             revision_id=b'B')
         tree = self.make_workingtree('tree')
         source_branch = builder.get_branch()
-        tree.branch.repository.fetch(source_branch.repository, 'B')
-        tree.pull(source_branch, stop_revision='A')
+        tree.branch.repository.fetch(source_branch.repository, b'B')
+        tree.pull(source_branch, stop_revision=b'A')
         tree.lock_write()
         self.addCleanup(tree.unlock)
         state = tree.current_dirstate()
@@ -302,37 +302,37 @@
             return orig_update(delta, new_revid)
         state.update_basis_by_delta = log_update_basis_by_delta
         basis = tree.basis_tree()
-        self.assertEqual('a-id', basis.path2id('a'))
+        self.assertEqual(b'a-id', basis.path2id('a'))
         self.assertFalse(basis.is_versioned('b'))
         def fail_set_parent_trees(trees, ghosts):
             raise AssertionError('dirstate.set_parent_trees() was called')
         state.set_parent_trees = fail_set_parent_trees
         repo = tree.branch.repository
-        tree.pull(source_branch, stop_revision='B')
-        self.assertEqual(['B'], called)
+        tree.pull(source_branch, stop_revision=b'B')
+        self.assertEqual([b'B'], called)
         basis = tree.basis_tree()
-        self.assertEqual('a-id', basis.path2id('a'))
-        self.assertEqual('b-id', basis.path2id('b'))
+        self.assertEqual(b'a-id', basis.path2id('a'))
+        self.assertEqual(b'b-id', basis.path2id('b'))
 
     def test_set_parent_trees_handles_missing_basis(self):
         builder = self.make_branch_builder('source')
         builder.start_series()
         self.addCleanup(builder.finish_series)
         builder.build_snapshot([], [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('a', 'a-id', 'file', 'content\n'))],
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('a', b'a-id', 'file', b'content\n'))],
             revision_id=b'A')
-        builder.build_snapshot(['A'], [
-            ('modify', ('a', 'new content\nfor a\n')),
-            ('add', ('b', 'b-id', 'file', 'b-content\n'))],
+        builder.build_snapshot([b'A'], [
+            ('modify', ('a', b'new content\nfor a\n')),
+            ('add', ('b', b'b-id', 'file', b'b-content\n'))],
             revision_id=b'B')
-        builder.build_snapshot(['A'], [
-            ('add', ('c', 'c-id', 'file', 'c-content\n'))],
+        builder.build_snapshot([b'A'], [
+            ('add', ('c', b'c-id', 'file', b'c-content\n'))],
             revision_id=b'C')
         b_c = self.make_branch('branch_with_c')
-        b_c.pull(builder.get_branch(), stop_revision='C')
+        b_c.pull(builder.get_branch(), stop_revision=b'C')
         b_b = self.make_branch('branch_with_b')
-        b_b.pull(builder.get_branch(), stop_revision='B')
+        b_b.pull(builder.get_branch(), stop_revision=b'B')
         # This is reproducing some of what 'switch' does, just to isolate the
         # set_parent_trees() step.
         wt = b_b.create_checkout('tree', lightweight=True)
@@ -340,7 +340,7 @@
         fmt.set_reference(wt.controldir, None, b_c)
         # Re-open with the new reference
         wt = wt.controldir.open_workingtree()
-        wt.set_parent_trees([('C', b_c.repository.revision_tree(b'C'))])
+        wt.set_parent_trees([(b'C', b_c.repository.revision_tree(b'C'))])
         self.assertFalse(wt.basis_tree().is_versioned('b'))
 
     def test_new_dirstate_on_new_lock(self):
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-06-12 23:20:41 +0000
+++ breezy/transform.py	2018-06-21 23:03:57 +0000
@@ -66,6 +66,7 @@
     )
 from .progress import ProgressPhase
 from .sixish import (
+    text_type,
     viewitems,
     viewvalues,
     )
@@ -2122,7 +2123,7 @@
             if file_id is None:
                 continue
             if (specific_files is not None and
-                unicode(self._final_paths.get_path(trans_id)) not in specific_files):
+                self._final_paths.get_path(trans_id) not in specific_files):
                 continue
             kind = self._transform.final_kind(trans_id)
             if kind is None:
@@ -2167,7 +2168,7 @@
         ordered_ids = self._list_files_by_dir()
         for entry, trans_id in self._make_inv_entries(ordered_ids,
             specific_files):
-            yield unicode(self._final_paths.get_path(trans_id)), entry
+            yield self._final_paths.get_path(trans_id), entry
 
     def _iter_entries_for_dir(self, dir_path):
         """Return path, entry for items in a directory without recursing down."""
@@ -2177,7 +2178,7 @@
         for child_trans_id in self._all_children(dir_trans_id):
             ordered_ids.append((child_trans_id, dir_id))
         for entry, trans_id in self._make_inv_entries(ordered_ids):
-            yield unicode(self._final_paths.get_path(trans_id)), entry
+            yield self._final_paths.get_path(trans_id), entry
 
     def list_files(self, include_root=False, from_dir=None, recursive=True):
         """See WorkingTree.list_files."""
@@ -2622,7 +2623,7 @@
             precomputed_delta = None
         conflicts = cook_conflicts(raw_conflicts, tt)
         for conflict in conflicts:
-            trace.warning(unicode(conflict))
+            trace.warning(text_type(conflict))
         try:
             wt.add_conflicts(conflicts)
         except errors.UnsupportedOperation:
@@ -2814,7 +2815,7 @@
                     unversioned_filter=working_tree.is_ignored)
                 delta.report_changes(tt.iter_changes(), change_reporter)
             for conflict in conflicts:
-                trace.warning(unicode(conflict))
+                trace.warning(text_type(conflict))
             pp.next_phase()
             tt.apply()
             if working_tree.supports_merge_modified():
 
=== modified file 'breezy/transport/gio_transport.py'
--- breezy/transport/gio_transport.py	2017-09-26 00:55:04 +0000
+++ breezy/transport/gio_transport.py	2018-06-21 23:03:57 +0000
@@ -51,6 +51,7 @@
     )
 from ..sixish import (
     BytesIO,
+    text_type,
     )
 from ..trace import mutter
 from . import (
@@ -153,7 +154,7 @@
 
     def _relpath_to_url(self, relpath):
         full_url = urlutils.join(self.url, relpath)
-        if isinstance(full_url, unicode):
+        if isinstance(full_url, text_type):
             raise urlutils.InvalidURL(full_url)
         return full_url
 
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-06-21 22:57:44 +0000
+++ breezy/tree.py	2018-06-21 23:03:57 +0000
@@ -44,6 +44,7 @@
     )
 from .inter import InterObject
 from .sixish import (
+    text_type,
     viewvalues,
     )
 
@@ -1163,10 +1164,10 @@
         # This is stolen from _dirstate_helpers_py.py, only switching it to
         # Unicode objects. Consider using encode_utf8() and then using the
         # optimized versions, or maybe writing optimized unicode versions.
-        if not isinstance(path1, unicode):
+        if not isinstance(path1, text_type):
             raise TypeError("'path1' must be a unicode string, not %s: %r"
                             % (type(path1), path1))
-        if not isinstance(path2, unicode):
+        if not isinstance(path2, text_type):
             raise TypeError("'path2' must be a unicode string, not %s: %r"
                             % (type(path2), path2))
         return cmp(MultiWalker._path_to_key(path1),
 
=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2018-06-21 19:00:42 +0000
+++ breezy/urlutils.py	2018-06-21 23:03:57 +0000
@@ -881,7 +881,7 @@
         # pad.lv/1696545: For the moment, accept both native strings and unicode.
         if isinstance(url, str):
             pass
-        elif isinstance(url, unicode):
+        elif isinstance(url, text_type):
             try:
                 url = url.encode()
             except UnicodeEncodeError:
 
=== modified file 'breezy/utextwrap.py'
--- breezy/utextwrap.py	2017-05-22 00:56:52 +0000
+++ breezy/utextwrap.py	2018-06-21 23:03:57 +0000
@@ -30,6 +30,7 @@
 from unicodedata import east_asian_width as _eawidth
 
 from . import osutils
+from .sixish import text_type
 
 __all__ = ["UTextWrapper", "fill", "wrap"]
 
@@ -216,7 +217,7 @@
         return lines
 
     def _split(self, text):
-        chunks = textwrap.TextWrapper._split(self, unicode(text))
+        chunks = textwrap.TextWrapper._split(self, text)
         cjk_split_chunks = []
         for chunk in chunks:
             prev_pos = 0
@@ -232,7 +233,7 @@
 
     def wrap(self, text):
         # ensure text is unicode
-        return textwrap.TextWrapper.wrap(self, unicode(text))
+        return textwrap.TextWrapper.wrap(self, text_type(text))
 
 # -- Convenience interface ---------------------------------------------
 
 
=== modified file 'breezy/version.py'
--- breezy/version.py	2018-05-19 12:57:00 +0000
+++ breezy/version.py	2018-06-21 23:03:57 +0000
@@ -30,6 +30,7 @@
     osutils,
     trace,
     )
+from .sixish import text_type
 
 
 def show_version(show_config=True, show_copyright=True, to_file=None):
@@ -80,7 +81,7 @@
         to_file.write(breezy.__path__[0] + '\n')
     if show_config:
         config_dir = osutils.normpath(config.config_dir())  # use native slashes
-        if not isinstance(config_dir, unicode):
+        if not isinstance(config_dir, text_type):
             config_dir = config_dir.decode(osutils.get_user_encoding())
         to_file.write("  Breezy configuration: %s\n" % (config_dir,))
         to_file.write("  Breezy log file: ")
 
=== modified file 'breezy/win32utils.py'
--- breezy/win32utils.py	2017-11-12 13:53:51 +0000
+++ breezy/win32utils.py	2018-06-21 23:03:57 +0000
@@ -271,7 +271,7 @@
     if windir:
         return os.path.splitdrive(windir)[0] + '/'
     # otherwise C:\ is good enough for 98% users
-    return unicode('C:/')
+    return u'C:/'
 
 
 def get_user_name():
 
=== modified file 'python3.passing'
--- python3.passing	2018-06-15 13:10:28 +0000
+++ python3.passing	2018-06-21 23:03:57 +0000
@@ -142,6 +142,7 @@
 breezy.tests.commands.test_init_repository.TestInitRepository.test_init_repository
 breezy.tests.commands.test_init.TestInit.test_init
 breezy.tests.commands.test_merge.TestMerge.test_merge
+breezy.tests.commands.test_missing.TestMissing.test_missing
 breezy.tests.commands.test_pull.TestPull.test_pull
 breezy.tests.commands.test_pull.TestPull.test_pull_with_bound_branch
 breezy.tests.commands.test_push.TestPush.test_push
@@ -280,6 +281,7 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_nickname(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_nickname(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_parent(BzrBranchFormat5)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_parent(BzrBranchFormat6)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_parent(BzrBranchFormat7)
 breezy.tests.per_branch.test_branch.TestBranch.test_clone_branch_parent(BzrBranchFormat8)
@@ -346,6 +348,10 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_open_branch_uses_repository(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BranchReferenceFormat)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BzrBranchFormat6)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_create_tree_with_merge(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_fetch_revisions(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_fetch_revisions(BzrBranchFormat5)
@@ -437,6 +443,10 @@
 breezy.tests.per_branch.test_branch.TestBranch.test_record_initial_ghost(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BranchReferenceFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BzrBranchFormat4)
+breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BzrBranchFormat5)
+breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BzrBranchFormat6)
+breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BzrBranchFormat7)
+breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(BzrBranchFormat8)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(LocalGitBranchFormat)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_branch.TestBranch.test_record_two_ghosts(RemoteGitBranchFormat)
@@ -778,6 +788,10 @@
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_branch_report_results(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BranchReferenceFormat)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BzrBranchFormat5)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BzrBranchFormat6)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BzrBranchFormat7)
+breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(BzrBranchFormat8)
 breezy.tests.per_branch.test_check.TestBranchCheck.test_check_detects_invalid_revhistory(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_check.TestBranchCheck.test__get_check_refs(BranchReferenceFormat)
 breezy.tests.per_branch.test_check.TestBranchCheck.test__get_check_refs(BzrBranchFormat5)
@@ -1091,17 +1105,37 @@
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_nonempty_history(LocalGitBranchFormat)
 breezy.tests.per_branch.test_hooks.TestPreChangeBranchTip.test_nonempty_history(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BzrBranchFormat4)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BzrBranchFormat5)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BzrBranchFormat6)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BzrBranchFormat7)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(BzrBranchFormat8)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_clone_invalid_parent(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BranchReferenceFormat)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BzrBranchFormat4)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BzrBranchFormat5)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BzrBranchFormat6)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BzrBranchFormat7)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(BzrBranchFormat8)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_get_parent_invalid(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BzrBranchFormat4)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BzrBranchFormat5)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BzrBranchFormat6)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BzrBranchFormat7)
+breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(BzrBranchFormat8)
 breezy.tests.per_branch.test_http.InaccessibleParentTests.test_sprout_invalid_parent(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_exclude_ancestry(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_starting_at_embedded_merge(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_with_different_depths_merge(BranchReferenceFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsBushyGraph.test_merge_sorted_with_different_depths_merge(RemoteGitBranchFormat)
@@ -1117,35 +1151,91 @@
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(BranchReferenceFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_exclude(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_include(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_can_show_non_parents(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_forward(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges_ignore_non_parents(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_stop_with_merges(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_exclude(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_include(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(BranchReferenceFormat)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(BzrBranchFormat5)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(BzrBranchFormat6)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(BzrBranchFormat7)
+breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(BzrBranchFormat8)
 breezy.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_single_stop_with_merges(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BranchReferenceFormat)
 breezy.tests.per_branch.test_last_revision_info.TestLastRevisionInfo.test_empty_branch(BzrBranchFormat4)
@@ -1654,6 +1744,10 @@
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(BzrBranchFormat8)
 breezy.tests.per_branch.test_reconcile.TestBranchReconcile.test_reconcile_supports_thorough(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BranchReferenceFormat)
+breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BzrBranchFormat5)
+breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BzrBranchFormat6)
+breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BzrBranchFormat7)
+breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(BzrBranchFormat8)
 breezy.tests.per_branch.test_revision_id_to_dotted_revno.TestRevisionIdToDottedRevno.test_lookup_dotted_revno(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_empty(BranchReferenceFormat)
 breezy.tests.per_branch.test_revision_id_to_revno.TestRevisionIdToRevno.test_empty(RemoteBranchFormat-default)
@@ -1676,6 +1770,8 @@
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_nickname(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_nickname(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BzrBranchFormat4)
+breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BzrBranchFormat5)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BzrBranchFormat6)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BzrBranchFormat7)
 breezy.tests.per_branch.test_sprout.TestSprout.test_sprout_branch_parent(BzrBranchFormat8)
@@ -2464,10 +2560,12 @@
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterSameDataRepository,RepositoryFormatKnit3,RepositoryFormatKnit3)
 breezy.tests.per_intertree.test_compare.TestCompare.test_abc_content_to_empty(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_abc_content_to_empty(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_abc_content_to_empty(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestCompare.test_compare_empty_trees(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterTree(CHKInventory))
@@ -2475,18 +2573,23 @@
 breezy.tests.per_intertree.test_compare.TestCompare.test_default_ignores_unversioned_files(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_default_ignores_unversioned_files(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_default_ignores_unversioned_files(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestCompare.test_default_ignores_unversioned_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_and_c_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_b_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_c_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_extra_trees_finds_ids(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename_and_meta_modification(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename_and_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename_and_meta_modification(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_meta_modification(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_meta_modification(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterTree)
@@ -2495,16 +2598,21 @@
 breezy.tests.per_intertree.test_compare.TestCompare.test_unversioned_paths_in_tree(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_unversioned_paths_in_tree(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_unversioned_paths_in_tree(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestCompare.test_unversioned_paths_in_tree(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_a_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_a_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_a_only(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_b_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_b_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty_b_only(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_abc_content_to_empty(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_empty_trees(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree)
@@ -2513,6 +2621,7 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_default_ignores_unversioned_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_default_ignores_unversioned_files(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_default_ignores_unversioned_files(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_default_ignores_unversioned_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_deleted_and_unknown(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_deleted_and_unknown(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_disk_in_subtrees_skipped(InterDirStateTree(C))
@@ -2520,28 +2629,37 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_disk_in_subtrees_skipped(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_disk_in_subtrees_skipped(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_dir(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_specific_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_specific_files(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_specific_files(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_specific_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content_a_and_c_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content_a_only(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_becomes_unversionable_bug_438569(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_becomes_unversionable_bug_438569(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_becomes_unversionable_bug_438569(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_becomes_unversionable_bug_438569(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_becomes_unversionable_bug_438569(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename_and_meta_modification(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename_and_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename_and_meta_modification(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_meta_modification(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_meta_modification(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_and_renamed(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_and_renamed(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_in_target(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_in_target(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_in_target(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_no_specific_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_no_specific_files(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_no_specific_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_source_and_missing(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_source_and_missing(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_source_and_missing(InterTree(CHKInventory))
@@ -2551,32 +2669,43 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_added(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_added(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_added(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_added(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_unknown(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_renamed_and_unknown(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_rename_over_deleted(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_rename_over_deleted(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_rename_over_deleted(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_rename_over_deleted(InterTree(PreviewTree))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents_root_changes(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_becomes_file(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_collides_with_unselected_new(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_dir_stops_being_dir(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_same_path_new_parent(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_with_rename_under_new_dir_reports_new_dir(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_trees_with_deleted_dir(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_trees_with_deleted_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_trees_with_deleted_dir(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_trees_with_special_names(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_target_matching_source_old_names(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_target_matching_source_old_names(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_paths_in_tree_specific_files(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(InterTree(CHKInventory))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unversioned_subtree_only_emits_root(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)
@@ -2673,6 +2802,13 @@
 breezy.tests.per_pack_repository.TestPackRepository.test_concurrent_pack_during_get_record_reloads(2a)
 breezy.tests.per_pack_repository.TestPackRepository.test_concurrent_pack_during_get_record_reloads(pack-0.92)
 breezy.tests.per_pack_repository.TestPackRepository.test_concurrent_pack_during_get_record_reloads(pack-0.92-subtree)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(1.6)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(1.6.1-rich-root)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(1.9)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(1.9-rich-root)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(2a)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(pack-0.92)
+breezy.tests.per_pack_repository.TestPackRepository.test_fail_obsolete_deletion(pack-0.92-subtree)
 breezy.tests.per_pack_repository.TestPackRepository.test_fetch_without_find_ghosts_ignores_ghosts(2a)
 breezy.tests.per_pack_repository.TestPackRepository.test_lock_write_does_not_physically_lock(1.6)
 breezy.tests.per_pack_repository.TestPackRepository.test_lock_write_does_not_physically_lock(1.6.1-rich-root)
@@ -4331,6 +4467,8 @@
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_to_hpss(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_to_hpss(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestRepository.test_clone_to_hpss(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestRepository.test_commit_unicode_message(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RemoteRepositoryFormat-default)
 breezy.tests.per_repository.test_repository.TestRepository.test_create_repository(RemoteRepositoryFormat-v2)
@@ -5882,18 +6020,42 @@
 breezy.tests.per_transport.TransportTests.test_connection_sharing(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_connection_sharing(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_connection_sharing(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_connect_twice_is_same_content(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_copy(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_copy(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_copy(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_copy(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_copy(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_copy(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_copy(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_copy(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_copy(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_copy(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_copy(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_copy(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_copy(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_copy(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_copy(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_copy(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(FakeVFATTransportDecorator,FakeVFATServer)
@@ -5910,6 +6072,8 @@
 breezy.tests.per_transport.TransportTests.test_copy_to(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_copy_to(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_copy(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_copy(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(FakeVFATTransportDecorator,FakeVFATServer)
@@ -5948,6 +6112,7 @@
 breezy.tests.per_transport.TransportTests.test_copy_tree(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_copy_tree(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_copy(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_create_prefix(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_create_prefix(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_create_prefix(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6081,7 +6246,21 @@
 breezy.tests.per_transport.TransportTests.test_external_url(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_external_url(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_external_url(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(PathFilteringTransport,TestingPathFilteringServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_get_bytes(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6097,12 +6276,14 @@
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_unknown_file(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_get_bytes(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_get_bytes_with_open_write_stream_sees_all_content(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_get(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6120,7 +6301,18 @@
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_directory_read_gives_ReadError(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_get(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_get(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_get(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_get(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_get(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_get(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_get(PathFilteringTransport,TestingPathFilteringServer)
+breezy.tests.per_transport.TransportTests.test_get(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_get(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_get(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_get(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_get(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6141,6 +6333,8 @@
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_smart_medium(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_get(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_get(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6156,6 +6350,7 @@
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_get_unknown_file(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_get(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_get_with_open_write_stream_sees_all_content(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_get_with_open_write_stream_sees_all_content(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_get_with_open_write_stream_sees_all_content(HTTPS_urllib_transport,HTTPSServer_urllib)
@@ -6356,11 +6551,18 @@
 breezy.tests.per_transport.TransportTests.test_lock_write(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_lock_write(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_lock_write(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_mkdir(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_mkdir(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_mkdir_permissions(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_mkdir_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_mkdir_permissions(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6382,12 +6584,33 @@
 breezy.tests.per_transport.TransportTests.test_mkdir_permissions(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_mkdir_permissions(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_mkdir(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_mkdir(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_mkdir(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_move(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_move(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_move(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_move(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_move(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_move(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_move(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_move(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_move(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_move(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_move(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_move(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_move(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_move(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_move(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_move(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_move(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_move(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_move(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_move(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_no_segment_parameters(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_no_segment_parameters(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_no_segment_parameters(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6434,21 +6657,56 @@
 breezy.tests.per_transport.TransportTests.test_opening_a_file_stream_creates_file(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_opening_a_file_stream_creates_file(HttpTransport_urllib,HttpServer_urllib)
 breezy.tests.per_transport.TransportTests.test_opening_a_file_stream_creates_file(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_bytes(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_bytes(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(FtpTransport,UnavailableFTPTestServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(HTTPS_transport,HTTPSServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(HttpTransport,HttpServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(PathFilteringTransport,TestingPathFilteringServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(LocalTransport,LocalURLServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(ReadonlyTransportDecorator,ReadonlyServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic_permissions(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes_non_atomic(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6470,6 +6728,12 @@
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_permissions(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_put_bytes(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6490,16 +6754,29 @@
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(TransportLogDecorator,LogDecoratorServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_put_bytes_unicode(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_put_bytes(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_put_file(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_file(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_put_file(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_file(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_file(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_put_file(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_file(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_put_file(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_file(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_put_file(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(ChrootTransport,TestingChrootServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(FakeNFSTransportDecorator,FakeNFSServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(FakeVFATTransportDecorator,FakeVFATServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(FtpTransport,UnavailableFTPTestServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(HTTPS_transport,HTTPSServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(HTTPS_urllib_transport,HTTPSServer_urllib)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(HttpTransport,HttpServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(HttpTransport_urllib,HttpServer_urllib)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(LocalTransport,LocalURLServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(MemoryTransport,MemoryServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic_permissions(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic_permissions(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6521,6 +6798,15 @@
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic_permissions(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic_permissions(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_put_file_non_atomic(UnlistableTransportDecorator,UnlistableServer)
+breezy.tests.per_transport.TransportTests.test_put_file(NoSmartTransportDecorator,NoSmartTransportServer)
+breezy.tests.per_transport.TransportTests.test_put_file(PathFilteringTransport,TestingPathFilteringServer)
 breezy.tests.per_transport.TransportTests.test_put_file_permissions(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_put_file_permissions(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_put_file_permissions(FakeVFATTransportDecorator,FakeVFATServer)
@@ -6542,6 +6828,13 @@
 breezy.tests.per_transport.TransportTests.test_put_file_permissions(TransportTraceDecorator,TraceServer)
 breezy.tests.per_transport.TransportTests.test_put_file_permissions(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_put_file(ReadonlyTransportDecorator,ReadonlyServer)
+breezy.tests.per_transport.TransportTests.test_put_file(RemoteTCPTransport,SmartTCPServer_for_testing)
+breezy.tests.per_transport.TransportTests.test_put_file(SFTPTransport,SFTPAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_file(SFTPTransport,SFTPHomeDirServer)
+breezy.tests.per_transport.TransportTests.test_put_file(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.tests.per_transport.TransportTests.test_put_file(TransportLogDecorator,LogDecoratorServer)
+breezy.tests.per_transport.TransportTests.test_put_file(TransportTraceDecorator,TraceServer)
+breezy.tests.per_transport.TransportTests.test_put_file(UnlistableTransportDecorator,UnlistableServer)
 breezy.tests.per_transport.TransportTests.test_readv(ChrootTransport,TestingChrootServer)
 breezy.tests.per_transport.TransportTests.test_readv(FakeNFSTransportDecorator,FakeNFSServer)
 breezy.tests.per_transport.TransportTests.test_readv(FakeVFATTransportDecorator,FakeVFATServer)
@@ -7119,6 +7412,8 @@
 breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(PreviewTree)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(PreviewTreePost)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(RevisionTree)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat2)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(WorkingTreeFormat3)