Merge pull request #336 from jelmer/3.3-fix-tests

Fix iter_bytes() usage and remove failing setup test

Author: jelmer

breezy/bzr/remote.py

@@ -1695,7 +1695,9 @@ def _has_same_fallbacks(self, other_repo):
         other_fb = other_repo._fallback_repositories
         if len(my_fb) != len(other_fb):
             return False
-        return all(f.has_same_location(g) for f, g in zip(my_fb, other_fb, strict=False))
+        return all(
+            f.has_same_location(g) for f, g in zip(my_fb, other_fb, strict=False)
+        )
 
     def has_same_location(self, other):
         # TODO: Move to RepositoryBase and unify with the regular Repository

breezy/bzr/tests/test_vfs_ratchet.py

@@ -59,7 +59,9 @@ def test_simple_annotate(self):
         wt.add(["hello.txt"])
         wt.commit("commit", committer="test@user")
         self.reset_smart_call_log()
-        _out, _err = self.run_bzr(["annotate", "-d", self.get_url("branch"), "hello.txt"])
+        _out, _err = self.run_bzr(
+            ["annotate", "-d", self.get_url("branch"), "hello.txt"]
+        )
         # This figure represent the amount of work to perform this use case. It
         # is entirely ok to reduce this number if a test fails due to rpc_count
         # being too low. If rpc_count increases, more network roundtrips have

breezy/bzr/transform.py

@@ -2081,7 +2081,9 @@ def _list_files_by_dir(self):
             parent = todo.pop()
             parent_file_id = self._transform.final_file_id(parent)
             children = list(self._all_children(parent))
-            paths = dict(zip(children, self._final_paths.get_paths(children), strict=False))
+            paths = dict(
+                zip(children, self._final_paths.get_paths(children), strict=False)
+            )
             children.sort(key=paths.get)
             todo.extend(reversed(children))
             for trans_id in children:

breezy/bzr/versionedfile.py

@@ -645,7 +645,11 @@ def make_mpdiffs(self, version_ids):
                 raise errors.RevisionNotPresent(version_id, self) from e
         # We need to filter out ghosts, because we can't diff against them.
         knit_versions = set(self.get_parent_map(knit_versions))
-        lines = dict(zip(knit_versions, self._get_lf_split_line_list(knit_versions), strict=False))
+        lines = dict(
+            zip(
+                knit_versions, self._get_lf_split_line_list(knit_versions), strict=False
+            )
+        )
         diffs = []
         for version_id in version_ids:
             target = lines[version_id]

breezy/bzr/workingtree_4.py

@@ -1424,7 +1424,8 @@ def reset_state(self, revision_ids=None):
                 trees = list(
                     zip(
                         revision_ids,
-                        self.branch.repository.revision_trees(revision_ids), strict=False,
+                        self.branch.repository.revision_trees(revision_ids),
+                        strict=False,
                     )
                 )
                 base_tree = trees[0][1]

breezy/git/interrepo.py

@@ -23,9 +23,6 @@
 from dulwich.object_store import ObjectStoreGraphWalker
 from dulwich.objects import ObjectID
 from dulwich.pack import PACK_SPOOL_FILE_MAX_SIZE
-from dulwich.protocol import CAPABILITY_THIN_PACK, ZERO_SHA
-from dulwich.refs import SYMREF
-
 from dulwich.protocol import CAPABILITY_THIN_PACK, PEELED_TAG_SUFFIX, ZERO_SHA
 from dulwich.refs import SYMREF
 from dulwich.walk import Walker
@@ -682,7 +679,9 @@ def determine_wants(heads, depth=None):
             ret = []
             for name, (sha1, bzr_revid) in list(new_refs.items()):
                 if sha1 is None:
-                    sha1, _unused_mapping = self.source.lookup_bzr_revision_id(bzr_revid)
+                    sha1, _unused_mapping = self.source.lookup_bzr_revision_id(
+                        bzr_revid
+                    )
                 new_refs[name] = (sha1, bzr_revid)
                 ret.append(sha1)
             ref_changes.update(new_refs)

breezy/git/object_store.py

@@ -522,7 +522,9 @@ def _revision_to_objects(self, rev, tree, lossy, add_cache_entry=None):
             rev, root_tree.id, lossy=lossy, verifiers=verifiers
         )
         try:
-            foreign_revid, _mapping = mapping_registry.parse_revision_id(rev.revision_id)
+            foreign_revid, _mapping = mapping_registry.parse_revision_id(
+                rev.revision_id
+            )
         except errors.InvalidRevisionId:
             pass
         else:

breezy/git/transform.py

@@ -575,9 +575,7 @@ def iter_changes(self, want_unversioned=False):
 
             to_name = self.final_name(trans_id)
             to_kind = self.final_kind(trans_id)
-            to_executable = (
-                self._new_executability.get(trans_id, from_executable)
-            )
+            to_executable = self._new_executability.get(trans_id, from_executable)
             if from_versioned and from_kind != to_kind:
                 modified = True
             elif to_kind in ("file", "symlink") and (trans_id in self._new_contents):
@@ -1838,7 +1836,9 @@ def _list_files_by_dir(self):
         while len(todo) > 0:
             parent = todo.pop()
             children = list(self._all_children(parent))
-            paths = dict(zip(children, self._final_paths.get_paths(children), strict=False))
+            paths = dict(
+                zip(children, self._final_paths.get_paths(children), strict=False)
+            )
             children.sort(key=paths.get)
             todo.extend(reversed(children))
             for trans_id in children:

breezy/merge.py

@@ -1099,7 +1099,9 @@ def get_sha1(tree, path):
                     base_sha1 = get_sha1(self.base_tree, base_path)
                     lca_sha1s = [
                         get_sha1(tree, lca_path)
-                        for tree, lca_path in zip(self._lca_trees, lca_paths, strict=False)
+                        for tree, lca_path in zip(
+                            self._lca_trees, lca_paths, strict=False
+                        )
                     ]
                     this_sha1 = get_sha1(self.this_tree, this_path)
                     other_sha1 = get_sha1(self.other_tree, other_path)

breezy/plugins/fastimport/tests/test_generic_processor.py

@@ -1229,15 +1229,19 @@ def test_rename_new_file_in_root(self):
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(new_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(new_path,)]
+        )
         self.assertRevisionRoot(revtree1, new_path)
 
     def test_rename_new_symlink_in_root(self):
         handler, branch = self.get_handler()
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path, "symlink"))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(new_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(new_path,)]
+        )
         self.assertRevisionRoot(revtree1, new_path)
 
     def test_rename_new_file_in_subdir(self):
@@ -1440,7 +1444,9 @@ def test_rename_of_modified_file_in_root(self):
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(old_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(old_path,)]
+        )
         # Note: the delta doesn't show the modification?
         # The actual new content is validated in the assertions following.
         revtree1, revtree2 = self.assertChanges(
@@ -1456,7 +1462,9 @@ def test_rename_of_modified_symlink_in_root(self):
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path, "symlink"))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(old_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(old_path,)]
+        )
         # Note: the delta doesn't show the modification?
         # The actual new content is validated in the assertions following.
         revtree1, revtree2 = self.assertChanges(
@@ -1576,7 +1584,9 @@ def test_rename_then_modify_file_in_root(self):
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(old_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(old_path,)]
+        )
         # Note: the delta doesn't show the modification?
         # The actual new content is validated in the assertions following.
         revtree1, revtree2 = self.assertChanges(
@@ -1628,7 +1638,9 @@ def test_rename_then_modify_symlink_in_root(self):
         old_path = b"a"
         new_path = b"b"
         handler.process(self.get_command_iter(old_path, new_path, "symlink"))
-        _revtree0, revtree1 = self.assertChanges(branch, 1, expected_added=[(old_path,)])
+        _revtree0, revtree1 = self.assertChanges(
+            branch, 1, expected_added=[(old_path,)]
+        )
         # Note: the delta doesn't show the modification?
         # The actual new content is validated in the assertions following.
         revtree1, revtree2 = self.assertChanges(