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

[Jelmer Vernooij]

Port dirstate to python3, a bit.

[Martin Packman (gz)]

Changes look good as far as I can see, two inline notes about passing tests update.

review: Approve

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

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

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

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

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

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

=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
--- breezy/bzr/_dirstate_helpers_pyx.pyx	2017-07-30 23:53:38 +0000
+++ breezy/bzr/_dirstate_helpers_pyx.pyx	2018-07-01 11:20:52 +0000
@@ -29,7 +29,7 @@
 import sys
 
 from .. import cache_utf8, errors, osutils
-from .dirstate import DirState, DirstateCorrupt
+from .dirstate import DirState, DirstateCorrupt, is_inside_any, is_inside
 from ..osutils import parent_directories, pathjoin, splitpath
 
 
@@ -1164,7 +1164,7 @@
                 # add the source to the search path to find any children it
                 # has.  TODO ? : only add if it is a container ?
                 if (not self.doing_consistency_expansion and 
-                    not osutils.is_inside_any(self.searched_specific_files,
+                    not is_inside_any(self.searched_specific_files,
                                              source_details[1])):
                     self.search_specific_files.add(source_details[1])
                     # expanding from a user requested path, parent expansion
@@ -1385,7 +1385,7 @@
             # common case to rename dirs though, so a correct but slow
             # implementation will do.
             if (not self.doing_consistency_expansion and 
-                not osutils.is_inside_any(self.searched_specific_files,
+                not is_inside_any(self.searched_specific_files,
                     target_details[1])):
                 self.search_specific_files.add(target_details[1])
                 # We don't expand the specific files parents list here as
@@ -1432,7 +1432,7 @@
 
     cdef int _update_current_block(self) except -1:
         if (self.block_index < len(self.state._dirblocks) and
-            osutils.is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):
+            is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):
             self.current_block = self.state._dirblocks[self.block_index]
             self.current_block_list = self.current_block[1]
             self.current_block_pos = 0
@@ -1905,7 +1905,7 @@
             if path_utf8 in self.searched_exact_paths:
                 # We've examined this path.
                 continue
-            if osutils.is_inside_any(self.searched_specific_files, path_utf8):
+            if is_inside_any(self.searched_specific_files, path_utf8):
                 # We've examined this path.
                 continue
             path_entries = self.state._entries_for_path(path_utf8)
@@ -1968,7 +1968,7 @@
                         current_block = None
                         if block_index < len(self.state._dirblocks):
                             current_block = self.state._dirblocks[block_index]
-                            if not osutils.is_inside(
+                            if not is_inside(
                                 entry_path_utf8, current_block[0]):
                                 # No entries for this directory at all.
                                 current_block = None

=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2018-06-30 15:18:05 +0000
+++ breezy/bzr/dirstate.py	2018-07-01 11:20:52 +0000
@@ -78,27 +78,27 @@
 
 and the entries in there are::
 
-    entries[0][0]: ''
-    entries[0][1]: ''
+    entries[0][0]: b''
+    entries[0][1]: b''
     entries[0][2]: file_id
     entries[1][0]: The tree data for the current tree for this fileid at /
     etc.
 
 Kinds::
 
-    'r' is a relocated entry: This path is not present in this tree with this
+   b'r' is a relocated entry: This path is not present in this tree with this
         id, but the id can be found at another location. The fingerprint is
         used to point to the target location.
-    'a' is an absent entry: In that tree the id is not present at this path.
-    'd' is a directory entry: This path in this tree is a directory with the
+   b'a' is an absent entry: In that tree the id is not present at this path.
+   b'd' is a directory entry: This path in this tree is a directory with the
         current file id. There is no fingerprint for directories.
-    'f' is a file entry: As for directory, but it's a file. The fingerprint is
+   b'f' is a file entry: As for directory, but it's a file. The fingerprint is
         the sha1 value of the file's canonical form, i.e. after any read
         filters have been applied to the convenience form stored in the working
         tree.
-    'l' is a symlink entry: As for directory, but a symlink. The fingerprint is
+   b'l' is a symlink entry: As for directory, but a symlink. The fingerprint is
         the link target.
-    't' is a reference to a nested subtree; the fingerprint is the referenced
+   b't' is a reference to a nested subtree; the fingerprint is the referenced
         revision.
 
 Ordering:
@@ -307,6 +307,38 @@
         return statvalue, sha1
 
 
+def is_inside(dir, fname):
+    """True if fname is inside dir.
+
+    The parameters should typically be passed to osutils.normpath first, so
+    that . and .. and repeated slashes are eliminated, and the separators
+    are canonical for the platform.
+
+    The empty string as a dir name is taken as top-of-tree and matches
+    everything.
+
+    This is based on breezy.osutils.is_inside, which uses filesystem strings.
+    """
+    if dir == fname:
+        return True
+
+    if dir == b'':
+        return True
+
+    if not dir.endswith(b'/'):
+        dir += b'/'
+
+    return fname.startswith(dir)
+
+
+def is_inside_any(dir_list, fname):
+    """True if fname is inside any of given dirs."""
+    for dirname in dir_list:
+        if is_inside(dirname, fname):
+            return True
+    return False
+
+
 class DirState(object):
     """Record directory and metadata state for fast access.
 
@@ -462,7 +494,7 @@
     def add(self, path, file_id, kind, stat, fingerprint):
         """Add a path to be tracked.
 
-        :param path: The path within the dirstate - '' is the root, 'foo' is the
+        :param path: The path within the dirstate - b'' is the root, 'foo' is the
             path foo within the root, 'foo/bar' is the path bar within foo
             within the root.
         :param file_id: The file id of the path being added.
@@ -473,7 +505,7 @@
             after any read filters have been applied),
             or the target of a symlink,
             or the referenced revision id for tree-references,
-            or '' for directories.
+            or b'' for directories.
         """
         # adding a file:
         # find the block its in.
@@ -512,9 +544,9 @@
                 if file_id_entry[0] != (dirname, basename, file_id):
                     # set the old name's current operation to rename
                     self.update_minimal(file_id_entry[0],
-                        'r',
-                        path_utf8='',
-                        packed_stat='',
+                        b'r',
+                        path_utf8=b'',
+                        packed_stat=b'',
                         fingerprint=utf8path
                     )
                     rename_from = file_id_entry[0][0:2]
@@ -523,7 +555,7 @@
                 kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
                 info = '%s:%s' % (kind, path)
                 raise errors.DuplicateFileId(file_id, info)
-        first_key = (dirname, basename, '')
+        first_key = (dirname, basename, b'')
         block_index, present = self._find_block_index_from_key(first_key)
         if present:
             # check the path is not in the tree
@@ -557,7 +589,7 @@
         minikind = DirState._kind_to_minikind[kind]
         if rename_from is not None:
             if rename_from[0]:
-                old_path_utf8 = '%s/%s' % rename_from
+                old_path_utf8 = b'%s/%s' % rename_from
             else:
                 old_path_utf8 = rename_from[1]
             parent_info[0] = (b'r', old_path_utf8, 0, False, b'')
@@ -619,7 +651,7 @@
         file_size = os.fstat(state_file.fileno()).st_size
         # We end up with 2 extra fields, we should have a trailing '\n' to
         # ensure that we read the whole record, and we should have a precursur
-        # '' which ensures that we start after the previous '\n'
+        # b'' which ensures that we start after the previous '\n'
         entry_field_count = self._fields_per_entry() + 1
 
         low = self._end_of_header
@@ -653,7 +685,7 @@
             if count > max_count:
                 raise errors.BzrError('Too many seeks, most likely a bug.')
 
-            mid = max(low, (low+high-page_size)/2)
+            mid = max(low, (low+high-page_size)//2)
 
             state_file.seek(mid)
             # limit the read size, so we don't end up reading data that we have
@@ -811,7 +843,7 @@
         file_size = os.fstat(state_file.fileno()).st_size
         # We end up with 2 extra fields, we should have a trailing '\n' to
         # ensure that we read the whole record, and we should have a precursur
-        # '' which ensures that we start after the previous '\n'
+        # b'' which ensures that we start after the previous '\n'
         entry_field_count = self._fields_per_entry() + 1
 
         low = self._end_of_header
@@ -845,7 +877,7 @@
             if count > max_count:
                 raise errors.BzrError('Too many seeks, most likely a bug.')
 
-            mid = max(low, (low+high-page_size)/2)
+            mid = max(low, (low+high-page_size)//2)
 
             state_file.seek(mid)
             # limit the read size, so we don't end up reading data that we have
@@ -970,7 +1002,7 @@
         directories. (and renames?)
 
         :param paths: A sorted list of (dir, name) pairs
-             eg: [('', 'a'), ('', 'f'), ('a/b', 'c')]
+             eg: [('', b'a'), ('', b'f'), ('a/b', b'c')]
         :return: A dictionary mapping (dir, name, file_id) => [tree_info]
         """
         # Map from (dir, name, file_id) => [tree_info]
@@ -1247,9 +1279,9 @@
                                       cache=self._split_path_cache)
         # _right returns one-past-where-key is so we have to subtract
         # one to use it. we use _right here because there are two
-        # '' blocks - the root, and the contents of root
+        # b'' blocks - the root, and the contents of root
         # we always have a minimum of 2 in self._dirblocks: root and
-        # root-contents, and for '', we get 2 back, so this is
+        # root-contents, and for b'', we get 2 back, so this is
         # simple and correct:
         present = (block_index < len(self._dirblocks) and
             self._dirblocks[block_index][0] == key[0])
@@ -1568,10 +1600,10 @@
                 # pair will result in the deleted item being reinserted, or
                 # renamed items being reinserted twice - and possibly at the
                 # wrong place. Splitting into a delete/add pair also simplifies
-                # the handling of entries with ('f', ...), ('r' ...) because
-                # the target of the 'r' is old_path here, and we add that to
+                # the handling of entries with (b'f', ...), (b'r' ...) because
+                # the target of the b'r' is old_path here, and we add that to
                 # deletes, meaning that the add handler does not need to check
-                # for 'r' items on every pass.
+                # for b'r' items on every pass.
                 self._update_basis_apply_deletes(deletes)
                 deletes = []
                 # Split into an add/delete pair recursively.
@@ -1767,16 +1799,16 @@
                     # rename records.
                     active_dir, active_name = active_entry[0][:2]
                     if active_dir:
-                        active_path = active_dir + '/' + active_name
+                        active_path = active_dir + b'/' + active_name
                     else:
                         active_path = active_name
-                    active_entry[1][1] = st('r', new_path, 0, False, '')
-                    entry[1][0] = st('r', active_path, 0, False, '')
-            elif active_kind == 'r':
+                    active_entry[1][1] = st(b'r', new_path, 0, False, b'')
+                    entry[1][0] = st(b'r', active_path, 0, False, b'')
+            elif active_kind == b'r':
                 raise NotImplementedError()
 
             new_kind = new_details[0]
-            if new_kind == 'd':
+            if new_kind == b'd':
                 self._ensure_block(block_index, entry_index, new_path)
 
     def _update_basis_apply_changes(self, changes):
@@ -1837,7 +1869,7 @@
                     if active_entry[1][1][0] != b'r':
                         self._raise_invalid(old_path, file_id,
                             "Dirstate did not have matching rename entries")
-                    elif active_entry[1][0][0] in 'ar':
+                    elif active_entry[1][0][0] in b'ar':
                         self._raise_invalid(old_path, file_id,
                             "Dirstate had a rename pointing at an inactive"
                             " tree0")
@@ -1849,7 +1881,7 @@
                     # exist. Remove its dirblock if present
                     (dir_block_index,
                      present) = self._find_block_index_from_key(
-                        (old_path, '', ''))
+                        (old_path, b'', b''))
                     if present:
                         dir_block = self._dirblocks[dir_block_index][1]
                         if not dir_block:
@@ -1903,12 +1935,12 @@
         except KeyError:
             # Unhandled kind
             return None
-        if minikind == 'f':
+        if minikind == b'f':
             if self._cutoff_time is None:
                 self._sha_cutoff_time()
             if (stat_value.st_mtime < self._cutoff_time
                 and stat_value.st_ctime < self._cutoff_time):
-                entry[1][0] = ('f', sha1, stat_value.st_size, entry[1][0][3],
+                entry[1][0] = (b'f', sha1, stat_value.st_size, entry[1][0][3],
                                pack_stat(stat_value))
                 self._mark_modified([entry])
 
@@ -2013,7 +2045,7 @@
                         fields[3],                # minikind
                         fields[4],                # fingerprint
                         _int(fields[5]),          # size
-                        fields[6] == 'y',         # executable
+                        fields[6] == b'y',         # executable
                         fields[7],                # packed_stat or revision_id
                     )])
             return fields_to_entry_0_parents
@@ -2025,14 +2057,14 @@
                         fields[3],                # minikind
                         fields[4],                # fingerprint
                         _int(fields[5]),          # size
-                        fields[6] == 'y',         # executable
+                        fields[6] == b'y',         # executable
                         fields[7],                # packed_stat or revision_id
                     ),
                     ( # Parent 1
                         fields[8],                # minikind
                         fields[9],                # fingerprint
                         _int(fields[10]),         # size
-                        fields[11] == 'y',        # executable
+                        fields[11] == b'y',        # executable
                         fields[12],               # packed_stat or revision_id
                     ),
                     ])
@@ -2045,21 +2077,21 @@
                         fields[3],                # minikind
                         fields[4],                # fingerprint
                         _int(fields[5]),          # size
-                        fields[6] == 'y',         # executable
+                        fields[6] == b'y',         # executable
                         fields[7],                # packed_stat or revision_id
                     ),
                     ( # Parent 1
                         fields[8],                # minikind
                         fields[9],                # fingerprint
                         _int(fields[10]),         # size
-                        fields[11] == 'y',        # executable
+                        fields[11] == b'y',        # executable
                         fields[12],               # packed_stat or revision_id
                     ),
                     ( # Parent 2
                         fields[13],               # minikind
                         fields[14],               # fingerprint
                         _int(fields[15]),         # size
-                        fields[16] == 'y',        # executable
+                        fields[16] == b'y',        # executable
                         fields[17],               # packed_stat or revision_id
                     ),
                     ])
@@ -2070,7 +2102,7 @@
                 trees = [(fields[cur],                # minikind
                           fields[cur+1],              # fingerprint
                           _int(fields[cur+2]),        # size
-                          fields[cur+3] == 'y',       # executable
+                          fields[cur+3] == b'y',       # executable
                           fields[cur+4],              # stat or revision_id
                          ) for cur in range(3, len(fields)-1, 5)]
                 return path_name_file_id_key, trees
@@ -2274,7 +2306,7 @@
     def _iter_child_entries(self, tree_index, path_utf8):
         """Iterate over all the entries that are children of path_utf.
 
-        This only returns entries that are present (not in 'a', 'r') in
+        This only returns entries that are present (not in b'a', b'r') in
         tree_index. tree_index data is not refreshed, so if tree 0 is used,
         results may differ from that obtained if paths were statted to
         determine what ones were directories.
@@ -2536,7 +2568,7 @@
                 self._state_file = self._lock_token.f
                 # TODO: jam 20070315 We should validate the disk file has
                 #       not changed contents. Since restore_read_lock may
-                #       not be an atomic operation.                
+                #       not be an atomic operation.
 
     def _maybe_fdatasync(self):
         """Flush to disk if possible and if not configured off."""
@@ -2584,7 +2616,7 @@
     def set_path_id(self, path, new_id):
         """Change the id of path to new_id in the current working tree.
 
-        :param path: The path inside the tree to set - '' is the root, 'foo'
+        :param path: The path inside the tree to set - b'' is the root, 'foo'
             is the path foo in the root.
         :param new_id: The new id to assign to the path. This must be a utf8
             file id (not unicode, and not None).
@@ -2993,7 +3025,7 @@
         updated as well.
 
         :param key: (dir, name, file_id) for the new entry
-        :param minikind: The type for the entry ('f' == 'file', 'd' ==
+        :param minikind: The type for the entry (b'f' == 'file', b'd' ==
                 'directory'), etc.
         :param executable: Should the executable bit be set?
         :param fingerprint: Simple fingerprint for new entry: canonical-form
@@ -3012,7 +3044,7 @@
         block = self._find_block(key)[1]
         if packed_stat is None:
             packed_stat = DirState.NULLSTAT
-        # XXX: Some callers pass '' as the packed_stat, and it seems to be
+        # XXX: Some callers pass b'' as the packed_stat, and it seems to be
         # sometimes present in the dirstate - this seems oddly inconsistent.
         # mbp 20071008
         entry_index, present = self._find_entry_index(key, block)
@@ -3188,7 +3220,7 @@
         # NOTE: This must always raise AssertionError not just assert,
         # otherwise it may not behave properly under python -O
         #
-        # TODO: All entries must have some content that's not 'a' or 'r',
+        # TODO: All entries must have some content that's not b'a' or b'r',
         # otherwise it could just be removed.
         #
         # TODO: All relocations must point directly to a real entry.
@@ -3588,7 +3620,7 @@
             if source_minikind == b'r':
                 # add the source to the search path to find any children it
                 # has.  TODO ? : only add if it is a container ?
-                if not osutils.is_inside_any(self.searched_specific_files,
+                if not is_inside_any(self.searched_specific_files,
                                              source_details[1]):
                     self.search_specific_files.add(source_details[1])
                 # generate the old path; this is needed for stating later
@@ -3798,7 +3830,7 @@
             # a renamed parent. TODO: handle this efficiently. Its not
             # common case to rename dirs though, so a correct but slow
             # implementation will do.
-            if not osutils.is_inside_any(self.searched_specific_files, target_details[1]):
+            if not is_inside_any(self.searched_specific_files, target_details[1]):
                 self.search_specific_files.add(target_details[1])
         elif source_minikind in _ra and target_minikind in _ra:
             # neither of the selected trees contain this file,
@@ -3972,7 +4004,7 @@
             # walk until both the directory listing and the versioned metadata
             # are exhausted.
             if (block_index < len(self.state._dirblocks) and
-                osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
+                is_inside(current_root, self.state._dirblocks[block_index][0])):
                 current_block = self.state._dirblocks[block_index]
             else:
                 current_block = None
@@ -4042,7 +4074,7 @@
                                     yield result
                         block_index +=1
                         if (block_index < len(self.state._dirblocks) and
-                            osutils.is_inside(current_root,
+                            is_inside(current_root,
                                               self.state._dirblocks[block_index][0])):
                             current_block = self.state._dirblocks[block_index]
                         else:
@@ -4166,7 +4198,7 @@
                 if current_block is not None:
                     block_index += 1
                     if (block_index < len(self.state._dirblocks) and
-                        osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
+                        is_inside(current_root, self.state._dirblocks[block_index][0])):
                         current_block = self.state._dirblocks[block_index]
                     else:
                         current_block = None
@@ -4185,7 +4217,7 @@
             # Even in extremely large trees this should be modest, so currently
             # no attempt is made to optimise.
             path_utf8 = self.search_specific_file_parents.pop()
-            if osutils.is_inside_any(self.searched_specific_files, path_utf8):
+            if is_inside_any(self.searched_specific_files, path_utf8):
                 # We've examined this path.
                 continue
             if path_utf8 in self.searched_exact_paths:
@@ -4251,7 +4283,7 @@
                         current_block = None
                         if block_index < len(self.state._dirblocks):
                             current_block = self.state._dirblocks[block_index]
-                            if not osutils.is_inside(
+                            if not is_inside(
                                 entry_path_utf8, current_block[0]):
                                 # No entries for this directory at all.
                                 current_block = None

=== modified file 'breezy/tests/test__dirstate_helpers.py'
--- breezy/tests/test__dirstate_helpers.py	2018-06-18 20:53:01 +0000
+++ breezy/tests/test__dirstate_helpers.py	2018-07-01 11:20:52 +0000
@@ -1308,7 +1308,13 @@
         basis_tree = tree.basis_tree()
         def is_inside_raises(*args, **kwargs):
             raise RuntimeError('stop this')
-        self.overrideAttr(osutils, 'is_inside', is_inside_raises)
+        self.overrideAttr(dirstate, 'is_inside', is_inside_raises)
+        try:
+            from breezy.bzr import _dirstate_helpers_pyx
+        except ImportError:
+            pass
+        else:
+            self.overrideAttr(_dirstate_helpers_pyx, 'is_inside', is_inside_raises)
         self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
 
     def test_simple_changes(self):

=== modified file 'breezy/tests/test_dirstate.py'
--- breezy/tests/test_dirstate.py	2018-06-24 13:18:43 +0000
+++ breezy/tests/test_dirstate.py	2018-07-01 11:20:52 +0000
@@ -88,13 +88,13 @@
 
     def create_dirstate_with_root(self):
         """Return a write-locked state with a single root entry."""
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        root_entry_direntry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        root_entry_direntry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
             ]
         dirblocks = []
-        dirblocks.append(('', [root_entry_direntry]))
-        dirblocks.append(('', []))
+        dirblocks.append((b'', [root_entry_direntry]))
+        dirblocks.append((b'', []))
         state = self.create_empty_dirstate()
         try:
             state._set_data([], dirblocks)
@@ -106,9 +106,9 @@
 
     def create_dirstate_with_root_and_subdir(self):
         """Return a locked DirState with a root and a subdir"""
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        subdir_entry = ('', 'subdir', 'subdir-id'), [
-            ('d', '', 0, False, packed_stat),
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        subdir_entry = (b'', b'subdir', b'subdir-id'), [
+            (b'd', b'', 0, False, packed_stat),
             ]
         state = self.create_dirstate_with_root()
         try:
@@ -137,40 +137,40 @@
 
         :return: The dirstate, still write-locked.
         """
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-        root_entry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
-            ]
-        a_entry = ('', 'a', 'a-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ]
-        b_entry = ('', 'b', 'b-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ]
-        c_entry = ('', 'c', 'c-file'), [
-            ('f', null_sha, 10, False, packed_stat),
-            ]
-        d_entry = ('', 'd', 'd-file'), [
-            ('f', null_sha, 20, False, packed_stat),
-            ]
-        e_entry = ('a', 'e', 'e-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ]
-        f_entry = ('a', 'f', 'f-file'), [
-            ('f', null_sha, 30, False, packed_stat),
-            ]
-        g_entry = ('b', 'g', 'g-file'), [
-            ('f', null_sha, 30, False, packed_stat),
-            ]
-        h_entry = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file'), [
-            ('f', null_sha, 40, False, packed_stat),
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        null_sha = b'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+        root_entry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
+            ]
+        a_entry = (b'', b'a', b'a-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            ]
+        b_entry = (b'', b'b', b'b-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            ]
+        c_entry = (b'', b'c', b'c-file'), [
+            (b'f', null_sha, 10, False, packed_stat),
+            ]
+        d_entry = (b'', b'd', b'd-file'), [
+            (b'f', null_sha, 20, False, packed_stat),
+            ]
+        e_entry = (b'a', b'e', b'e-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            ]
+        f_entry = (b'a', b'f', b'f-file'), [
+            (b'f', null_sha, 30, False, packed_stat),
+            ]
+        g_entry = (b'b', b'g', b'g-file'), [
+            (b'f', null_sha, 30, False, packed_stat),
+            ]
+        h_entry = (b'b', b'h\xc3\xa5', b'h-\xc3\xa5-file'), [
+            (b'f', null_sha, 40, False, packed_stat),
             ]
         dirblocks = []
-        dirblocks.append(('', [root_entry]))
-        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
-        dirblocks.append(('a', [e_entry, f_entry]))
-        dirblocks.append(('b', [g_entry, h_entry]))
+        dirblocks.append((b'', [root_entry]))
+        dirblocks.append((b'', [a_entry, b_entry, c_entry, d_entry]))
+        dirblocks.append((b'a', [e_entry, f_entry]))
+        dirblocks.append((b'b', [g_entry, h_entry]))
         state = dirstate.DirState.initialize('dirstate')
         state._validate()
         try:
@@ -225,12 +225,12 @@
         """
         tree = self.make_branch_and_tree('tree')
         paths = ['a', 'b/', 'b/c', 'b/d/', 'b/d/e', 'b-c', 'f']
-        file_ids = ['a-id', 'b-id', 'c-id', 'd-id', 'e-id', 'b-c-id', 'f-id']
+        file_ids = [b'a-id', b'b-id', b'c-id', b'd-id', b'e-id', b'b-c-id', b'f-id']
         self.build_tree(['tree/' + p for p in paths])
         tree.set_root_id(b'TREE_ROOT')
         tree.add([p.rstrip('/') for p in paths], file_ids)
         tree.commit('initial', rev_id=b'rev-1')
-        revision_id = 'rev-1'
+        revision_id = b'rev-1'
         # a_packed_stat = dirstate.pack_stat(os.stat('tree/a'))
         t = self.get_transport('tree')
         a_text = t.get_bytes('a')
@@ -255,37 +255,37 @@
         f_len = len(f_text)
         null_stat = dirstate.DirState.NULLSTAT
         expected = {
-            '': (('', '', 'TREE_ROOT'), [
-                  ('d', '', 0, False, null_stat),
-                  ('d', '', 0, False, revision_id),
+            b'': ((b'', b'', b'TREE_ROOT'), [
+                  (b'd', b'', 0, False, null_stat),
+                  (b'd', b'', 0, False, revision_id),
                 ]),
-            'a': (('', 'a', 'a-id'), [
-                   ('f', '', 0, False, null_stat),
-                   ('f', a_sha, a_len, False, revision_id),
-                 ]),
-            'b': (('', 'b', 'b-id'), [
-                  ('d', '', 0, False, null_stat),
-                  ('d', '', 0, False, revision_id),
-                 ]),
-            'b/c': (('b', 'c', 'c-id'), [
-                    ('f', '', 0, False, null_stat),
-                    ('f', c_sha, c_len, False, revision_id),
-                   ]),
-            'b/d': (('b', 'd', 'd-id'), [
-                    ('d', '', 0, False, null_stat),
-                    ('d', '', 0, False, revision_id),
-                   ]),
-            'b/d/e': (('b/d', 'e', 'e-id'), [
-                      ('f', '', 0, False, null_stat),
-                      ('f', e_sha, e_len, False, revision_id),
-                     ]),
-            'b-c': (('', 'b-c', 'b-c-id'), [
-                      ('f', '', 0, False, null_stat),
-                      ('f', b_c_sha, b_c_len, False, revision_id),
-                     ]),
-            'f': (('', 'f', 'f-id'), [
-                  ('f', '', 0, False, null_stat),
-                  ('f', f_sha, f_len, False, revision_id),
+            b'a': ((b'', b'a', b'a-id'), [
+                   (b'f', b'', 0, False, null_stat),
+                   (b'f', a_sha, a_len, False, revision_id),
+                 ]),
+            b'b': ((b'', b'b', b'b-id'), [
+                  (b'd', b'', 0, False, null_stat),
+                  (b'd', b'', 0, False, revision_id),
+                 ]),
+            b'b/c': ((b'b', b'c', b'c-id'), [
+                    (b'f', b'', 0, False, null_stat),
+                    (b'f', c_sha, c_len, False, revision_id),
+                   ]),
+            b'b/d': ((b'b', b'd', b'd-id'), [
+                    (b'd', b'', 0, False, null_stat),
+                    (b'd', b'', 0, False, revision_id),
+                   ]),
+            b'b/d/e': ((b'b/d', b'e', b'e-id'), [
+                      (b'f', b'', 0, False, null_stat),
+                      (b'f', e_sha, e_len, False, revision_id),
+                     ]),
+            b'b-c': ((b'', b'b-c', b'b-c-id'), [
+                      (b'f', b'', 0, False, null_stat),
+                      (b'f', b_c_sha, b_c_len, False, revision_id),
+                     ]),
+            b'f': ((b'', b'f', b'f-id'), [
+                  (b'f', b'', 0, False, null_stat),
+                  (b'f', f_sha, f_len, False, revision_id),
                  ]),
         }
         state = dirstate.DirState.from_tree(tree, 'dirstate')
@@ -317,16 +317,16 @@
         # per entry. Unversion in reverse order so we handle subdirs
         tree.unversion(['f', 'b-c', 'b/d/e', 'b/d', 'b/c', 'b', 'a'])
         tree.add(['a', 'b', 'b/c', 'b/d', 'b/d/e', 'b-c', 'f'],
-                 ['a-id2', 'b-id2', 'c-id2', 'd-id2', 'e-id2', 'b-c-id2', 'f-id2'])
+                 [b'a-id2', b'b-id2', b'c-id2', b'd-id2', b'e-id2', b'b-c-id2', b'f-id2'])
 
         # Update the expected dictionary.
-        for path in ['a', 'b', 'b/c', 'b/d', 'b/d/e', 'b-c', 'f']:
+        for path in [b'a', b'b', b'b/c', b'b/d', b'b/d/e', b'b-c', b'f']:
             orig = expected[path]
-            path2 = path + '2'
+            path2 = path + b'2'
             # This record was deleted in the current tree
             expected[path] = (orig[0], [dirstate.DirState.NULL_PARENT_DETAILS,
                                         orig[1][1]])
-            new_key = (orig[0][0], orig[0][1], orig[0][2]+'2')
+            new_key = (orig[0][0], orig[0][1], orig[0][2]+b'2')
             # And didn't exist in the basis tree
             expected[path2] = (new_key, [orig[1][0],
                                          dirstate.DirState.NULL_PARENT_DETAILS])
@@ -357,20 +357,20 @@
         # And a directory
         tree.rename_one('b/d', 'h')
 
-        old_a = expected['a']
-        expected['a'] = (old_a[0], [('r', 'b/g', 0, False, ''), old_a[1][1]])
-        expected['b/g'] = (('b', 'g', b'a-id'), [old_a[1][0],
-                                                ('r', 'a', 0, False, '')])
+        old_a = expected[b'a']
+        expected[b'a'] = (old_a[0], [(b'r', b'b/g', 0, False, b''), old_a[1][1]])
+        expected[b'b/g'] = ((b'b', b'g', b'a-id'), [old_a[1][0],
+                                                (b'r', b'a', 0, False, b'')])
         old_d = expected['b/d']
-        expected['b/d'] = (old_d[0], [('r', 'h', 0, False, ''), old_d[1][1]])
-        expected['h'] = (('', 'h', b'd-id'), [old_d[1][0],
-                                             ('r', 'b/d', 0, False, '')])
+        expected[b'b/d'] = (old_d[0], [(b'r', b'h', 0, False, b''), old_d[1][1]])
+        expected[b'h'] = ((b'', b'h', b'd-id'), [old_d[1][0],
+                                             (b'r', b'b/d', 0, False, b'')])
 
         old_e = expected['b/d/e']
-        expected['b/d/e'] = (old_e[0], [('r', 'h/e', 0, False, ''),
+        expected[b'b/d/e'] = (old_e[0], [(b'r', b'h/e', 0, False, b''),
                              old_e[1][1]])
-        expected['h/e'] = (('h', 'e', b'e-id'), [old_e[1][0],
-                                                ('r', 'b/d/e', 0, False, '')])
+        expected[b'h/e'] = ((b'h', b'e', b'e-id'), [old_e[1][0],
+                                                (b'r', b'b/d/e', 0, False, b'')])
 
         state.unlock()
         try:
@@ -391,8 +391,8 @@
         # There are no files on disk and no parents
         tree = self.make_branch_and_tree('tree')
         expected_result = ([], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
         state._validate()
@@ -401,12 +401,12 @@
     def test_1_parents_empty_to_dirstate(self):
         # create a parent by doing a commit
         tree = self.make_branch_and_tree('tree')
-        rev_id = tree.commit('first post').encode('utf8')
+        rev_id = tree.commit('first post')
         root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
         expected_result = ([rev_id], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
-              ('d', '', 0, False, rev_id), # first parent details
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
+              (b'd', b'', 0, False, rev_id), # first parent details
              ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
         self.check_state_with_reopen(expected_result, state)
@@ -424,10 +424,10 @@
         rev_id2 = tree2.commit('second post', allow_pointless=True)
         tree.merge_from_branch(tree2.branch)
         expected_result = ([rev_id, rev_id2], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
-              ('d', '', 0, False, rev_id), # first parent details
-              ('d', '', 0, False, rev_id), # second parent details
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
+              (b'd', b'', 0, False, rev_id), # first parent details
+              (b'd', b'', 0, False, rev_id), # second parent details
              ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
         self.check_state_with_reopen(expected_result, state)
@@ -443,8 +443,8 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/unknown'])
         expected_result = ([], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
         self.check_state_with_reopen(expected_result, state)
@@ -460,11 +460,11 @@
         # There are files on disk and no parents
         tree = self.get_tree_with_a_file()
         expected_result = ([], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ]),
-            (('', 'a file', b'a-file-id'), # common
-             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
+            ((b'', b'a file', b'a-file-id'), # common
+             [(b'f', b'', 0, False, dirstate.DirState.NULLSTAT), # current
              ]),
             ])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
@@ -473,18 +473,18 @@
     def test_1_parents_not_empty_to_dirstate(self):
         # create a parent by doing a commit
         tree = self.get_tree_with_a_file()
-        rev_id = tree.commit('first post').encode('utf8')
+        rev_id = tree.commit('first post')
         # change the current content to be different this will alter stat, sha
         # and length:
         self.build_tree_contents([('tree/a file', b'new content\n')])
         expected_result = ([rev_id], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
-              ('d', '', 0, False, rev_id), # first parent details
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
+              (b'd', b'', 0, False, rev_id), # first parent details
              ]),
-            (('', 'a file', b'a-file-id'), # common
-             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
-              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
+            ((b'', b'a file', b'a-file-id'), # common
+             [(b'f', b'', 0, False, dirstate.DirState.NULLSTAT), # current
+              (b'f', b'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
                rev_id), # first parent
              ]),
             ])
@@ -494,27 +494,27 @@
     def test_2_parents_not_empty_to_dirstate(self):
         # create a parent by doing a commit
         tree = self.get_tree_with_a_file()
-        rev_id = tree.commit('first post').encode('utf8')
+        rev_id = tree.commit('first post')
         tree2 = tree.controldir.sprout('tree2').open_workingtree()
         # change the current content to be different this will alter stat, sha
         # and length:
-        self.build_tree_contents([('tree2/a file', 'merge content\n')])
-        rev_id2 = tree2.commit('second post').encode('utf8')
+        self.build_tree_contents([('tree2/a file', b'merge content\n')])
+        rev_id2 = tree2.commit('second post')
         tree.merge_from_branch(tree2.branch)
         # change the current content to be different this will alter stat, sha
         # and length again, giving us three distinct values:
         self.build_tree_contents([('tree/a file', b'new content\n')])
         expected_result = ([rev_id, rev_id2], [
-            (('', '', tree.get_root_id()), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
-              ('d', '', 0, False, rev_id), # first parent details
-              ('d', '', 0, False, rev_id), # second parent details
+            ((b'', b'', tree.get_root_id()), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
+              (b'd', b'', 0, False, rev_id), # first parent details
+              (b'd', b'', 0, False, rev_id), # second parent details
              ]),
-            (('', 'a file', b'a-file-id'), # common
-             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
-              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
+            ((b'', b'a file', b'a-file-id'), # common
+             [(b'f', b'', 0, False, dirstate.DirState.NULLSTAT), # current
+              (b'f', b'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
                rev_id), # first parent
-              ('f', '314d796174c9412647c3ce07dfb5d36a94e72958', 14, False,
+              (b'f', b'314d796174c9412647c3ce07dfb5d36a94e72958', 14, False,
                rev_id2), # second parent
              ]),
             ])
@@ -530,8 +530,8 @@
         for i in range(7):
             tree = self.make_branch_and_tree('tree%d' % i)
             self.build_tree(['tree%d/name' % i,])
-            tree.add(['name'], ['file-id%d' % i])
-            revision_id = 'revid-%d' % i
+            tree.add(['name'], [b'file-id%d' % i])
+            revision_id = b'revid-%d' % i
             tree.commit('message', rev_id=revision_id)
             parents.append((revision_id,
                 tree.branch.repository.revision_tree(revision_id)))
@@ -570,11 +570,11 @@
         # get a state object
         # no parents, default tree content
         expected_result = ([], [
-            (('', '', tree.get_root_id()), # common details
+            ((b'', b'', tree.get_root_id()), # common details
              # current tree details, but new from_tree skips statting, it
              # uses set_state_from_inventory, and thus depends on the
              # inventory state.
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT),
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),
              ])
             ])
         state = dirstate.DirState.on_file('dirstate')
@@ -595,7 +595,7 @@
     def test_can_save_in_read_lock(self):
         state = self.create_updated_dirstate()
         try:
-            entry = state._get_entry(0, path_utf8='a-file')
+            entry = state._get_entry(0, path_utf8=b'a-file')
             # The current size should be 0 (default)
             self.assertEqual(0, entry[1][0][2])
             # We should have a real entry.
@@ -625,7 +625,7 @@
         state = dirstate.DirState.on_file('dirstate')
         state.lock_read()
         try:
-            entry = state._get_entry(0, path_utf8='a-file')
+            entry = state._get_entry(0, path_utf8=b'a-file')
             self.assertEqual(st.st_size, entry[1][0][2])
         finally:
             state.unlock()
@@ -634,7 +634,7 @@
         """If dirstate is locked, save will fail without complaining."""
         state = self.create_updated_dirstate()
         try:
-            entry = state._get_entry(0, path_utf8='a-file')
+            entry = state._get_entry(0, path_utf8=b'a-file')
             # No cached sha1 yet.
             self.assertEqual('', entry[1][0][1])
             # Set the cutoff-time into the future, so things look cacheable
@@ -671,7 +671,7 @@
         state = dirstate.DirState.on_file('dirstate')
         state.lock_read()
         try:
-            entry = state._get_entry(0, path_utf8='a-file')
+            entry = state._get_entry(0, path_utf8=b'a-file')
             self.assertEqual('', entry[1][0][1])
         finally:
             state.unlock()
@@ -681,17 +681,17 @@
         state = dirstate.DirState.initialize('dirstate')
         try:
             # No stat and no sha1 sum.
-            state.add('a-file', b'a-file-id', 'file', None, '')
+            state.add('a-file', b'a-file-id', 'file', None, b'')
             state.save()
         finally:
             state.unlock()
 
         # The dirstate should include TREE_ROOT and 'a-file' and nothing else
         expected_blocks = [
-            ('', [(('', '', b'TREE_ROOT'),
-                   [('d', '', 0, False, dirstate.DirState.NULLSTAT)])]),
-            ('', [(('', 'a-file', b'a-file-id'),
-                   [('f', '', 0, False, dirstate.DirState.NULLSTAT)])]),
+            (b'', [((b'', b'', b'TREE_ROOT'),
+                   [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT)])]),
+            (b'', [((b'', b'a-file', b'a-file-id'),
+                   [(b'f', b'', 0, False, dirstate.DirState.NULLSTAT)])]),
         ]
 
         state = dirstate.DirState.on_file('dirstate')
@@ -701,7 +701,7 @@
             self.assertEqual(expected_blocks, state._dirblocks)
 
             # Now modify the state, but mark it as inconsistent
-            state.add(b'a-dir', b'a-dir-id', 'directory', None, '')
+            state.add('a-dir', b'a-dir-id', 'directory', None, b'')
             state._changes_aborted = True
             state.save()
         finally:
@@ -720,8 +720,8 @@
 
     def test_initialize(self):
         expected_result = ([], [
-            (('', '', 'TREE_ROOT'), # common details
-             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', b'TREE_ROOT'), # common details
+             [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ])
             ])
         state = dirstate.DirState.initialize('dirstate')
@@ -752,15 +752,15 @@
         state = self.create_dirstate_with_root_and_subdir()
         self.addCleanup(state.unlock)
         id_index = state._get_id_index()
-        self.assertEqual(['a-root-value', b'subdir-id'], sorted(id_index))
+        self.assertEqual([b'a-root-value', b'subdir-id'], sorted(id_index))
         state.add('file-name', b'file-id', 'file', None, '')
-        self.assertEqual(['a-root-value', b'file-id', b'subdir-id'],
-                         sorted(id_index))
-        state.update_minimal(('', 'new-name', b'file-id'), 'f',
-                             path_utf8='new-name')
-        self.assertEqual(['a-root-value', b'file-id', b'subdir-id'],
-                         sorted(id_index))
-        self.assertEqual([('', 'new-name', b'file-id')],
+        self.assertEqual([b'a-root-value', b'file-id', b'subdir-id'],
+                         sorted(id_index))
+        state.update_minimal((b'', b'new-name', b'file-id'), b'f',
+                             path_utf8=b'new-name')
+        self.assertEqual([b'a-root-value', b'file-id', b'subdir-id'],
+                         sorted(id_index))
+        self.assertEqual([(b'', b'new-name', b'file-id')],
                          sorted(id_index[b'file-id']))
         state._validate()
 
@@ -770,8 +770,8 @@
         inv = tree1.root_inventory
         root_id = inv.path2id('')
         expected_result = [], [
-            (('', '', root_id), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
+            ((b'', b'', root_id), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT)])]
         state = dirstate.DirState.initialize('dirstate')
         try:
             state.set_state_from_inventory(inv)
@@ -791,8 +791,8 @@
         inv = tree1.root_inventory
         root_id = inv.path2id('')
         expected_result = [], [
-            (('', '', root_id), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
+            ((b'', b'', root_id), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT)])]
         state = dirstate.DirState.initialize('dirstate')
         try:
             state.set_state_from_scratch(inv, [], [])
@@ -812,10 +812,10 @@
         inv = tree1.root_inventory
         root_id = inv.path2id('')
         rev_tree1 = tree1.branch.repository.revision_tree(revid1)
-        d_entry = ('d', '', 0, False, dirstate.DirState.NULLSTAT)
-        parent_entry = ('d', '', 0, False, revid1)
+        d_entry = (b'd', b'', 0, False, dirstate.DirState.NULLSTAT)
+        parent_entry = (b'd', b'', 0, False, revid1)
         expected_result = [revid1], [
-            (('', '', root_id), [d_entry, parent_entry])]
+            ((b'', b'', root_id), [d_entry, parent_entry])]
         state = dirstate.DirState.initialize('dirstate')
         try:
             state.set_state_from_scratch(inv, [(revid1, rev_tree1)], [])
@@ -837,8 +837,7 @@
 
         tree = self.make_branch_and_tree('.')
         # depends on the default format using dirstate...
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             # make a dirstate with some valid hashcache data
             # file on disk, but that's not needed for this test
             foo_contents = b'contents of foo'
@@ -852,19 +851,19 @@
 
             # should not be cached yet, because the file's too fresh
             self.assertEqual(
-                (('', 'foo', 'foo-id',),
-                 [('f', '', 0, False, dirstate.DirState.NULLSTAT)]),
-                tree._dirstate._get_entry(0, 'foo-id'))
+                ((b'', b'foo', b'foo-id',),
+                 [(b'f', b'', 0, False, dirstate.DirState.NULLSTAT)]),
+                tree._dirstate._get_entry(0, b'foo-id'))
             # poke in some hashcache information - it wouldn't normally be
             # stored because it's too fresh
             tree._dirstate.update_minimal(
-                ('', 'foo', 'foo-id'),
-                'f', False, foo_sha, foo_packed, foo_size, 'foo')
+                (b'', b'foo', b'foo-id'),
+                b'f', False, foo_sha, foo_packed, foo_size, b'foo')
             # now should be cached
             self.assertEqual(
-                (('', 'foo', 'foo-id',),
-                 [('f', foo_sha, foo_size, False, foo_packed)]),
-                tree._dirstate._get_entry(0, 'foo-id'))
+                ((b'', b'foo', b'foo-id',),
+                 [(b'f', foo_sha, foo_size, False, foo_packed)]),
+                tree._dirstate._get_entry(0, b'foo-id'))
 
             # extract the inventory, and add something to it
             inv = tree._get_root_inventory()
@@ -876,22 +875,17 @@
             # this used to cause it to lose its hashcache
             tree._dirstate.set_state_from_inventory(inv)
             tree._dirstate._validate()
-        finally:
-            tree.unlock()
 
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             # now check that the state still has the original hashcache value
             state = tree._dirstate
             state._validate()
-            foo_tuple = state._get_entry(0, path_utf8='foo')
+            foo_tuple = state._get_entry(0, path_utf8=b'foo')
             self.assertEqual(
-                (('', 'foo', 'foo-id',),
+                (('', 'foo', b'foo-id',),
                  [('f', foo_sha, len(foo_contents), False,
                    dirstate.pack_stat(foo_stat))]),
                 foo_tuple)
-        finally:
-            tree.unlock()
 
     def test_set_state_from_inventory_mixed_paths(self):
         tree1 = self.make_branch_and_tree('tree1')
@@ -900,23 +894,23 @@
         tree1.lock_write()
         try:
             tree1.add(['a', 'a/b', 'a-b', 'a/b/foo', 'a-b/bar'],
-                      ['a-id', 'b-id', 'a-b-id', 'foo-id', 'bar-id'])
+                      [b'a-id', b'b-id', b'a-b-id', b'foo-id', b'bar-id'])
             tree1.commit('rev1', rev_id=b'rev1')
             root_id = tree1.get_root_id()
             inv = tree1.root_inventory
         finally:
             tree1.unlock()
-        expected_result1 = [('', '', root_id, 'd'),
-                            ('', 'a', 'a-id', 'd'),
-                            ('', 'a-b', 'a-b-id', 'd'),
-                            ('a', 'b', 'b-id', 'd'),
-                            ('a/b', 'foo', 'foo-id', 'f'),
-                            ('a-b', 'bar', 'bar-id', 'f'),
+        expected_result1 = [(b'', b'', root_id, b'd'),
+                            (b'', b'a', b'a-id', b'd'),
+                            (b'', b'a-b', b'a-b-id', b'd'),
+                            (b'a', b'b', b'b-id', b'd'),
+                            (b'a/b', b'foo', b'foo-id', b'f'),
+                            (b'a-b', b'bar', b'bar-id', b'f'),
                            ]
-        expected_result2 = [('', '', root_id, 'd'),
-                            ('', 'a', 'a-id', 'd'),
-                            ('', 'a-b', 'a-b-id', 'd'),
-                            ('a-b', 'bar', 'bar-id', 'f'),
+        expected_result2 = [(b'', b'', root_id, b'd'),
+                            (b'', b'a', b'a-id', b'd'),
+                            (b'', b'a-b', b'a-b-id', b'd'),
+                            (b'a-b', b'bar', b'bar-id', b'f'),
                            ]
         state = dirstate.DirState.initialize('dirstate')
         try:
@@ -925,7 +919,7 @@
             for entry in state._iter_entries():
                 values.append(entry[0] + entry[1][0][:1])
             self.assertEqual(expected_result1, values)
-            inv.delete('b-id')
+            inv.delete(b'b-id')
             state.set_state_from_inventory(inv)
             values = []
             for entry in state._iter_entries():
@@ -939,23 +933,23 @@
         state = dirstate.DirState.initialize('dirstate')
         try:
             # check precondition to be sure the state does change appropriately.
-            root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
+            root_entry = ((b'', b'', b'TREE_ROOT'), [(b'd', b'', 0, False, b'x'*32)])
             self.assertEqual([root_entry], list(state._iter_entries()))
-            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
+            self.assertEqual(root_entry, state._get_entry(0, path_utf8=b''))
             self.assertEqual(root_entry,
-                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
+                             state._get_entry(0, fileid_utf8=b'TREE_ROOT'))
             self.assertEqual((None, None),
-                             state._get_entry(0, fileid_utf8='second-root-id'))
-            state.set_path_id('', 'second-root-id')
-            new_root_entry = (('', '', 'second-root-id'),
-                              [('d', '', 0, False, 'x'*32)])
+                             state._get_entry(0, fileid_utf8=b'second-root-id'))
+            state.set_path_id('', b'second-root-id')
+            new_root_entry = ((b'', b'', b'second-root-id'),
+                              [(b'd', b'', 0, False, b'x'*32)])
             expected_rows = [new_root_entry]
             self.assertEqual(expected_rows, list(state._iter_entries()))
-            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
-            self.assertEqual(new_root_entry, 
-                             state._get_entry(0, fileid_utf8='second-root-id'))
+            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=b''))
+            self.assertEqual(new_root_entry,
+                             state._get_entry(0, fileid_utf8=b'second-root-id'))
             self.assertEqual((None, None),
-                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
+                             state._get_entry(0, fileid_utf8=b'TREE_ROOT'))
             # should work across save too
             state.save()
         finally:
@@ -978,37 +972,37 @@
         state = dirstate.DirState.initialize('dirstate')
         state._validate()
         try:
-            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
-            root_entry = (('', '', 'TREE_ROOT'),
-                          [('d', '', 0, False, 'x'*32),
-                           ('d', '', 0, False, 'parent-revid')])
-            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
+            state.set_parent_trees([(b'parent-revid', rt)], ghosts=[])
+            root_entry = ((b'', b'', b'TREE_ROOT'),
+                          [(b'd', b'', 0, False, b'x'*32),
+                           (b'd', b'', 0, False, b'parent-revid')])
+            self.assertEqual(root_entry, state._get_entry(0, path_utf8=b''))
             self.assertEqual(root_entry,
-                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
+                             state._get_entry(0, fileid_utf8=b'TREE_ROOT'))
             self.assertEqual((None, None),
-                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
-            state.set_path_id('', 'Asecond-root-id')
+                             state._get_entry(0, fileid_utf8=b'Asecond-root-id'))
+            state.set_path_id(b'', b'Asecond-root-id')
             state._validate()
             # now see that it is what we expected
-            old_root_entry = (('', '', 'TREE_ROOT'),
-                              [('a', '', 0, False, ''),
-                               ('d', '', 0, False, 'parent-revid')])
-            new_root_entry = (('', '', 'Asecond-root-id'),
-                              [('d', '', 0, False, ''),
-                               ('a', '', 0, False, '')])
+            old_root_entry = ((b'', b'', b'TREE_ROOT'),
+                              [(b'a', b'', 0, False, b''),
+                               (b'd', b'', 0, False, b'parent-revid')])
+            new_root_entry = ((b'', b'', b'Asecond-root-id'),
+                              [(b'd', b'', 0, False, b''),
+                               (b'a', b'', 0, False, b'')])
             expected_rows = [new_root_entry, old_root_entry]
             state._validate()
             self.assertEqual(expected_rows, list(state._iter_entries()))
-            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
-            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
+            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=b''))
+            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=b''))
             self.assertEqual((None, None),
-                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
+                             state._get_entry(0, fileid_utf8=b'TREE_ROOT'))
             self.assertEqual(old_root_entry,
-                             state._get_entry(1, fileid_utf8='TREE_ROOT'))
+                             state._get_entry(1, fileid_utf8=b'TREE_ROOT'))
             self.assertEqual(new_root_entry,
-                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
+                             state._get_entry(0, fileid_utf8=b'Asecond-root-id'))
             self.assertEqual((None, None),
-                             state._get_entry(1, fileid_utf8='Asecond-root-id'))
+                             state._get_entry(1, fileid_utf8=b'Asecond-root-id'))
             # should work across save too
             state.save()
         finally:
@@ -1025,7 +1019,7 @@
         state.lock_write()
         try:
             state._validate()
-            state.set_path_id('', 'tree-root-2')
+            state.set_path_id(b'', b'tree-root-2')
             state._validate()
         finally:
             state.unlock()
@@ -1049,12 +1043,12 @@
             tree2.unlock()
         state = dirstate.DirState.initialize('dirstate')
         try:
-            state.set_path_id('', root_id)
+            state.set_path_id(b'', root_id)
             state.set_parent_trees(
                 ((revid1, tree1.branch.repository.revision_tree(revid1)),
                  (revid2, tree2.branch.repository.revision_tree(revid2)),
-                 ('ghost-rev', None)),
-                ['ghost-rev'])
+                 (b'ghost-rev', None)),
+                [b'ghost-rev'])
             # check we can reopen and use the dirstate after setting parent
             # trees.
             state._validate()
@@ -1065,31 +1059,31 @@
         state = dirstate.DirState.on_file('dirstate')
         state.lock_write()
         try:
-            self.assertEqual([revid1, revid2, 'ghost-rev'],
+            self.assertEqual([revid1, revid2, b'ghost-rev'],
                              state.get_parent_ids())
             # iterating the entire state ensures that the state is parsable.
             list(state._iter_entries())
             # be sure that it sets not appends - change it
             state.set_parent_trees(
                 ((revid1, tree1.branch.repository.revision_tree(revid1)),
-                 ('ghost-rev', None)),
-                ['ghost-rev'])
+                 (b'ghost-rev', None)),
+                [b'ghost-rev'])
             # and now put it back.
             state.set_parent_trees(
                 ((revid1, tree1.branch.repository.revision_tree(revid1)),
                  (revid2, tree2.branch.repository.revision_tree(revid2)),
-                 ('ghost-rev', tree2.branch.repository.revision_tree(
+                 (b'ghost-rev', tree2.branch.repository.revision_tree(
                                    _mod_revision.NULL_REVISION))),
-                ['ghost-rev'])
-            self.assertEqual([revid1, revid2, 'ghost-rev'],
+                [b'ghost-rev'])
+            self.assertEqual([revid1, revid2, b'ghost-rev'],
                              state.get_parent_ids())
             # the ghost should be recorded as such by set_parent_trees.
-            self.assertEqual(['ghost-rev'], state.get_ghosts())
+            self.assertEqual([b'ghost-rev'], state.get_ghosts())
             self.assertEqual(
-                [(('', '', root_id), [
-                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
-                  ('d', '', 0, False, revid1),
-                  ('d', '', 0, False, revid1)
+                [((b'', b'', root_id), [
+                  (b'd', b'', 0, False, dirstate.DirState.NULLSTAT),
+                  (b'd', b'', 0, False, revid1),
+                  (b'd', b'', 0, False, revid1)
                   ])],
                 list(state._iter_entries()))
         finally:
@@ -1120,22 +1114,22 @@
             tree2.unlock()
         # check the layout in memory
         expected_result = [revid1.encode('utf8'), revid2.encode('utf8')], [
-            (('', '', root_id), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
-             ('d', '', 0, False, revid1.encode('utf8')),
-             ('d', '', 0, False, revid1.encode('utf8'))
+            ((b'', b'', root_id), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT),
+             (b'd', b'', 0, False, revid1.encode('utf8')),
+             (b'd', b'', 0, False, revid1.encode('utf8'))
              ]),
-            (('', 'a file', b'file-id'), [
-             ('a', '', 0, False, ''),
-             ('f', '2439573625385400f2a669657a7db6ae7515d371', 12, False,
+            ((b'', 'a file', b'file-id'), [
+             (b'a', b'', 0, False, ''),
+             (b'f', b'2439573625385400f2a669657a7db6ae7515d371', 12, False,
               revid1.encode('utf8')),
-             ('f', '542e57dc1cda4af37cb8e55ec07ce60364bb3c7d', 16, False,
+             (b'f', b'542e57dc1cda4af37cb8e55ec07ce60364bb3c7d', 16, False,
               revid2.encode('utf8'))
              ])
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
-            state.set_path_id('', root_id)
+            state.set_path_id(b'', root_id)
             state.set_parent_trees(
                 ((revid1, tree1.branch.repository.revision_tree(revid1)),
                  (revid2, tree2.branch.repository.revision_tree(revid2)),
@@ -1158,15 +1152,15 @@
         # the 1*20 is the sha1 pretend value.
         state = dirstate.DirState.initialize('dirstate')
         expected_entries = [
-            (('', '', b'TREE_ROOT'), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', b'TREE_ROOT'), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ]),
-            (('', 'a file', b'a-file-id'), [
-             ('f', '1'*20, 19, False, dirstate.pack_stat(stat)), # current tree
+            ((b'', b'a file', b'a-file-id'), [
+             (b'f', b'1'*20, 19, False, dirstate.pack_stat(stat)), # current tree
              ]),
             ]
         try:
-            state.add('a file', b'a-file-id', 'file', stat, '1'*20)
+            state.add('a file', b'a-file-id', 'file', stat, b'1'*20)
             # having added it, it should be in the output of iter_entries.
             self.assertEqual(expected_entries, list(state._iter_entries()))
             # saving and reloading should not affect this.
@@ -1189,7 +1183,7 @@
         state = dirstate.DirState.initialize('dirstate')
         self.addCleanup(state.unlock)
         self.assertRaises(errors.NotVersionedError, state.add,
-                          'unversioned/a file', 'a-file-id', 'file', None, None)
+                          'unversioned/a file', b'a-file-id', 'file', None, None)
 
     def test_add_directory_to_root_no_parents_all_data(self):
         # The most trivial addition of a dir is when there are no parents and
@@ -1197,16 +1191,16 @@
         self.build_tree(['a dir/'])
         stat = os.lstat('a dir')
         expected_entries = [
-            (('', '', 'TREE_ROOT'), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', b'TREE_ROOT'), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ]),
-            (('', 'a dir', 'a dir id'), [
-             ('d', '', 0, False, dirstate.pack_stat(stat)), # current tree
+            ((b'', b'a dir', b'a dir id'), [
+             (b'd', b'', 0, False, dirstate.pack_stat(stat)), # current tree
              ]),
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
-            state.add('a dir', 'a dir id', 'directory', stat, None)
+            state.add('a dir', b'a dir id', 'directory', stat, None)
             # having added it, it should be in the output of iter_entries.
             self.assertEqual(expected_entries, list(state._iter_entries()))
             # saving and reloading should not affect this.
@@ -1227,17 +1221,17 @@
         os.symlink(target, link_name)
         stat = os.lstat(link_name)
         expected_entries = [
-            (('', '', 'TREE_ROOT'), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
+            ((b'', b'', b'TREE_ROOT'), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
              ]),
-            (('', link_name.encode('UTF-8'), 'a link id'), [
-             ('l', target.encode('UTF-8'), stat[6],
+            ((b'', link_name.encode('UTF-8'), b'a link id'), [
+             (b'l', target.encode('UTF-8'), stat[6],
               False, dirstate.pack_stat(stat)), # current tree
              ]),
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
-            state.add(link_name, 'a link id', 'symlink', stat,
+            state.add(link_name, b'a link id', 'symlink', stat,
                       target.encode('UTF-8'))
             # having added it, it should be in the output of iter_entries.
             self.assertEqual(expected_entries, list(state._iter_entries()))
@@ -1264,21 +1258,21 @@
         dirstat = os.lstat('a dir')
         filestat = os.lstat('a dir/a file')
         expected_entries = [
-            (('', '', 'TREE_ROOT'), [
-             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
-             ]),
-            (('', 'a dir', 'a dir id'), [
-             ('d', '', 0, False, dirstate.pack_stat(dirstat)), # current tree
-             ]),
-            (('a dir', 'a file', 'a-file-id'), [
-             ('f', '1'*20, 25, False,
+            ((b'', b'', b'TREE_ROOT'), [
+             (b'd', b'', 0, False, dirstate.DirState.NULLSTAT), # current tree
+             ]),
+            ((b'', b'a dir', b'a dir id'), [
+             (b'd', b'', 0, False, dirstate.pack_stat(dirstat)), # current tree
+             ]),
+            ((b'a dir', b'a file', b'a-file-id'), [
+             (b'f', b'1'*20, 25, False,
               dirstate.pack_stat(filestat)), # current tree details
              ]),
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
             state.add('a dir', b'a dir id', 'directory', dirstat, None)
-            state.add('a dir/a file', b'a-file-id', 'file', filestat, '1'*20)
+            state.add('a dir/a file', b'a-file-id', 'file', filestat, b'1'*20)
             # added it, it should be in the output of iter_entries.
             self.assertEqual(expected_entries, list(state._iter_entries()))
             # saving and reloading should not affect this.
@@ -1294,13 +1288,13 @@
         # make a dirstate and add a tree reference
         state = dirstate.DirState.initialize('dirstate')
         expected_entry = (
-            ('', 'subdir', b'subdir-id'),
-            [('t', 'subtree-123123', 0, False,
-              'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')],
+            (b'', b'subdir', b'subdir-id'),
+            [(b't', b'subtree-123123', 0, False,
+              b'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')],
             )
         try:
-            state.add('subdir', b'subdir-id', 'tree-reference', None, 'subtree-123123')
-            entry = state._get_entry(0, b'subdir-id', 'subdir')
+            state.add('subdir', b'subdir-id', 'tree-reference', None, b'subtree-123123')
+            entry = state._get_entry(0, b'subdir-id', b'subdir')
             self.assertEqual(entry, expected_entry)
             state._validate()
             state.save()
@@ -1310,7 +1304,7 @@
         state.lock_read()
         self.addCleanup(state.unlock)
         state._validate()
-        entry2 = state._get_entry(0, b'subdir-id', 'subdir')
+        entry2 = state._get_entry(0, b'subdir-id', b'subdir')
         self.assertEqual(entry, entry2)
         self.assertEqual(entry, expected_entry)
         # and lookup by id should work too
@@ -1321,9 +1315,9 @@
         state = dirstate.DirState.initialize('dirstate')
         self.addCleanup(state.unlock)
         self.assertRaises(errors.BzrError,
-            state.add, '.', 'ass-id', 'directory', None, None)
+            state.add, '.', b'ass-id', 'directory', None, None)
         self.assertRaises(errors.BzrError,
-            state.add, '..', 'ass-id', 'directory', None, None)
+            state.add, '..', b'ass-id', 'directory', None, None)
 
     def test_set_state_with_rename_b_a_bug_395556(self):
         # bug 395556 uncovered a bug where the dirstate ends up with a false
@@ -1342,11 +1336,11 @@
             try:
                 # Set the initial state with 'b'
                 state.set_state_from_inventory(inv)
-                inv.rename('b-id', root_id, 'a')
+                inv.rename(b'b-id', root_id, 'a')
                 # Set the new state with 'a', which currently corrupts.
                 state.set_state_from_inventory(inv)
-                expected_result1 = [('', '', root_id, 'd'),
-                                    ('', 'a', 'b-id', 'f'),
+                expected_result1 = [(b'', b'', root_id, b'd'),
+                                    (b'', b'a', b'b-id', b'f'),
                                    ]
                 values = []
                 for entry in state._iter_entries():
@@ -1419,15 +1413,15 @@
     def test_get_line_with_2_rows(self):
         state = self.create_dirstate_with_root_and_subdir()
         try:
-            self.assertEqual(['#bazaar dirstate flat format 3\n',
-                'crc32: 41262208\n',
-                'num_entries: 2\n',
-                '0\x00\n\x00'
-                '0\x00\n\x00'
-                '\x00\x00a-root-value\x00'
-                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
-                '\x00subdir\x00subdir-id\x00'
-                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
+            self.assertEqual([b'#bazaar dirstate flat format 3\n',
+                b'crc32: 41262208\n',
+                b'num_entries: 2\n',
+                b'0\x00\n\x00'
+                b'0\x00\n\x00'
+                b'\x00\x00a-root-value\x00'
+                b'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
+                b'\x00subdir\x00subdir-id\x00'
+                b'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
                 ], state.get_lines())
         finally:
             state.unlock()
@@ -1436,45 +1430,45 @@
         state = self.create_dirstate_with_root()
         try:
             self.assertEqual(
-                '\x00\x00a-root-value\x00d\x00\x000\x00n'
-                '\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk',
+                b'\x00\x00a-root-value\x00d\x00\x000\x00n'
+                b'\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk',
                 state._entry_to_line(state._dirblocks[0][1][0]))
         finally:
             state.unlock()
 
     def test_entry_to_line_with_parent(self):
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        root_entry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat), # current tree details
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        root_entry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat), # current tree details
              # first: a pointer to the current location
-            ('a', 'dirname/basename', 0, False, ''),
+            (b'a', b'dirname/basename', 0, False, b''),
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
             self.assertEqual(
-                '\x00\x00a-root-value\x00'
-                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
-                'a\x00dirname/basename\x000\x00n\x00',
+                b'\x00\x00a-root-value\x00'
+                b'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
+                b'a\x00dirname/basename\x000\x00n\x00',
                 state._entry_to_line(root_entry))
         finally:
             state.unlock()
 
     def test_entry_to_line_with_two_parents_at_different_paths(self):
         # / in the tree, at / in one parent and /dirname/basename in the other.
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        root_entry = ('', '', 'a-root-value'), [
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        root_entry = ('', '', b'a-root-value'), [
             ('d', '', 0, False, packed_stat), # current tree details
-            ('d', '', 0, False, 'rev_id'), # first parent details
+            ('d', '', 0, False, b'rev_id'), # first parent details
              # second: a pointer to the current location
             ('a', 'dirname/basename', 0, False, ''),
             ]
         state = dirstate.DirState.initialize('dirstate')
         try:
             self.assertEqual(
-                '\x00\x00a-root-value\x00'
-                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
-                'd\x00\x000\x00n\x00rev_id\x00'
-                'a\x00dirname/basename\x000\x00n\x00',
+                b'\x00\x00a-root-value\x00'
+                b'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
+                b'd\x00\x000\x00n\x00rev_id\x00'
+                b'a\x00dirname/basename\x000\x00n\x00',
                 state._entry_to_line(root_entry))
         finally:
             state.unlock()
@@ -1482,22 +1476,22 @@
     def test_iter_entries(self):
         # we should be able to iterate the dirstate entries from end to end
         # this is for get_lines to be easy to read.
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
         dirblocks = []
-        root_entries = [(('', '', 'a-root-value'), [
+        root_entries = [(('', '', b'a-root-value'), [
             ('d', '', 0, False, packed_stat), # current tree details
             ])]
         dirblocks.append(('', root_entries))
         # add two files in the root
-        subdir_entry = ('', 'subdir', 'subdir-id'), [
+        subdir_entry = ('', 'subdir', b'subdir-id'), [
             ('d', '', 0, False, packed_stat), # current tree details
             ]
-        afile_entry = ('', 'afile', 'afile-id'), [
+        afile_entry = ('', 'afile', b'afile-id'), [
             ('f', 'sha1value', 34, False, packed_stat), # current tree details
             ]
         dirblocks.append(('', [subdir_entry, afile_entry]))
         # and one in subdir
-        file_entry2 = ('subdir', '2file', '2file-id'), [
+        file_entry2 = ('subdir', '2file', b'2file-id'), [
             ('f', 'sha1value', 23, False, packed_stat), # current tree details
             ]
         dirblocks.append(('subdir', [file_entry2]))
@@ -1583,33 +1577,33 @@
     def test_simple_structure(self):
         state = self.create_dirstate_with_root_and_subdir()
         self.addCleanup(state.unlock)
-        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
-        self.assertEntryEqual('', 'subdir', 'subdir-id', state, 'subdir', 0)
-        self.assertEntryEqual(None, None, None, state, 'missing', 0)
-        self.assertEntryEqual(None, None, None, state, 'missing/foo', 0)
-        self.assertEntryEqual(None, None, None, state, 'subdir/foo', 0)
+        self.assertEntryEqual(b'', b'', b'a-root-value', state, b'', 0)
+        self.assertEntryEqual(b'', b'subdir', b'subdir-id', state, b'subdir', 0)
+        self.assertEntryEqual(None, None, None, state, b'missing', 0)
+        self.assertEntryEqual(None, None, None, state, b'missing/foo', 0)
+        self.assertEntryEqual(None, None, None, state, b'subdir/foo', 0)
 
     def test_complex_structure_exists(self):
         state = self.create_complex_dirstate()
         self.addCleanup(state.unlock)
-        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
-        self.assertEntryEqual('', 'a', 'a-dir', state, 'a', 0)
-        self.assertEntryEqual('', 'b', 'b-dir', state, 'b', 0)
-        self.assertEntryEqual('', 'c', 'c-file', state, 'c', 0)
-        self.assertEntryEqual('', 'd', 'd-file', state, 'd', 0)
-        self.assertEntryEqual('a', 'e', 'e-dir', state, 'a/e', 0)
-        self.assertEntryEqual('a', 'f', 'f-file', state, 'a/f', 0)
-        self.assertEntryEqual('b', 'g', 'g-file', state, 'b/g', 0)
-        self.assertEntryEqual('b', 'h\xc3\xa5', 'h-\xc3\xa5-file', state,
-                              'b/h\xc3\xa5', 0)
+        self.assertEntryEqual(b'', b'', b'a-root-value', state, b'', 0)
+        self.assertEntryEqual(b'', b'a', b'a-dir', state, b'a', 0)
+        self.assertEntryEqual(b'', b'b', b'b-dir', state, b'b', 0)
+        self.assertEntryEqual(b'', b'c', b'c-file', state, b'c', 0)
+        self.assertEntryEqual(b'', b'd', b'd-file', state, b'd', 0)
+        self.assertEntryEqual(b'a', b'e', b'e-dir', state, b'a/e', 0)
+        self.assertEntryEqual(b'a', b'f', b'f-file', state, b'a/f', 0)
+        self.assertEntryEqual(b'b', b'g', b'g-file', state, b'b/g', 0)
+        self.assertEntryEqual(b'b', b'h\xc3\xa5', b'h-\xc3\xa5-file', state,
+                              b'b/h\xc3\xa5', 0)
 
     def test_complex_structure_missing(self):
         state = self.create_complex_dirstate()
         self.addCleanup(state.unlock)
-        self.assertEntryEqual(None, None, None, state, '_', 0)
-        self.assertEntryEqual(None, None, None, state, '_\xc3\xa5', 0)
-        self.assertEntryEqual(None, None, None, state, 'a/b', 0)
-        self.assertEntryEqual(None, None, None, state, 'c/d', 0)
+        self.assertEntryEqual(None, None, None, state, b'_', 0)
+        self.assertEntryEqual(None, None, None, state, b'_\xc3\xa5', 0)
+        self.assertEntryEqual(None, None, None, state, b'a/b', 0)
+        self.assertEntryEqual(None, None, None, state, b'c/d', 0)
 
     def test_get_entry_uninitialized(self):
         """Calling get_entry will load data if it needs to"""
@@ -1626,7 +1620,7 @@
                              state._header_state)
             self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
                              state._dirblock_state)
-            self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
+            self.assertEntryEqual(b'', b'', b'a-root-value', state, b'', 0)
         finally:
             state.unlock()
 
@@ -1656,66 +1650,66 @@
 
         :return: The dirstate, still write-locked.
         """
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        null_sha = b'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
         NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
-        root_entry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, 'parent-revid'),
-            ]
-        a_entry = ('', 'a', 'a-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, 'parent-revid'),
-            ]
-        b_entry = ('', 'b', 'b-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, 'parent-revid'),
-            ]
-        c_entry = ('', 'c', 'c-file'), [
-            ('f', null_sha, 10, False, packed_stat),
-            ('r', 'b/j', 0, False, ''),
-            ]
-        d_entry = ('', 'd', 'd-file'), [
-            ('f', null_sha, 20, False, packed_stat),
-            ('f', 'd', 20, False, 'parent-revid'),
-            ]
-        e_entry = ('a', 'e', 'e-dir'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, 'parent-revid'),
-            ]
-        f_entry = ('a', 'f', 'f-file'), [
-            ('f', null_sha, 30, False, packed_stat),
-            ('f', 'f', 20, False, 'parent-revid'),
-            ]
-        g_entry = ('b', 'g', 'g-file'), [
-            ('f', null_sha, 30, False, packed_stat),
-            NULL_PARENT_DETAILS,
-            ]
-        h_entry1 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file1'), [
-            ('f', null_sha, 40, False, packed_stat),
-            NULL_PARENT_DETAILS,
-            ]
-        h_entry2 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file2'), [
-            NULL_PARENT_DETAILS,
-            ('f', 'h', 20, False, 'parent-revid'),
-            ]
-        i_entry = ('b', 'i', 'i-file'), [
-            NULL_PARENT_DETAILS,
-            ('f', 'h', 20, False, 'parent-revid'),
-            ]
-        j_entry = ('b', 'j', 'c-file'), [
-            ('r', 'c', 0, False, ''),
-            ('f', 'j', 20, False, 'parent-revid'),
+        root_entry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, b'parent-revid'),
+            ]
+        a_entry = (b'', b'a', b'a-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, b'parent-revid'),
+            ]
+        b_entry = (b'', b'b', b'b-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, b'parent-revid'),
+            ]
+        c_entry = (b'', b'c', b'c-file'), [
+            (b'f', null_sha, 10, False, packed_stat),
+            (b'r', b'b/j', 0, False, b''),
+            ]
+        d_entry = (b'', b'd', b'd-file'), [
+            (b'f', null_sha, 20, False, packed_stat),
+            (b'f', b'd', 20, False, b'parent-revid'),
+            ]
+        e_entry = (b'a', b'e', b'e-dir'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, b'parent-revid'),
+            ]
+        f_entry = (b'a', b'f', b'f-file'), [
+            (b'f', null_sha, 30, False, packed_stat),
+            (b'f', b'f', 20, False, b'parent-revid'),
+            ]
+        g_entry = (b'b', b'g', b'g-file'), [
+            (b'f', null_sha, 30, False, packed_stat),
+            NULL_PARENT_DETAILS,
+            ]
+        h_entry1 = (b'b', b'h\xc3\xa5', b'h-\xc3\xa5-file1'), [
+            (b'f', null_sha, 40, False, packed_stat),
+            NULL_PARENT_DETAILS,
+            ]
+        h_entry2 = (b'b', b'h\xc3\xa5', b'h-\xc3\xa5-file2'), [
+            NULL_PARENT_DETAILS,
+            (b'f', b'h', 20, False, b'parent-revid'),
+            ]
+        i_entry = (b'b', b'i', b'i-file'), [
+            NULL_PARENT_DETAILS,
+            (b'f', b'h', 20, False, b'parent-revid'),
+            ]
+        j_entry = (b'b', b'j', b'c-file'), [
+            (b'r', b'c', 0, False, b''),
+            (b'f', b'j', 20, False, b'parent-revid'),
             ]
         dirblocks = []
-        dirblocks.append(('', [root_entry]))
-        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
-        dirblocks.append(('a', [e_entry, f_entry]))
-        dirblocks.append(('b', [g_entry, h_entry1, h_entry2, i_entry, j_entry]))
+        dirblocks.append((b'', [root_entry]))
+        dirblocks.append((b'', [a_entry, b_entry, c_entry, d_entry]))
+        dirblocks.append((b'a', [e_entry, f_entry]))
+        dirblocks.append((b'b', [g_entry, h_entry1, h_entry2, i_entry, j_entry]))
         state = dirstate.DirState.initialize('dirstate')
         state._validate()
         try:
-            state._set_data(['parent'], dirblocks)
+            state._set_data([b'parent'], dirblocks)
         except:
             state.unlock()
             raise
@@ -1760,21 +1754,21 @@
         dirs = ['a', 'a/a', 'a/a/a', 'a/a/a/a',
                 'a-a', 'a/a-a', 'a/a/a-a', 'a/a/a/a-a',
                ]
-        null_sha = ''
+        null_sha = b''
         state = dirstate.DirState.initialize('dirstate')
         self.addCleanup(state.unlock)
 
         fake_stat = os.stat('dirstate')
         for d in dirs:
-            d_id = d.replace('/', '_')+'-id'
+            d_id = d.encode('utf-8').replace(b'/', b'_')+b'-id'
             file_path = d + '/f'
-            file_id = file_path.replace('/', '_')+'-id'
+            file_id = file_path.encode('utf-8').replace(b'/', b'_')+b'-id'
             state.add(d, d_id, 'directory', fake_stat, null_sha)
             state.add(file_path, file_id, 'file', fake_stat, null_sha)
 
-        expected = ['', '', 'a',
-                'a/a', 'a/a/a', 'a/a/a/a',
-                'a/a/a/a-a', 'a/a/a-a', 'a/a-a', 'a-a',
+        expected = [b'', b'', b'a',
+                b'a/a', b'a/a/a', b'a/a/a/a',
+                b'a/a/a/a-a', b'a/a/a-a', b'a/a-a', b'a-a',
                ]
         split = lambda p:p.split('/')
         self.assertEqual(sorted(expected, key=split), expected)
@@ -1784,19 +1778,19 @@
     def test_set_parent_trees_correct_order(self):
         """After calling set_parent_trees() we should maintain the order."""
         dirs = ['a', 'a-a', 'a/a']
-        null_sha = ''
+        null_sha = b''
         state = dirstate.DirState.initialize('dirstate')
         self.addCleanup(state.unlock)
 
         fake_stat = os.stat('dirstate')
         for d in dirs:
-            d_id = d.replace('/', '_')+'-id'
+            d_id = d.encode('utf-8').replace(b'/', b'_')+b'-id'
             file_path = d + '/f'
-            file_id = file_path.replace('/', '_')+'-id'
+            file_id = file_path.encode('utf-8').replace(b'/', b'_')+b'-id'
             state.add(d, d_id, 'directory', fake_stat, null_sha)
             state.add(file_path, file_id, 'file', fake_stat, null_sha)
 
-        expected = ['', '', 'a', 'a/a', 'a-a']
+        expected = [b'', b'', b'a', b'a/a', b'a-a']
         dirblock_names = [d[0] for d in state._dirblocks]
         self.assertEqual(expected, dirblock_names)
 
@@ -1879,25 +1873,25 @@
     def test_pack_stat_int(self):
         st = _FakeStat(6859, 1172758614, 1172758617, 777, 6499538, 0o100644)
         # Make sure that all parameters have an impact on the packed stat.
-        self.assertPackStat('AAAay0Xm4FZF5uBZAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAay0Xm4FZF5uBZAAADCQBjLNIAAIGk', st)
         st.st_size = 7000
         #                ay0 => bWE
-        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
         st.st_mtime = 1172758620
         #                     4FZ => 4Fx
-        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
         st.st_ctime = 1172758630
         #                          uBZ => uBm
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
         st.st_dev = 888
         #                                DCQ => DeA
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADeABjLNIAAIGk', st)
         st.st_ino = 6499540
         #                                     LNI => LNQ
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADeABjLNQAAIGk', st)
         st.st_mode = 0o100744
         #                                          IGk => IHk
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIHk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADeABjLNQAAIHk', st)
 
     def test_pack_stat_float(self):
         """On some platforms mtime and ctime are floats.
@@ -1908,18 +1902,18 @@
         st = _FakeStat(7000, 1172758614.0, 1172758617.0,
                        777, 6499538, 0o100644)
         # These should all be the same as the integer counterparts
-        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
         st.st_mtime = 1172758620.0
         #                     FZF5 => FxF5
-        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
         st.st_ctime = 1172758630.0
         #                          uBZ => uBm
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
         # fractional seconds are discarded, so no change from above
         st.st_mtime = 1172758620.453
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
         st.st_ctime = 1172758630.228
-        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
+        self.assertPackStat(b'AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
 
 
 class TestBisect(TestCaseWithDirState):
@@ -2003,162 +1997,162 @@
         tree, state, expected = self.create_basic_dirstate()
 
         # Bisect should return the rows for the specified files.
-        self.assertBisect(expected, [['']], state, [''])
-        self.assertBisect(expected, [['a']], state, ['a'])
-        self.assertBisect(expected, [['b']], state, ['b'])
-        self.assertBisect(expected, [['b/c']], state, ['b/c'])
-        self.assertBisect(expected, [['b/d']], state, ['b/d'])
-        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
-        self.assertBisect(expected, [['b-c']], state, ['b-c'])
-        self.assertBisect(expected, [['f']], state, ['f'])
+        self.assertBisect(expected, [[b'']], state, [b''])
+        self.assertBisect(expected, [[b'a']], state, [b'a'])
+        self.assertBisect(expected, [[b'b']], state, [b'b'])
+        self.assertBisect(expected, [[b'b/c']], state, [b'b/c'])
+        self.assertBisect(expected, [[b'b/d']], state, [b'b/d'])
+        self.assertBisect(expected, [[b'b/d/e']], state, [b'b/d/e'])
+        self.assertBisect(expected, [[b'b-c']], state, [b'b-c'])
+        self.assertBisect(expected, [[b'f']], state, [b'f'])
 
     def test_bisect_multi(self):
         """Bisect can be used to find multiple records at the same time."""
         tree, state, expected = self.create_basic_dirstate()
         # Bisect should be capable of finding multiple entries at the same time
-        self.assertBisect(expected, [['a'], ['b'], ['f']],
-                          state, ['a', 'b', 'f'])
-        self.assertBisect(expected, [['f'], ['b/d'], ['b/d/e']],
-                          state, ['f', 'b/d', 'b/d/e'])
-        self.assertBisect(expected, [['b'], ['b-c'], ['b/c']],
-                          state, ['b', 'b-c', 'b/c'])
+        self.assertBisect(expected, [[b'a'], [b'b'], [b'f']],
+                          state, [b'a', b'b', b'f'])
+        self.assertBisect(expected, [[b'f'], [b'b/d'], [b'b/d/e']],
+                          state, [b'f', b'b/d', b'b/d/e'])
+        self.assertBisect(expected, [[b'b'], [b'b-c'], [b'b/c']],
+                          state, [b'b', b'b-c', b'b/c'])
 
     def test_bisect_one_page(self):
         """Test bisect when there is only 1 page to read"""
         tree, state, expected = self.create_basic_dirstate()
         state._bisect_page_size = 5000
-        self.assertBisect(expected, [['']], state, [''])
-        self.assertBisect(expected, [['a']], state, ['a'])
-        self.assertBisect(expected, [['b']], state, ['b'])
-        self.assertBisect(expected, [['b/c']], state, ['b/c'])
-        self.assertBisect(expected, [['b/d']], state, ['b/d'])
-        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
-        self.assertBisect(expected, [['b-c']], state, ['b-c'])
-        self.assertBisect(expected, [['f']], state, ['f'])
-        self.assertBisect(expected, [['a'], ['b'], ['f']],
-                          state, ['a', 'b', 'f'])
-        self.assertBisect(expected, [['b/d'], ['b/d/e'], ['f']],
-                          state, ['b/d', 'b/d/e', 'f'])
-        self.assertBisect(expected, [['b'], ['b/c'], ['b-c']],
-                          state, ['b', 'b/c', 'b-c'])
+        self.assertBisect(expected, [[b'']], state, [b''])
+        self.assertBisect(expected, [[b'a']], state, [b'a'])
+        self.assertBisect(expected, [[b'b']], state, [b'b'])
+        self.assertBisect(expected, [[b'b/c']], state, [b'b/c'])
+        self.assertBisect(expected, [[b'b/d']], state, [b'b/d'])
+        self.assertBisect(expected, [[b'b/d/e']], state, [b'b/d/e'])
+        self.assertBisect(expected, [[b'b-c']], state, [b'b-c'])
+        self.assertBisect(expected, [[b'f']], state, [b'f'])
+        self.assertBisect(expected, [[b'a'], [b'b'], [b'f']],
+                          state, [b'a', b'b', b'f'])
+        self.assertBisect(expected, [[b'b/d'], [b'b/d/e'], [b'f']],
+                          state, [b'b/d', b'b/d/e', b'f'])
+        self.assertBisect(expected, [[b'b'], [b'b/c'], [b'b-c']],
+                          state, [b'b', b'b/c', b'b-c'])
 
     def test_bisect_duplicate_paths(self):
         """When bisecting for a path, handle multiple entries."""
         tree, state, expected = self.create_duplicated_dirstate()
 
         # Now make sure that both records are properly returned.
-        self.assertBisect(expected, [['']], state, [''])
-        self.assertBisect(expected, [['a', 'a2']], state, ['a'])
-        self.assertBisect(expected, [['b', 'b2']], state, ['b'])
-        self.assertBisect(expected, [['b/c', 'b/c2']], state, ['b/c'])
-        self.assertBisect(expected, [['b/d', 'b/d2']], state, ['b/d'])
-        self.assertBisect(expected, [['b/d/e', 'b/d/e2']],
-                          state, ['b/d/e'])
-        self.assertBisect(expected, [['b-c', 'b-c2']], state, ['b-c'])
-        self.assertBisect(expected, [['f', 'f2']], state, ['f'])
+        self.assertBisect(expected, [[b'']], state, [b''])
+        self.assertBisect(expected, [[b'a', b'a2']], state, [b'a'])
+        self.assertBisect(expected, [[b'b', b'b2']], state, [b'b'])
+        self.assertBisect(expected, [[b'b/c', b'b/c2']], state, [b'b/c'])
+        self.assertBisect(expected, [[b'b/d', b'b/d2']], state, [b'b/d'])
+        self.assertBisect(expected, [[b'b/d/e', b'b/d/e2']],
+                          state, [b'b/d/e'])
+        self.assertBisect(expected, [[b'b-c', b'b-c2']], state, [b'b-c'])
+        self.assertBisect(expected, [[b'f', b'f2']], state, [b'f'])
 
     def test_bisect_page_size_too_small(self):
         """If the page size is too small, we will auto increase it."""
         tree, state, expected = self.create_basic_dirstate()
         state._bisect_page_size = 50
-        self.assertBisect(expected, [None], state, ['b/e'])
-        self.assertBisect(expected, [['a']], state, ['a'])
-        self.assertBisect(expected, [['b']], state, ['b'])
-        self.assertBisect(expected, [['b/c']], state, ['b/c'])
-        self.assertBisect(expected, [['b/d']], state, ['b/d'])
-        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
-        self.assertBisect(expected, [['b-c']], state, ['b-c'])
-        self.assertBisect(expected, [['f']], state, ['f'])
+        self.assertBisect(expected, [None], state, [b'b/e'])
+        self.assertBisect(expected, [[b'a']], state, [b'a'])
+        self.assertBisect(expected, [[b'b']], state, [b'b'])
+        self.assertBisect(expected, [[b'b/c']], state, [b'b/c'])
+        self.assertBisect(expected, [[b'b/d']], state, [b'b/d'])
+        self.assertBisect(expected, [[b'b/d/e']], state, [b'b/d/e'])
+        self.assertBisect(expected, [[b'b-c']], state, [b'b-c'])
+        self.assertBisect(expected, [[b'f']], state, [b'f'])
 
     def test_bisect_missing(self):
         """Test that bisect return None if it cannot find a path."""
         tree, state, expected = self.create_basic_dirstate()
-        self.assertBisect(expected, [None], state, ['foo'])
-        self.assertBisect(expected, [None], state, ['b/foo'])
-        self.assertBisect(expected, [None], state, ['bar/foo'])
-        self.assertBisect(expected, [None], state, ['b-c/foo'])
+        self.assertBisect(expected, [None], state, [b'foo'])
+        self.assertBisect(expected, [None], state, [b'b/foo'])
+        self.assertBisect(expected, [None], state, [b'bar/foo'])
+        self.assertBisect(expected, [None], state, [b'b-c/foo'])
 
-        self.assertBisect(expected, [['a'], None, ['b/d']],
-                          state, ['a', 'foo', 'b/d'])
+        self.assertBisect(expected, [[b'a'], None, [b'b/d']],
+                          state, [b'a', b'foo', b'b/d'])
 
     def test_bisect_rename(self):
         """Check that we find a renamed row."""
         tree, state, expected = self.create_renamed_dirstate()
 
         # Search for the pre and post renamed entries
-        self.assertBisect(expected, [['a']], state, ['a'])
-        self.assertBisect(expected, [['b/g']], state, ['b/g'])
-        self.assertBisect(expected, [['b/d']], state, ['b/d'])
-        self.assertBisect(expected, [['h']], state, ['h'])
+        self.assertBisect(expected, [[b'a']], state, [b'a'])
+        self.assertBisect(expected, [[b'b/g']], state, [b'b/g'])
+        self.assertBisect(expected, [[b'b/d']], state, [b'b/d'])
+        self.assertBisect(expected, [[b'h']], state, [b'h'])
 
         # What about b/d/e? shouldn't that also get 2 directory entries?
-        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
-        self.assertBisect(expected, [['h/e']], state, ['h/e'])
+        self.assertBisect(expected, [[b'b/d/e']], state, [b'b/d/e'])
+        self.assertBisect(expected, [[b'h/e']], state, [b'h/e'])
 
     def test_bisect_dirblocks(self):
         tree, state, expected = self.create_duplicated_dirstate()
         self.assertBisectDirBlocks(expected,
-            [['', 'a', 'a2', 'b', 'b2', 'b-c', 'b-c2', 'f', 'f2']],
-            state, [''])
-        self.assertBisectDirBlocks(expected,
-            [['b/c', 'b/c2', 'b/d', 'b/d2']], state, ['b'])
-        self.assertBisectDirBlocks(expected,
-            [['b/d/e', 'b/d/e2']], state, ['b/d'])
-        self.assertBisectDirBlocks(expected,
-            [['', 'a', 'a2', 'b', 'b2', 'b-c', 'b-c2', 'f', 'f2'],
-             ['b/c', 'b/c2', 'b/d', 'b/d2'],
-             ['b/d/e', 'b/d/e2'],
-            ], state, ['', 'b', 'b/d'])
+            [[b'', b'a', b'a2', b'b', b'b2', b'b-c', b'b-c2', b'f', b'f2']],
+            state, [b''])
+        self.assertBisectDirBlocks(expected,
+            [[b'b/c', b'b/c2', b'b/d', b'b/d2']], state, [b'b'])
+        self.assertBisectDirBlocks(expected,
+            [[b'b/d/e', b'b/d/e2']], state, [b'b/d'])
+        self.assertBisectDirBlocks(expected,
+            [[b'', b'a', b'a2', b'b', b'b2', b'b-c', b'b-c2', b'f', b'f2'],
+             [b'b/c', b'b/c2', b'b/d', b'b/d2'],
+             [b'b/d/e', b'b/d/e2'],
+            ], state, [b'', b'b', b'b/d'])
 
     def test_bisect_dirblocks_missing(self):
         tree, state, expected = self.create_basic_dirstate()
-        self.assertBisectDirBlocks(expected, [['b/d/e'], None],
-            state, ['b/d', 'b/e'])
+        self.assertBisectDirBlocks(expected, [[b'b/d/e'], None],
+            state, [b'b/d', b'b/e'])
         # Files don't show up in this search
-        self.assertBisectDirBlocks(expected, [None], state, ['a'])
-        self.assertBisectDirBlocks(expected, [None], state, ['b/c'])
-        self.assertBisectDirBlocks(expected, [None], state, ['c'])
-        self.assertBisectDirBlocks(expected, [None], state, ['b/d/e'])
-        self.assertBisectDirBlocks(expected, [None], state, ['f'])
+        self.assertBisectDirBlocks(expected, [None], state, [b'a'])
+        self.assertBisectDirBlocks(expected, [None], state, [b'b/c'])
+        self.assertBisectDirBlocks(expected, [None], state, [b'c'])
+        self.assertBisectDirBlocks(expected, [None], state, [b'b/d/e'])
+        self.assertBisectDirBlocks(expected, [None], state, [b'f'])
 
     def test_bisect_recursive_each(self):
         tree, state, expected = self.create_basic_dirstate()
-        self.assertBisectRecursive(expected, ['a'], state, ['a'])
-        self.assertBisectRecursive(expected, ['b/c'], state, ['b/c'])
-        self.assertBisectRecursive(expected, ['b/d/e'], state, ['b/d/e'])
-        self.assertBisectRecursive(expected, ['b-c'], state, ['b-c'])
-        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
-                                   state, ['b/d'])
-        self.assertBisectRecursive(expected, ['b', 'b/c', 'b/d', 'b/d/e'],
-                                   state, ['b'])
-        self.assertBisectRecursive(expected, ['', 'a', 'b', 'b-c', 'f', 'b/c',
-                                              'b/d', 'b/d/e'],
-                                   state, [''])
+        self.assertBisectRecursive(expected, [b'a'], state, [b'a'])
+        self.assertBisectRecursive(expected, [b'b/c'], state, [b'b/c'])
+        self.assertBisectRecursive(expected, [b'b/d/e'], state, [b'b/d/e'])
+        self.assertBisectRecursive(expected, [b'b-c'], state, [b'b-c'])
+        self.assertBisectRecursive(expected, [b'b/d', b'b/d/e'],
+                                   state, [b'b/d'])
+        self.assertBisectRecursive(expected, [b'b', b'b/c', b'b/d', b'b/d/e'],
+                                   state, [b'b'])
+        self.assertBisectRecursive(expected, [b'', b'a', b'b', b'b-c', b'f', b'b/c',
+                                              b'b/d', b'b/d/e'],
+                                   state, [b''])
 
     def test_bisect_recursive_multiple(self):
         tree, state, expected = self.create_basic_dirstate()
-        self.assertBisectRecursive(expected, ['a', 'b/c'], state, ['a', 'b/c'])
-        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
-                                   state, ['b/d', 'b/d/e'])
+        self.assertBisectRecursive(expected, [b'a', b'b/c'], state, [b'a', b'b/c'])
+        self.assertBisectRecursive(expected, [b'b/d', b'b/d/e'],
+                                   state, [b'b/d', b'b/d/e'])
 
     def test_bisect_recursive_missing(self):
         tree, state, expected = self.create_basic_dirstate()
-        self.assertBisectRecursive(expected, [], state, ['d'])
-        self.assertBisectRecursive(expected, [], state, ['b/e'])
-        self.assertBisectRecursive(expected, [], state, ['g'])
-        self.assertBisectRecursive(expected, ['a'], state, ['a', 'g'])
+        self.assertBisectRecursive(expected, [], state, [b'd'])
+        self.assertBisectRecursive(expected, [], state, [b'b/e'])
+        self.assertBisectRecursive(expected, [], state, [b'g'])
+        self.assertBisectRecursive(expected, [b'a'], state, [b'a', b'g'])
 
     def test_bisect_recursive_renamed(self):
         tree, state, expected = self.create_renamed_dirstate()
 
         # Looking for either renamed item should find the other
-        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['a'])
-        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['b/g'])
+        self.assertBisectRecursive(expected, [b'a', b'b/g'], state, [b'a'])
+        self.assertBisectRecursive(expected, [b'a', b'b/g'], state, [b'b/g'])
         # Looking in the containing directory should find the rename target,
         # and anything in a subdir of the renamed target.
-        self.assertBisectRecursive(expected, ['a', 'b', 'b/c', 'b/d',
-                                              'b/d/e', 'b/g', 'h', 'h/e'],
-                                   state, ['b'])
+        self.assertBisectRecursive(expected, [b'a', b'b', b'b/c', b'b/d',
+                                              'b/d/e', b'b/g', b'h', b'h/e'],
+                                   state, [b'b'])
 
 
 class TestDirstateValidation(TestCaseWithDirState):
@@ -2181,9 +2175,9 @@
         # we're appending to the dirblock, but this name comes before some of
         # the existing names; that's wrong
         last_dirblock[1].append(
-            (('h', 'aaaa', 'a-id'),
-             [('a', '', 0, False, ''),
-              ('a', '', 0, False, '')]))
+            ((b'h', b'aaaa', b'a-id'),
+             [(b'a', b'', 0, False, b''),
+              (b'a', b'', 0, False, b'')]))
         e = self.assertRaises(AssertionError,
             state._validate)
         self.assertContainsRe(str(e), 'not sorted')
@@ -2194,9 +2188,9 @@
         last_dirblock = state._dirblocks[-1]
         # add an entry with the wrong directory name
         last_dirblock[1].append(
-            (('', 'z', 'a-id'),
-             [('a', '', 0, False, ''),
-              ('a', '', 0, False, '')]))
+            ((b'', b'z', b'a-id'),
+             [(b'a', b'', 0, False, b''),
+              (b'a', b'', 0, False, b'')]))
         e = self.assertRaises(AssertionError,
             state._validate)
         self.assertContainsRe(str(e),
@@ -2209,9 +2203,9 @@
         # make another entry for a-id, without a correct 'r' pointer to
         # the real occurrence in the working tree
         last_dirblock[1].append(
-            (('h', 'z', 'a-id'),
-             [('a', '', 0, False, ''),
-              ('a', '', 0, False, '')]))
+            ((b'h', b'z', b'a-id'),
+             [(b'a', b'', 0, False, b''),
+              (b'a', b'', 0, False, b'')]))
         e = self.assertRaises(AssertionError,
             state._validate)
         self.assertContainsRe(str(e),
@@ -2228,9 +2222,9 @@
         tree.add_reference(subtree)
         tree.add('subtree')
         state = dirstate.DirState.from_tree(tree, 'dirstate')
-        key = ('', 'subtree', 'subtree')
-        expected = ('', [(key,
-            [('t', '', 0, False, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])])
+        key = (b'', b'subtree', b'subtree')
+        expected = (b'', [(key,
+            [(b't', b'', 0, False, b'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])])
 
         try:
             self.assertEqual(expected, state._find_block(key))
@@ -2249,18 +2243,18 @@
 
     def test_discard_one_parent(self):
         # No-op
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        root_entry_direntry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, packed_stat),
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        root_entry_direntry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, packed_stat),
             ]
         dirblocks = []
-        dirblocks.append(('', [root_entry_direntry]))
-        dirblocks.append(('', []))
+        dirblocks.append((b'', [root_entry_direntry]))
+        dirblocks.append((b'', []))
 
         state = self.create_empty_dirstate()
         self.addCleanup(state.unlock)
-        state._set_data(['parent-id'], dirblocks[:])
+        state._set_data([b'parent-id'], dirblocks[:])
         state._validate()
 
         state._discard_merge_parents()
@@ -2269,42 +2263,42 @@
 
     def test_discard_simple(self):
         # No-op
-        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
-        root_entry_direntry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, packed_stat),
+        packed_stat = b'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
+        root_entry_direntry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, packed_stat),
             ]
-        expected_root_entry_direntry = ('', '', 'a-root-value'), [
-            ('d', '', 0, False, packed_stat),
-            ('d', '', 0, False, packed_stat),
+        expected_root_entry_direntry = (b'', b'', b'a-root-value'), [
+            (b'd', b'', 0, False, packed_stat),
+            (b'd', b'', 0, False, packed_stat),
             ]
         dirblocks = []
-        dirblocks.append(('', [root_entry_direntry]))
-        dirblocks.append(('', []))
+        dirblocks.append((b'', [root_entry_direntry]))
+        dirblocks.append((b'', []))
 
         state = self.create_empty_dirstate()
         self.addCleanup(state.unlock)
-        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
+        state._set_data([b'parent-id', b'merged-id'], dirblocks[:])
         state._validate()
 
         # This should strip of the extra column
         state._discard_merge_parents()
         state._validate()
-        expected_dirblocks = [('', [expected_root_entry_direntry]), ('', [])]
+        expected_dirblocks = [(b'', [expected_root_entry_direntry]), (b'', [])]
         self.assertEqual(expected_dirblocks, state._dirblocks)
 
     def test_discard_absent(self):
         """If entries are only in a merge, discard should remove the entries"""
         null_stat = dirstate.DirState.NULLSTAT
-        present_dir = ('d', '', 0, False, null_stat)
-        present_file = ('f', '', 0, False, null_stat)
+        present_dir = (b'd', b'', 0, False, null_stat)
+        present_file = (b'f', b'', 0, False, null_stat)
         absent = dirstate.DirState.NULL_PARENT_DETAILS
-        root_key = ('', '', 'a-root-value')
-        file_in_root_key = ('', 'file-in-root', 'a-file-id')
-        file_in_merged_key = ('', 'file-in-merged', 'b-file-id')
-        dirblocks = [('', [(root_key, [present_dir, present_dir, present_dir])]),
-                     ('', [(file_in_merged_key,
+        root_key = (b'', b'', b'a-root-value')
+        file_in_root_key = (b'', b'file-in-root', b'a-file-id')
+        file_in_merged_key = (b'', b'file-in-merged', b'b-file-id')
+        dirblocks = [(b'', [(root_key, [present_dir, present_dir, present_dir])]),
+                     (b'', [(file_in_merged_key,
                             [absent, absent, present_file]),
                            (file_in_root_key,
                             [present_file, present_file, present_file]),
@@ -2313,11 +2307,11 @@
 
         state = self.create_empty_dirstate()
         self.addCleanup(state.unlock)
-        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
+        state._set_data([b'parent-id', b'merged-id'], dirblocks[:])
         state._validate()
 
-        exp_dirblocks = [('', [(root_key, [present_dir, present_dir])]),
-                         ('', [(file_in_root_key,
+        exp_dirblocks = [(b'', [(root_key, [present_dir, present_dir])]),
+                         (b'', [(file_in_root_key,
                                 [present_file, present_file]),
                               ]),
                         ]
@@ -2327,42 +2321,42 @@
 
     def test_discard_renamed(self):
         null_stat = dirstate.DirState.NULLSTAT
-        present_dir = ('d', '', 0, False, null_stat)
-        present_file = ('f', '', 0, False, null_stat)
+        present_dir = (b'd', b'', 0, False, null_stat)
+        present_file = (b'f', b'', 0, False, null_stat)
         absent = dirstate.DirState.NULL_PARENT_DETAILS
-        root_key = ('', '', 'a-root-value')
-        file_in_root_key = ('', 'file-in-root', 'a-file-id')
+        root_key = (b'', b'', b'a-root-value')
+        file_in_root_key = (b'', b'file-in-root', b'a-file-id')
         # Renamed relative to parent
-        file_rename_s_key = ('', 'file-s', 'b-file-id')
-        file_rename_t_key = ('', 'file-t', 'b-file-id')
+        file_rename_s_key = (b'', b'file-s', b'b-file-id')
+        file_rename_t_key = (b'', b'file-t', b'b-file-id')
         # And one that is renamed between the parents, but absent in this
-        key_in_1 = ('', 'file-in-1', 'c-file-id')
-        key_in_2 = ('', 'file-in-2', 'c-file-id')
+        key_in_1 = (b'', b'file-in-1', b'c-file-id')
+        key_in_2 = (b'', b'file-in-2', b'c-file-id')
 
         dirblocks = [
-            ('', [(root_key, [present_dir, present_dir, present_dir])]),
-            ('', [(key_in_1,
-                   [absent, present_file, ('r', 'file-in-2', 'c-file-id')]),
+            (b'', [(root_key, [present_dir, present_dir, present_dir])]),
+            (b'', [(key_in_1,
+                   [absent, present_file, (b'r', b'file-in-2', b'c-file-id')]),
                   (key_in_2,
-                   [absent, ('r', 'file-in-1', 'c-file-id'), present_file]),
+                   [absent, (b'r', b'file-in-1', b'c-file-id'), present_file]),
                   (file_in_root_key,
                    [present_file, present_file, present_file]),
                   (file_rename_s_key,
-                   [('r', 'file-t', 'b-file-id'), absent, present_file]),
+                   [(b'r', b'file-t', b'b-file-id'), absent, present_file]),
                   (file_rename_t_key,
-                   [present_file, absent, ('r', 'file-s', 'b-file-id')]),
+                   [present_file, absent, (b'r', b'file-s', b'b-file-id')]),
                  ]),
         ]
         exp_dirblocks = [
-            ('', [(root_key, [present_dir, present_dir])]),
-            ('', [(key_in_1, [absent, present_file]),
+            (b'', [(root_key, [present_dir, present_dir])]),
+            (b'', [(key_in_1, [absent, present_file]),
                   (file_in_root_key, [present_file, present_file]),
                   (file_rename_t_key, [present_file, absent]),
                  ]),
         ]
         state = self.create_empty_dirstate()
         self.addCleanup(state.unlock)
-        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
+        state._set_data([b'parent-id', b'merged-id'], dirblocks[:])
         state._validate()
 
         state._discard_merge_parents()
@@ -2371,31 +2365,31 @@
 
     def test_discard_all_subdir(self):
         null_stat = dirstate.DirState.NULLSTAT
-        present_dir = ('d', '', 0, False, null_stat)
-        present_file = ('f', '', 0, False, null_stat)
+        present_dir = (b'd', b'', 0, False, null_stat)
+        present_file = (b'f', b'', 0, False, null_stat)
         absent = dirstate.DirState.NULL_PARENT_DETAILS
-        root_key = ('', '', 'a-root-value')
-        subdir_key = ('', 'sub', 'dir-id')
-        child1_key = ('sub', 'child1', 'child1-id')
-        child2_key = ('sub', 'child2', 'child2-id')
-        child3_key = ('sub', 'child3', 'child3-id')
+        root_key = (b'', b'', b'a-root-value')
+        subdir_key = (b'', b'sub', b'dir-id')
+        child1_key = (b'sub', b'child1', b'child1-id')
+        child2_key = (b'sub', b'child2', b'child2-id')
+        child3_key = (b'sub', b'child3', b'child3-id')
 
         dirblocks = [
-            ('', [(root_key, [present_dir, present_dir, present_dir])]),
-            ('', [(subdir_key, [present_dir, present_dir, present_dir])]),
-            ('sub', [(child1_key, [absent, absent, present_file]),
+            (b'', [(root_key, [present_dir, present_dir, present_dir])]),
+            (b'', [(subdir_key, [present_dir, present_dir, present_dir])]),
+            (b'sub', [(child1_key, [absent, absent, present_file]),
                      (child2_key, [absent, absent, present_file]),
                      (child3_key, [absent, absent, present_file]),
                     ]),
         ]
         exp_dirblocks = [
-            ('', [(root_key, [present_dir, present_dir])]),
-            ('', [(subdir_key, [present_dir, present_dir])]),
-            ('sub', []),
+            (b'', [(root_key, [present_dir, present_dir])]),
+            (b'', [(subdir_key, [present_dir, present_dir])]),
+            (b'sub', []),
         ]
         state = self.create_empty_dirstate()
         self.addCleanup(state.unlock)
-        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
+        state._set_data([b'parent-id', b'merged-id'], dirblocks[:])
         state._validate()
 
         state._discard_merge_parents()
@@ -2411,19 +2405,19 @@
         # details should always allow join() and always be a plain str when
         # finished
         (minikind, fingerprint, size, executable, tree_data) = details
-        self.assertIsInstance(minikind, str)
-        self.assertIsInstance(fingerprint, str)
-        self.assertIsInstance(tree_data, str)
+        self.assertIsInstance(minikind, bytes)
+        self.assertIsInstance(fingerprint, bytes)
+        self.assertIsInstance(tree_data, bytes)
 
     def test_unicode_symlink(self):
         inv_entry = inventory.InventoryLink(b'link-file-id',
                                             u'nam\N{Euro Sign}e',
                                             b'link-parent-id')
-        inv_entry.revision = 'link-revision-id'
+        inv_entry.revision = b'link-revision-id'
         target = u'link-targ\N{Euro Sign}t'
         inv_entry.symlink_target = target
-        self.assertDetails(('l', target.encode('UTF-8'), 0, False,
-                            'link-revision-id'), inv_entry)
+        self.assertDetails((b'l', target.encode('UTF-8'), 0, False,
+                            b'link-revision-id'), inv_entry)
 
 
 class TestSHA1Provider(tests.TestCaseInTempDir):
@@ -2477,20 +2471,20 @@
         try:
             dir_id = dir_ids[dirname]
         except KeyError:
-            dir_id = osutils.basename(dirname) + '-id'
+            dir_id = osutils.basename(dirname).encode('utf-8') + b'-id'
         if is_dir:
             ie = inventory.InventoryDirectory(file_id, basename, dir_id)
             dir_ids[path] = file_id
         else:
             ie = inventory.InventoryFile(file_id, basename, dir_id)
             ie.text_size = 0
-            ie.text_sha1 = ''
+            ie.text_sha1 = b''
         ie.revision = rev_id
         return ie
 
     def create_tree_from_shape(self, rev_id, shape):
-        dir_ids = {'': 'root-id'}
-        inv = inventory.Inventory('root-id', rev_id)
+        dir_ids = {'': b'root-id'}
+        inv = inventory.Inventory(b'root-id', rev_id)
         for info in shape:
             if len(info) == 2:
                 path, file_id = info
@@ -2517,7 +2511,7 @@
 
     def create_inv_delta(self, delta, rev_id):
         """Translate a 'delta shape' into an actual InventoryDelta"""
-        dir_ids = {'': 'root-id'}
+        dir_ids = {'': b'root-id'}
         inv_delta = []
         for old_path, new_path, file_id in delta:
             if old_path is not None and old_path.endswith('/'):
@@ -2539,18 +2533,18 @@
         and assert that the DirState is still valid, and that its stored
         content matches the target_shape.
         """
-        active_tree = self.create_tree_from_shape('active', active)
-        basis_tree = self.create_tree_from_shape('basis', basis)
-        target_tree = self.create_tree_from_shape('target', target)
+        active_tree = self.create_tree_from_shape(b'active', active)
+        basis_tree = self.create_tree_from_shape(b'basis', basis)
+        target_tree = self.create_tree_from_shape(b'target', target)
         state = self.create_empty_dirstate()
         state.set_state_from_scratch(active_tree.root_inventory,
-            [('basis', basis_tree)], [])
+            [(b'basis', basis_tree)], [])
         delta = target_tree.root_inventory._make_delta(
             basis_tree.root_inventory)
-        state.update_basis_by_delta(delta, 'target')
+        state.update_basis_by_delta(delta, b'target')
         state._validate()
         dirstate_tree = workingtree_4.DirStateRevisionTree(state,
-            'target', _Repo())
+            b'target', _Repo())
         # The target now that delta has been applied should match the
         # RevisionTree
         self.assertEqual([], list(dirstate_tree.iter_changes(target_tree)))
@@ -2558,7 +2552,7 @@
         # it from scratch.
         state2 = self.create_empty_dirstate()
         state2.set_state_from_scratch(active_tree.root_inventory,
-            [('target', target_tree)], [])
+            [(b'target', target_tree)], [])
         self.assertEqual(state2._dirblocks, state._dirblocks)
         return state
 
@@ -2570,18 +2564,18 @@
         :param delta: A description of the delta to apply. Similar to the form
             for regular inventory deltas, but omitting the InventoryEntry.
             So adding a file is: (None, 'path', b'file-id')
-            Adding a directory is: (None, 'path/', 'dir-id')
-            Renaming a dir is: ('old/', 'new/', 'dir-id')
+            Adding a directory is: (None, 'path/', b'dir-id')
+            Renaming a dir is: ('old/', 'new/', b'dir-id')
             etc.
         """
-        active_tree = self.create_tree_from_shape('active', active)
-        basis_tree = self.create_tree_from_shape('basis', basis)
-        inv_delta = self.create_inv_delta(delta, 'target')
+        active_tree = self.create_tree_from_shape(b'active', active)
+        basis_tree = self.create_tree_from_shape(b'basis', basis)
+        inv_delta = self.create_inv_delta(delta, b'target')
         state = self.create_empty_dirstate()
         state.set_state_from_scratch(active_tree.root_inventory,
-            [('basis', basis_tree)], [])
+            [(b'basis', basis_tree)], [])
         self.assertRaises(errors.InconsistentDelta,
-            state.update_basis_by_delta, inv_delta, 'target')
+            state.update_basis_by_delta, inv_delta, b'target')
         ## try:
         ##     state.update_basis_by_delta(inv_delta, 'target')
         ## except errors.InconsistentDelta, e:
@@ -2636,8 +2630,8 @@
     def test_add_file_in_empty_dir_not_matching_active_state(self):
         state = self.assertUpdate(
                 active=[],
-                basis=[('dir/', 'dir-id')],
-                target=[('dir/', 'dir-id', 'basis'), ('dir/file', b'file-id')],
+                basis=[('dir/', b'dir-id')],
+                target=[('dir/', b'dir-id', b'basis'), ('dir/file', b'file-id')],
                 )
 
     def test_add_file_missing_in_active_state(self):
@@ -2717,40 +2711,40 @@
 
     def test_rename_directory_with_contents(self):
         state = self.assertUpdate( # active matches basis
-            active=[('dir1/', 'dir-id'),
-                    ('dir1/file', b'file-id')],
-            basis= [('dir1/', 'dir-id'),
-                    ('dir1/file', b'file-id')],
-            target=[('dir2/', 'dir-id'),
+            active=[('dir1/', b'dir-id'),
+                    ('dir1/file', b'file-id')],
+            basis= [('dir1/', b'dir-id'),
+                    ('dir1/file', b'file-id')],
+            target=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')])
         state = self.assertUpdate( # active matches target
-            active=[('dir2/', 'dir-id'),
+            active=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')],
-            basis= [('dir1/', 'dir-id'),
+            basis= [('dir1/', b'dir-id'),
                     ('dir1/file', b'file-id')],
-            target=[('dir2/', 'dir-id'),
+            target=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')])
         state = self.assertUpdate( # active empty
             active=[],
-            basis= [('dir1/', 'dir-id'),
+            basis= [('dir1/', b'dir-id'),
                     ('dir1/file', b'file-id')],
-            target=[('dir2/', 'dir-id'),
+            target=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')])
         state = self.assertUpdate( # active present at other location
-            active=[('dir3/', 'dir-id'),
+            active=[('dir3/', b'dir-id'),
                     ('dir3/file', b'file-id')],
-            basis= [('dir1/', 'dir-id'),
+            basis= [('dir1/', b'dir-id'),
                     ('dir1/file', b'file-id')],
-            target=[('dir2/', 'dir-id'),
+            target=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')])
         state = self.assertUpdate( # active has different ids
-            active=[('dir1/', 'dir1-id'),
-                    ('dir1/file', 'file1-id'),
-                    ('dir2/', 'dir2-id'),
-                    ('dir2/file', 'file2-id')],
-            basis= [('dir1/', 'dir-id'),
+            active=[('dir1/', b'dir1-id'),
+                    ('dir1/file', b'file1-id'),
+                    ('dir2/', b'dir2-id'),
+                    ('dir2/file', b'file2-id')],
+            basis= [('dir1/', b'dir-id'),
                     ('dir1/file', b'file-id')],
-            target=[('dir2/', 'dir-id'),
+            target=[('dir2/', b'dir-id'),
                     ('dir2/file', b'file-id')])
 
     def test_invalid_file_not_present(self):
@@ -2785,11 +2779,11 @@
         # Note: we force the active tree to have the directory, by knowing how
         #       path_to_ie handles entries with missing parents
         state = self.assertBadDelta(
-            active=[('path/', 'path-id')],
+            active=[('path/', b'path-id')],
             basis= [],
             delta=[(None, 'path/path2', b'file-id')])
         state = self.assertBadDelta(
-            active=[('path/', 'path-id'),
+            active=[('path/', b'path-id'),
                     ('path/path2', b'file-id')],
             basis= [],
             delta=[(None, 'path/path2', b'file-id')])
@@ -2798,95 +2792,95 @@
         # We replace the parent directory, with another parent dir. But the C
         # file doesn't look like it has been moved.
         state = self.assertUpdate(# Same as basis
-            active=[('dir/', 'A-id'),
-                    ('dir/B', 'B-id')],
-            basis= [('dir/', 'A-id'),
-                    ('dir/B', 'B-id')],
-            target=[('dir/', 'C-id'),
-                    ('dir/B', 'B-id')])
+            active=[('dir/', b'A-id'),
+                    ('dir/B', b'B-id')],
+            basis= [('dir/', b'A-id'),
+                    ('dir/B', b'B-id')],
+            target=[('dir/', b'C-id'),
+                    ('dir/B', b'B-id')])
         state = self.assertUpdate(# Same as target
-            active=[('dir/', 'C-id'),
-                    ('dir/B', 'B-id')],
-            basis= [('dir/', 'A-id'),
-                    ('dir/B', 'B-id')],
-            target=[('dir/', 'C-id'),
-                    ('dir/B', 'B-id')])
+            active=[('dir/', b'C-id'),
+                    ('dir/B', b'B-id')],
+            basis= [('dir/', b'A-id'),
+                    ('dir/B', b'B-id')],
+            target=[('dir/', b'C-id'),
+                    ('dir/B', b'B-id')])
         state = self.assertUpdate(# empty active
             active=[],
-            basis= [('dir/', 'A-id'),
-                    ('dir/B', 'B-id')],
-            target=[('dir/', 'C-id'),
-                    ('dir/B', 'B-id')])
+            basis= [('dir/', b'A-id'),
+                    ('dir/B', b'B-id')],
+            target=[('dir/', b'C-id'),
+                    ('dir/B', b'B-id')])
         state = self.assertUpdate(# different active
-            active=[('dir/', 'D-id'),
-                    ('dir/B', 'B-id')],
-            basis= [('dir/', 'A-id'),
-                    ('dir/B', 'B-id')],
-            target=[('dir/', 'C-id'),
-                    ('dir/B', 'B-id')])
+            active=[('dir/', b'D-id'),
+                    ('dir/B', b'B-id')],
+            basis= [('dir/', b'A-id'),
+                    ('dir/B', b'B-id')],
+            target=[('dir/', b'C-id'),
+                    ('dir/B', b'B-id')])
 
     def test_parent_child_swap(self):
         state = self.assertUpdate(# Same as basis
-            active=[('A/', 'A-id'),
-                    ('A/B/', 'B-id'),
-                    ('A/B/C', 'C-id')],
-            basis= [('A/', 'A-id'),
-                    ('A/B/', 'B-id'),
-                    ('A/B/C', 'C-id')],
-            target=[('A/', 'B-id'),
-                    ('A/B/', 'A-id'),
-                    ('A/B/C', 'C-id')])
+            active=[('A/', b'A-id'),
+                    ('A/B/', b'B-id'),
+                    ('A/B/C', b'C-id')],
+            basis= [('A/', b'A-id'),
+                    ('A/B/', b'B-id'),
+                    ('A/B/C', b'C-id')],
+            target=[('A/', b'B-id'),
+                    ('A/B/', b'A-id'),
+                    ('A/B/C', b'C-id')])
         state = self.assertUpdate(# Same as target
-            active=[('A/', 'B-id'),
-                    ('A/B/', 'A-id'),
-                    ('A/B/C', 'C-id')],
-            basis= [('A/', 'A-id'),
-                    ('A/B/', 'B-id'),
-                    ('A/B/C', 'C-id')],
-            target=[('A/', 'B-id'),
-                    ('A/B/', 'A-id'),
-                    ('A/B/C', 'C-id')])
+            active=[('A/', b'B-id'),
+                    ('A/B/', b'A-id'),
+                    ('A/B/C', b'C-id')],
+            basis= [('A/', b'A-id'),
+                    ('A/B/', b'B-id'),
+                    ('A/B/C', b'C-id')],
+            target=[('A/', b'B-id'),
+                    ('A/B/', b'A-id'),
+                    ('A/B/C', b'C-id')])
         state = self.assertUpdate(# empty active
             active=[],
-            basis= [('A/', 'A-id'),
-                    ('A/B/', 'B-id'),
-                    ('A/B/C', 'C-id')],
-            target=[('A/', 'B-id'),
-                    ('A/B/', 'A-id'),
-                    ('A/B/C', 'C-id')])
+            basis= [('A/', b'A-id'),
+                    ('A/B/', b'B-id'),
+                    ('A/B/C', b'C-id')],
+            target=[('A/', b'B-id'),
+                    ('A/B/', b'A-id'),
+                    ('A/B/C', b'C-id')])
         state = self.assertUpdate(# different active
-            active=[('D/', 'A-id'),
-                    ('D/E/', 'B-id'),
-                    ('F', 'C-id')],
-            basis= [('A/', 'A-id'),
-                    ('A/B/', 'B-id'),
-                    ('A/B/C', 'C-id')],
-            target=[('A/', 'B-id'),
-                    ('A/B/', 'A-id'),
-                    ('A/B/C', 'C-id')])
+            active=[('D/', b'A-id'),
+                    ('D/E/', b'B-id'),
+                    ('F', b'C-id')],
+            basis= [('A/', b'A-id'),
+                    ('A/B/', b'B-id'),
+                    ('A/B/C', b'C-id')],
+            target=[('A/', b'B-id'),
+                    ('A/B/', b'A-id'),
+                    ('A/B/C', b'C-id')])
 
     def test_change_root_id(self):
         state = self.assertUpdate( # same as basis
-            active=[('', 'root-id'),
-                    ('file', b'file-id')],
-            basis= [('', 'root-id'),
-                    ('file', b'file-id')],
-            target=[('', 'target-root-id'),
+            active=[('', b'root-id'),
+                    ('file', b'file-id')],
+            basis= [('', b'root-id'),
+                    ('file', b'file-id')],
+            target=[('', b'target-root-id'),
                     ('file', b'file-id')])
         state = self.assertUpdate( # same as target
-            active=[('', 'target-root-id'),
-                    ('file', b'file-id')],
-            basis= [('', 'root-id'),
-                    ('file', b'file-id')],
-            target=[('', 'target-root-id'),
-                    ('file', 'root-id')])
+            active=[('', b'target-root-id'),
+                    ('file', b'file-id')],
+            basis= [('', b'root-id'),
+                    ('file', b'file-id')],
+            target=[('', b'target-root-id'),
+                    ('file', b'root-id')])
         state = self.assertUpdate( # all different
-            active=[('', 'active-root-id'),
-                    ('file', b'file-id')],
-            basis= [('', 'root-id'),
-                    ('file', b'file-id')],
-            target=[('', 'target-root-id'),
-                    ('file', 'root-id')])
+            active=[('', b'active-root-id'),
+                    ('file', b'file-id')],
+            basis= [('', b'root-id'),
+                    ('file', b'file-id')],
+            target=[('', b'target-root-id'),
+                    ('file', b'root-id')])
 
     def test_change_file_absent_in_active(self):
         state = self.assertUpdate(

=== modified file 'python3.passing'
--- python3.passing	2018-07-01 10:40:19 +0000
+++ python3.passing	2018-07-01 11:20:52 +0000
@@ -374,9 +374,15 @@
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(RemoteBranchFormat-default)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(RemoteBranchFormat-v2)
 breezy.plugins.upload.tests.test_upload.TestBranchUploadLocations.test_set_push_location(RemoteGitBranchFormat)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file_in_dir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file_in_dir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file_in_dir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_file(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_remote_dir_twice(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_remote_dir_twice(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_remote_dir_twice(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_symlink(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_symlink(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_create_symlink(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -389,6 +395,9 @@
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_file(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_file(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_file(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_nested_directory(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_nested_directory(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_nested_directory(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_regexp(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_regexp(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_ignore_regexp(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -407,12 +416,21 @@
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_auto(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_auto(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_auto(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_from_subdir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_from_subdir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_from_subdir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_noauto(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_noauto(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_noauto(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revision(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revision(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestFullUpload.test_upload_revision(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file_in_dir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file_in_dir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file_in_dir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_create_file(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -434,6 +452,9 @@
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_file(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_file(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_file(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_nested_directory(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_nested_directory(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_nested_directory(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_regexp(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_regexp(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_ignore_regexp(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -452,9 +473,15 @@
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_for_the_first_time_do_a_full_upload(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_for_the_first_time_do_a_full_upload(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_for_the_first_time_do_a_full_upload(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_from_subdir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_from_subdir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_from_subdir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_noauto(SFTPTransport,SFTPSiblingAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPAbsoluteServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPHomeDirServer)
+breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revid_path_in_dir(SFTPTransport,SFTPSiblingAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPAbsoluteServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPHomeDirServer)
 breezy.plugins.upload.tests.test_upload.TestIncrementalUpload.test_upload_revision(SFTPTransport,SFTPSiblingAbsoluteServer)
@@ -4888,7 +4915,9 @@
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterSameDataRepository,RepositoryFormatKnit3,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_interrepository.TestInterRepository.test_interrepository_get_returns_correct_optimiser(InterToLocalGitRepository,RepositoryFormat2a,GitRepositoryFormat)
 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(InterDirStateTree(PY))
 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(CHKInventory))
 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))
@@ -4896,7 +4925,9 @@
 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_content_modification(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestCompare.test_content_modification(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_content_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_content_modification(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_content_modification(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestCompare.test_dangling(InterDirStateTree(PY))
@@ -4908,35 +4939,49 @@
 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_and_c_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_and_c_only(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_and_c_only(InterTree(PreviewTree))
 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_a_only(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_only(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_a_only(InterTree(PreviewTree))
 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_b_only(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_b_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_b_only(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_b_only(InterTree(PreviewTree))
 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_c_only(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_c_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_c_only(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_empty_to_abc_content_c_only(InterTree(PreviewTree))
 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(InterDirStateTree(PY))
 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(CHKInventory))
 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_extra_trees_finds_ids(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_extra_trees_finds_ids(InterTree(PreviewTree))
 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(InterDirStateTree(PY))
 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(CHKInventory))
 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_and_modification(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_file_rename_and_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(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestCompare.test_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestCompare.test_meta_modification(InterTree(CHKInventory))
 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)
+breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestCompare.test_require_versioned(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestCompare.test_unchanged_with_renames_and_modifications(InterTree)
 breezy.tests.per_intertree.test_compare.TestCompare.test_unchanged_with_renames_and_modifications(InterTree(PreviewTree))
@@ -4947,12 +4992,15 @@
 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(CHKInventory))
 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(CHKInventory))
 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(CHKInventory))
 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))
@@ -4965,7 +5013,9 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_compare_subtrees(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_content_modification(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_content_modification(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_content_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_content_modification(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_content_modification(InterTree(PreviewTree))
 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)
@@ -4983,13 +5033,16 @@
 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(CHKInventory))
 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_a_only(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content_a_only(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_empty_to_abc_content_a_only(InterTree(PreviewTree))
 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(CHKInventory))
 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))
@@ -4997,22 +5050,29 @@
 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(InterDirStateTree(PY))
 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(CHKInventory))
 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_and_modification(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_file_rename_and_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(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_meta_modification(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_meta_modification(InterTree(CHKInventory))
 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(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_in_target(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_missing_in_target(InterTree(CHKInventory))
 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(CHKInventory))
 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))
@@ -5020,6 +5080,7 @@
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_target_and_missing(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_target_and_missing(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_target_missing_subtree_specific_bug_367632(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_only_in_target_missing_subtree_specific_bug_367632(InterTree(CHKInventory))
 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))
@@ -5032,35 +5093,47 @@
 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(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents(InterTree(PreviewTree))
 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_content_modification_grabs_parents_root_changes(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents_root_changes(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_content_modification_grabs_parents_root_changes(InterTree(PreviewTree))
 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_becomes_file(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_becomes_file(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_becomes_file(InterTree(PreviewTree))
 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_collides_with_unselected_new(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_collides_with_unselected_new(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_collides_with_unselected_new(InterTree(PreviewTree))
 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_child_dir_stops_being_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_dir_stops_being_dir(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_child_dir_stops_being_dir(InterTree(PreviewTree))
 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_old_parent_same_path_new_parent(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_same_path_new_parent(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_old_parent_same_path_new_parent(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_with_rename_under_dir_under_new_dir_reports_new_dir(InterTree)
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_with_rename_under_dir_under_new_dir_reports_new_dir(InterTree(PreviewTree))
 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_specific_with_rename_under_new_dir_reports_new_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_with_rename_under_new_dir_reports_new_dir(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_specific_with_rename_under_new_dir_reports_new_dir(InterTree(PreviewTree))
 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(CHKInventory))
 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_tree_with_special_names(InterDirStateTree(C))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_tree_with_special_names(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_tree_with_special_names(InterTree(CHKInventory))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_tree_with_special_names(InterTree(PreviewTree))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterDirStateTree(C))
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterDirStateTree(PY))
 breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterTree)
+breezy.tests.per_intertree.test_compare.TestIterChanges.test_unknown_empty_dir(InterTree(CHKInventory))
 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))
@@ -5829,9 +5902,12 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_dir_link(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_dir_link(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(GitRepositoryFormat)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat2a)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_dir(RepositoryFormat7)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_link(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_link(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_link(RepositoryFormat4)
@@ -5848,9 +5924,12 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_link(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_file_link(RepositoryFormatPackDevelopment2Subtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(GitRepositoryFormat)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat2a)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat4)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat6)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_dir(RepositoryFormat7)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_file(RepositoryFormat2a)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_file(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_link_file(RepositoryFormat4)
@@ -5887,6 +5966,8 @@
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormat5)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormat6)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormat7)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat2a)
+breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_commit_dir_contents_unchanged(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormatKnitPack1)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormatKnitPack3)
 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes(RepositoryFormatKnitPack4)
@@ -6949,16 +7030,24 @@
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnitPack6)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository.test_refresh_data.TestRefreshData.test_refresh_data_write_locked(RepositoryFormatPackDevelopment2Subtree)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_directory(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_directory(RepositoryFormat6)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_file_in_unchanged_directory(RepositoryFormat4)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_multiple_files(RepositoryFormat6)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat2a)
+breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat2aSubtree)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat4)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat5)
 breezy.tests.per_repository.test_repository.TestDeltaRevisionFiltered.test_unrelated(RepositoryFormat6)
@@ -11446,29 +11535,68 @@
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat5)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat6)
 breezy.tests.per_tree.test_get_symlink_target.TestGetSymlinkTarget.test_get_unicode_symlink_target(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(PreviewTree)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(PreviewTreePost)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(RevisionTree)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat2)
 breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat3)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat4)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat5)
+breezy.tests.per_tree.test_ids.IdTests.test_id2path(WorkingTreeFormat6)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(GitWorkingTreeFormat)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(RevisionTree)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(WorkingTreeFormat2)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(WorkingTreeFormat3)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(WorkingTreeFormat4)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(WorkingTreeFormat5)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id_list(WorkingTreeFormat6)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(RevisionTree)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id(WorkingTreeFormat2)
 breezy.tests.per_tree.test_ids.IdTests.test_path2id(WorkingTreeFormat3)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(WorkingTreeFormat4)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(WorkingTreeFormat5)
+breezy.tests.per_tree.test_ids.IdTests.test_path2id(WorkingTreeFormat6)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_invalid_child(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_invalid_child(WorkingTreeFormat3)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_before_commit(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_before_commit(WorkingTreeFormat3)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_dir(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_dir(WorkingTreeFormat3)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(PreviewTree)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(PreviewTreePost)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(RevisionTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(WorkingTreeFormat3)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(WorkingTreeFormat4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(WorkingTreeFormat5)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_invalid_all(WorkingTreeFormat6)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(PreviewTree)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(PreviewTreePost)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(RevisionTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(WorkingTreeFormat3)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(WorkingTreeFormat4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(WorkingTreeFormat5)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path_root(WorkingTreeFormat6)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_path(WorkingTreeFormat3)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(PreviewTreePost)
+breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(RevisionTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat3)
 breezy.tests.per_tree.test_inv.TestInventory.test_canonical_tree_name_mismatch(WorkingTreeFormat4)
@@ -11485,6 +11613,7 @@
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_forget_old(WorkingTreeFormat4)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_forget_old(WorkingTreeFormat5)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_forget_old(WorkingTreeFormat6)
+breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(RevisionTree)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat2)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat3)
 breezy.tests.per_tree.test_inv.TestInventory.test_paths2ids_recursive(WorkingTreeFormat4)
@@ -11503,16 +11632,22 @@
 breezy.tests.per_tree.test_iter_search_rules.TestIterSearchRules.test_iter_search_rules_no_tree(WorkingTreeFormat5)
 breezy.tests.per_tree.test_iter_search_rules.TestIterSearchRules.test_iter_search_rules_no_tree(WorkingTreeFormat6)
 breezy.tests.per_tree.test_iter_search_rules.TestIterSearchRules.test_iter_search_rules_no_tree(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir_no_recurse(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir_no_recurse(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir_no_recurse(WorkingTreeFormat3)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_from_dir(WorkingTreeFormat3)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root_no_recurse(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root_no_recurse(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root_no_recurse(WorkingTreeFormat3)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_no_root(WorkingTreeFormat3)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root_no_recurse(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root_no_recurse(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root_no_recurse(WorkingTreeFormat3)
+breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root(RevisionTree)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root(WorkingTreeFormat2)
 breezy.tests.per_tree.test_list_files.TestListFiles.test_list_files_with_root(WorkingTreeFormat3)
 breezy.tests.per_tree.test_locking.TestLocking.test_lock_read(DirStateRevisionTree,WT4)
@@ -11609,9 +11744,11 @@
 breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat6)
 breezy.tests.per_tree.test_revision_tree.TestRevisionTree.test_get_random_tree_raises(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_2_no_parents(PreviewTree)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_2_no_parents(RevisionTree)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_2_no_parents(WorkingTreeFormat2)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_2_no_parents(WorkingTreeFormat3)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_3_no_parents(PreviewTree)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_3_no_parents(RevisionTree)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_3_no_parents(WorkingTreeFormat2)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_3_no_parents(WorkingTreeFormat3)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_4_no_parents(WorkingTreeFormat2)
@@ -11623,6 +11760,7 @@
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_6_no_parents(WorkingTreeFormat2)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_6_no_parents(WorkingTreeFormat3)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_no_parents(PreviewTree)
+breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_no_parents(RevisionTree)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_no_parents(WorkingTreeFormat2)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_no_parents(WorkingTreeFormat3)
 breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_empty_tree_no_parents(DirStateRevisionTree,WT4)
@@ -11666,13 +11804,20 @@
 breezy.tests.per_tree.test_tree.TestExtras.test_extras(RevisionTree)
 breezy.tests.per_tree.test_tree.TestExtras.test_extras(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestExtras.test_extras(WorkingTreeFormat3)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(PreviewTree)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(RevisionTree)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_context_manager(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines_multi_line_breaks(DirStateRevisionTree,WT4)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines_multi_line_breaks(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines_multi_line_breaks(PreviewTree)
@@ -11684,6 +11829,7 @@
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines_multi_line_breaks(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines_multi_line_breaks(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(PreviewTree)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(RevisionTree)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(WorkingTreeFormat4)
@@ -11691,7 +11837,11 @@
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_lines(WorkingTreeFormat6,remote)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(PreviewTree)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(RevisionTree)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(DirStateRevisionTree,WT5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(PreviewTree)
+breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(RevisionTree)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file_text(WorkingTreeFormat4)
@@ -11704,12 +11854,16 @@
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestFileContent.test_get_file(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(RevisionTree)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat4)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestFileIds.test_all_file_ids(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(RevisionTree)
 breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestFileIds.test_id2path(WorkingTreeFormat4)
@@ -11748,8 +11902,10 @@
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_does_not_exist(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestIterChildEntries.test_iteration_order(RevisionTree)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_iteration_order(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestIterChildEntries.test_iteration_order(WorkingTreeFormat3)
+breezy.tests.per_tree.test_tree.TestIterEntriesByDir.test_iteration_order(RevisionTree)
 breezy.tests.per_tree.test_tree.TestIterEntriesByDir.test_iteration_order(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestIterEntriesByDir.test_iteration_order(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestPlanFileMerge.test_plan_file_merge(RevisionTree)
@@ -11794,6 +11950,9 @@
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat5)
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat6)
 breezy.tests.per_tree.test_tree.TestReference.test_iter_references(WorkingTreeFormat6,remote)
+breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(DirStateRevisionTree,WT4)
+breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(DirStateRevisionTree,WT5)
+breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(RevisionTree)
 breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(WorkingTreeFormat2)
 breezy.tests.per_tree.test_tree.TestStoredKind.test_stored_kind(WorkingTreeFormat3)
 breezy.tests.per_tree.test_tree.TestSupportsRenameTracking.test_supports_rename_tracking(DirStateRevisionTree,WT4)
@@ -12382,8 +12541,14 @@
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis_with_file_ids(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_add.TestAdd.test_add_present_in_basis(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added_with_file_id(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added_with_file_id(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_add.TestAdd.test_add_previously_added_with_file_id(WorkingTreeFormat3)
@@ -12454,8 +12619,14 @@
 breezy.tests.per_workingtree.test_break_lock.TestBreakLock.test_unlocked(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown_specific_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown_specific_file(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown_specific_file(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown_specific_file(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown_specific_file(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_changes_from.TestChangesFrom.test_unknown(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_broken_dirstate(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_broken_dirstate(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_check_state.TestCheckState.test_check_broken_dirstate(WorkingTreeFormat3)
@@ -12501,6 +12672,9 @@
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_shows_pre_hook_names(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_steps(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_steps(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_steps(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_steps(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_commit_progress_steps(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_post_commit_hook(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_post_commit_hook(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_commit.TestCommitProgress.test_post_commit_hook(WorkingTreeFormat4)
@@ -12521,8 +12695,14 @@
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_aborted_does_not_apply_automatic_changes_bug_282402(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_and_files_updates_workingtree(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_deleted_subtree_with_removed(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_exclude_changed_is_pointless(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_exclude_changed_is_pointless(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_exclude_changed_is_pointless(WorkingTreeFormat4)
@@ -12539,6 +12719,9 @@
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_pending_merge_fails(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_exclude_subtree_of_selected(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_commit.TestCommit.test_commit_local_unbound(WorkingTreeFormat3)
@@ -12834,6 +13017,10 @@
 breezy.tests.per_workingtree.test_executable.TestExecutable.test_commit_with_exec_from_basis(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_executable.TestExecutable.test_use_exec_from_basis(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_flush.TestFlush.test_flush_fresh_tree(WorkingTreeFormat3)
@@ -12933,6 +13120,8 @@
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_rename_swap(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_replace_root(GitWorkingTreeFormat)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_replace_root(WorkingTreeFormat2)
+breezy.tests.per_workingtree.test_inv.TestApplyInventoryDelta.test_replace_root(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestRevert.test_dangling_id(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_inv.TestRevert.test_dangling_id(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_inv.TestTreeReference.test_tree_reference_matches_inv(WorkingTreeFormat2)
@@ -13152,6 +13341,9 @@
 breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self_root(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_onto_self(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_over_deleted(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_parent_dir(WorkingTreeFormat2)
@@ -13175,6 +13367,9 @@
 breezy.tests.per_workingtree.test_move.TestMove.test_move_unversioned(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_via_rm_and_add(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_move.TestMove.test_move_via_rm_and_add(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_via_rm_and_add(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_via_rm_and_add(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_move.TestMove.test_move_via_rm_and_add(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_comparison_data_does_not_autodetect_subtree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_comparison_data_does_not_autodetect_subtree(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_nested_specifics.TestNestedSupport.test_comparison_data_does_not_autodetect_subtree(WorkingTreeFormat4)
@@ -13435,6 +13630,9 @@
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_put_file.TestPutFileBytesNonAtomic.test_put_new_file(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_readonly.TestReadonly.test_readonly_unclean(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_readonly.TestReadonly.test_readonly_unclean(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_readonly.TestReadonly.test_readonly_unclean(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_read_working_inventory.TestReadWorkingInventory.test_read_after_inventory_modification(WorkingTreeFormat3)
@@ -13455,6 +13653,9 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_changed_files(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_directory_with_unknowns(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_directory_with_unknowns(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_directory_with_unknowns(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_directory_with_unknowns(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_force_remove_directory_with_unknowns(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_non_cwd(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_non_cwd(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_absent_directory(WorkingTreeFormat2)
@@ -13463,8 +13664,15 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_added_files(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_file(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_file(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_file(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_file(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat6)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_changed_ignored_files(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_deleted_files(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_deleted_files(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_dir_before_bzr(WorkingTreeFormat2)
@@ -13477,8 +13685,14 @@
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_directory_with_renames(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_file_and_containing_dir(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_force_directory_with_changed_file(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_force_directory_with_changed_file(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_force_directory_with_changed_file(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_force_directory_with_changed_file(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_force_directory_with_changed_file(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep_subtree(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep_subtree(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_remove.TestRemove.test_remove_keep_subtree(WorkingTreeFormat4)
@@ -13709,6 +13923,9 @@
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddTree.test_skip_nested_trees(WorkingTreeFormat6,remote)
 breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_dir_changes_to_symlink(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_dir_changes_to_symlink(WorkingTreeFormat3)
+breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_dir_changes_to_symlink(WorkingTreeFormat4)
+breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_dir_changes_to_symlink(WorkingTreeFormat5)
+breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_dir_changes_to_symlink(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_symlink_changes_to_dir(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_symlinks.TestKindChanges.test_symlink_changes_to_dir(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_symlinks.TestOpenTree.test_open_containing_through_symlink(GitWorkingTreeFormat)
@@ -14724,6 +14941,8 @@
 breezy.tests.test_commit.TestCommit.test_commit_failed_signature
 breezy.tests.test_commit.TestCommit.test_commit_has_1ms_resolution
 breezy.tests.test_commit.TestCommit.test_commit_invokes_hooks
+breezy.tests.test_commit.TestCommit.test_commit_kind_changes
+breezy.tests.test_commit.TestCommit.test_commit_new_subdir_child_selective
 breezy.tests.test_commit.TestCommit.test_commit_no_author
 breezy.tests.test_commit.TestCommit.test_commit_object_doesnt_set_nick
 breezy.tests.test_commit.TestCommit.test_commit_removals_respects_filespec
@@ -14741,6 +14960,7 @@
 breezy.tests.test_commit.TestCommit.test_reused_rev_id
 breezy.tests.test_commit.TestCommit.test_safe_master_lock
 breezy.tests.test_commit.TestCommit.test_selected_file_merge_commit
+breezy.tests.test_commit.TestCommit.test_selective_delete
 breezy.tests.test_commit.TestCommit.test_simple_commit
 breezy.tests.test_commit.TestCommit.test_strict_commit
 breezy.tests.test_config.EmailOptionTests.test_default_email_uses_EMAIL
@@ -15644,6 +15864,8 @@
 breezy.tests.test__dirstate_helpers.TestPackStat.test_giant_size(dirstate_Python)
 breezy.tests.test__dirstate_helpers.TestPackStat.test_negative_dev(dirstate_Python)
 breezy.tests.test__dirstate_helpers.TestProcessEntry.test_simple_changes(unicode,dirstate_Python)
+breezy.tests.test__dirstate_helpers.TestReadDirblocks.test_smoketest(unicode)
+breezy.tests.test__dirstate_helpers.TestReadDirblocks.test_trailing_garbage(unicode)
 breezy.tests.test__dirstate_helpers.TestUpdateEntry.test_update_entry_dir_unchanged(unicode,dirstate_Python)
 breezy.tests.test__dirstate_helpers.TestUpdateEntry.test_update_entry_dir(unicode,dirstate_Python)
 breezy.tests.test__dirstate_helpers.TestUsingCompiledIfAvailable.test_bisect_dirblock
@@ -15654,14 +15876,62 @@
 breezy.tests.test__dirstate_helpers.TestUsingCompiledIfAvailable.test__read_dirblocks
 breezy.tests.test__dirstate_helpers.TestUsingCompiledIfAvailable.test_update_entry
 breezy.tests.test_dirstate.TestDirStateHashUpdates.test_worth_saving_limit_avoids_writing(unicode)
+breezy.tests.test_dirstate.TestDirStateInitialize.test_initialize(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_directory_and_child_no_parents_all_data(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_directory_to_root_no_parents_all_data(unicode)
 breezy.tests.test_dirstate.TestDirStateManipulations.test_add_forbidden_names(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_path_to_root_no_parents_all_data(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_path_to_unversioned_directory(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_symlink_to_root_no_parents_all_data(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_symlink_unicode_to_root_no_parents_all_data(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_add_tree_reference(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_set_parent_trees_no_content(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_set_path_id_with_parents(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_set_state_from_inventory_no_content_no_parents(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_set_state_from_scratch_identical_parent(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_set_state_from_scratch_no_parents(unicode)
+breezy.tests.test_dirstate.TestDirStateManipulations.test_update_minimal_updates_id_index(unicode)
 breezy.tests.test_dirstate.TestDirStateOnFile.test_can_save_clean_on_file(unicode)
+breezy.tests.test_dirstate.TestDirStateOnFile.test_construct_with_path(unicode)
+breezy.tests.test_dirstate.TestDirStateOnFile.test_save_refuses_if_changes_aborted(unicode)
+breezy.tests.test_dirstate.TestDirstateSortOrder.test_set_parent_trees_correct_order
+breezy.tests.test_dirstate.TestDirstateValidation.test_validate_correct_dirstate(unicode)
+breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_absent(unicode)
+breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_all_subdir(unicode)
 breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_no_parents(unicode)
+breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_one_parent(unicode)
+breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_renamed(unicode)
+breezy.tests.test_dirstate.TestDiscardMergeParents.test_discard_simple(unicode)
 breezy.tests.test_dirstate.TestErrors.test_dirstate_corrupt
+breezy.tests.test_dirstate.TestGetEntry.test_complex_structure_exists(unicode)
+breezy.tests.test_dirstate.TestGetEntry.test_complex_structure_missing(unicode)
+breezy.tests.test_dirstate.TestGetEntry.test_get_entry_uninitialized(unicode)
+breezy.tests.test_dirstate.TestGetEntry.test_simple_structure(unicode)
+breezy.tests.test_dirstate.TestGetLines.test_entry_to_line(unicode)
+breezy.tests.test_dirstate.TestGetLines.test_entry_to_line_with_parent(unicode)
+breezy.tests.test_dirstate.TestGetLines.test_get_line_with_2_rows(unicode)
 breezy.tests.test_dirstate.TestGetLines.test_iter_entries(unicode)
+breezy.tests.test_dirstate.Test_InvEntryToDetails.test_unicode_symlink
+breezy.tests.test_dirstate.TestPackStat.test_pack_stat_float
+breezy.tests.test_dirstate.TestPackStat.test_pack_stat_int
 breezy.tests.test_dirstate.TestSHA1Provider.test_defaultsha1provider_sha1
 breezy.tests.test_dirstate.TestSHA1Provider.test_defaultsha1provider_stat_and_sha1
 breezy.tests.test_dirstate.TestSHA1Provider.test_sha1provider_is_an_interface
+breezy.tests.test_dirstate.TestTreeToDirState.test_1_parents_empty_to_dirstate(unicode)
+breezy.tests.test_dirstate.TestTreeToDirState.test_2_parents_empty_to_dirstate(unicode)
+breezy.tests.test_dirstate.TestTreeToDirState.test_colliding_fileids(unicode)
+breezy.tests.test_dirstate.TestTreeToDirState.test_empty_to_dirstate(unicode)
+breezy.tests.test_dirstate.TestTreeToDirState.test_empty_unknowns_are_ignored_to_dirstate(unicode)
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_invalid_changed_file
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_invalid_existing_id
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_invalid_file_not_present
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_invalid_new_id_same_path
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_invalid_parent_missing
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_remove_file_active_state_has_diff_file
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_remove_file_active_state_has_diff_file_and_file_elsewhere
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_remove_file_matching_active_state
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_remove_file_present_elsewhere_in_active_state
+breezy.tests.test_dirstate.TestUpdateBasisByDelta.test_remove_file_present_in_active_state
 breezy.tests.test_email_message.TestEmailMessage.test_empty_message
 breezy.tests.test_email_message.TestEmailMessage.test_multipart_message_complex
 breezy.tests.test_email_message.TestEmailMessage.test_multipart_message_simple
@@ -15783,6 +16053,8 @@
 breezy.tests.test_export.TarExporterTests.test_tgz_ignores_dest_path
 breezy.tests.test_export.TarExporterTests.test_xz_stdout
 breezy.tests.test_export.TestDirExport.test_empty
+breezy.tests.test_export.TestDirExport.test_to_existing_nonempty_dir_fail
+breezy.tests.test_extract.TestExtract.test_bad_repo_format
 breezy.tests.test_export.TestDirExport.test_files_per_file_timestamps
 breezy.tests.test_export.TestDirExport.test_files_same_timestamp
 breezy.tests.test_export.TestDirExport.test_subdir_files_per_timestamps
@@ -18761,6 +19033,8 @@
 breezy.tests.test__simple_set.TestSimpleSet.test__sizeof__
 breezy.tests.test_smart_add.TestAddActions.test__print
 breezy.tests.test_smart_add.TestAddActions.test_quiet
+breezy.tests.test_smart_add.TestAddFrom.test_copy_all
+breezy.tests.test_smart_add.TestAddFrom.test_copy_from_dir
 breezy.tests.test_smart_request.TestErrors.test_disabled_method
 breezy.tests.test_smart_request.TestJailHook.test_jail_hook
 breezy.tests.test_smart_request.TestJailHook.test_open_bzrdir_in_non_main_thread
@@ -19395,6 +19669,9 @@
 breezy.tests.test_tag.TestTagsInCheckouts.test_tag_copied_by_initial_checkout
 breezy.tests.test_tag.TestTagsInCheckouts.test_update_tag_into_checkout
 breezy.tests.test_tag.TestTagsInCheckouts.test_update_updates_tags
+breezy.tests.test_testament.TestamentTestsStrict2.testament_class
+breezy.tests.test_testament.TestamentTestsStrict.testament_class
+breezy.tests.test_testament.TestamentTests.testament_class
 breezy.tests.test_test_server.TestTCPServerInAThread.test_client_talks_server_respond(TestingTCPServer)
 breezy.tests.test_test_server.TestTCPServerInAThread.test_client_talks_server_respond(TestingThreadingTCPServer)
 breezy.tests.test_test_server.TestTCPServerInAThread.test_exception_swallowed_while_serving(TestingTCPServer)
@@ -19485,6 +19762,7 @@
 breezy.tests.test_transactions.TestWriteTransaction.test_small_cache_with_references
 breezy.tests.test_transactions.TestWriteTransaction.test_writable
 breezy.tests.test_transform.TestBuildTree.test_build_tree_accelerator_tree_missing_file
+breezy.tests.test_transform.TestBuildTree.test_build_tree_accelerator_wrong_kind
 breezy.tests.test_transform.TestBuildTree.test_build_tree_hardlinks_preserve_execute
 breezy.tests.test_transform.TestBuildTree.test_build_with_references
 breezy.tests.test_transform.TestCommitTransform.test_add_files
@@ -19974,6 +20252,7 @@
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_empty_tree
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_tree_ascii
 breezy.tests.test_win32utils.TestWin32UtilsGlobExpand.test_unicode_backslashes
+breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_commit_updates_hash_cache
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_constructing_invalid_interdirstate_raises
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_default_root_id
 breezy.tests.test_workingtree_4.TestWorkingTreeFormat4.test_dirstate_doesnt_cache_non_parent_trees