Merge lp:~jelmer/brz/fix-spurious-343 into lp:brz

[Jelmer Vernooij]

Fix an occasionally failing test.

Fix an occasionally failing test.

Order of output from iter_files_bytes is not guaranteed.

[Martin Packman (gz)]

Changes here all look reasonable, though having a 1 and 2 expected output seems a little ugly.

review: Approve

=== modified file 'breezy/plugins/fastimport/exporter.py'
--- breezy/plugins/fastimport/exporter.py	2018-11-26 21:11:19 +0000
+++ breezy/plugins/fastimport/exporter.py	2018-12-18 23:13:08 +0000
@@ -452,7 +452,7 @@
         # Build and return the result
         return commands.CommitCommand(git_ref, mark, author_info,
                                       committer_info, revobj.message.encode(
-                                          "utf-8"), from_, merges, iter(file_cmds),
+                                          "utf-8"), from_, merges, file_cmds,
                                       more_authors=more_author_info, properties=properties)
 
     def _get_revision_trees(self, parent, revision_id):
@@ -477,7 +477,7 @@
         tree_old, tree_new = self._get_revision_trees(parent, revision_id)
         if not(tree_old and tree_new):
             # Something is wrong with this revision - ignore the filecommands
-            return []
+            return
 
         changes = tree_new.changes_from(tree_old)
 
@@ -489,13 +489,16 @@
         file_cmds, rd_modifies, renamed = self._process_renames_and_deletes(
             changes.renamed, changes.removed, revision_id, tree_old)
 
+        for cmd in file_cmds:
+            yield cmd
+
         # Map kind changes to a delete followed by an add
         for path, id_, kind1, kind2 in changes.kind_changed:
             path = self._adjust_path_for_renames(path, renamed, revision_id)
             # IGC: I don't understand why a delete is needed here.
             # In fact, it seems harmful? If you uncomment this line,
             # please file a bug explaining why you needed to.
-            # file_cmds.append(commands.FileDeleteCommand(path))
+            # yield commands.FileDeleteCommand(path)
             my_modified.append((path, id_, kind2))
 
         # Record modifications
@@ -507,25 +510,23 @@
                      (path, helpers.kind_to_mode(
                          'file', tree_new.is_executable(path)))))
             elif kind == 'symlink':
-                file_cmds.append(commands.FileModifyCommand(
+                yield commands.FileModifyCommand(
                     path.encode("utf-8"),
                     helpers.kind_to_mode('symlink', False),
-                    None, tree_new.get_symlink_target(path)))
+                    None, tree_new.get_symlink_target(path))
             elif kind == 'directory':
                 if not self.plain_format:
-                    file_cmds.append(
-                        commands.FileModifyCommand(
-                            path.encode("utf-8"),
-                            helpers.kind_to_mode('directory', False), None,
-                            None))
+                    yield commands.FileModifyCommand(
+                        path.encode("utf-8"),
+                        helpers.kind_to_mode('directory', False), None,
+                        None)
             else:
                 self.warning("cannot export '%s' of kind %s yet - ignoring" %
                              (path, kind))
         for (path, mode), chunks in tree_new.iter_files_bytes(
                 files_to_get):
-            file_cmds.append(commands.FileModifyCommand(
-                path.encode("utf-8"), mode, None, b''.join(chunks)))
-        return file_cmds
+            yield commands.FileModifyCommand(
+                path.encode("utf-8"), mode, None, b''.join(chunks))
 
     def _process_renames_and_deletes(self, renames, deletes,
                                      revision_id, tree_old):

=== modified file 'breezy/plugins/fastimport/tests/test_commands.py'
--- breezy/plugins/fastimport/tests/test_commands.py	2018-11-21 02:13:23 +0000
+++ breezy/plugins/fastimport/tests/test_commands.py	2018-12-18 23:13:08 +0000
@@ -59,19 +59,55 @@
         self.assertIsNot(b"bla", stream.read())
 
 
-fast_export_baseline_data = """reset refs/heads/master
-commit refs/heads/master
-mark :1
-committer
-data 15
-add c, remove b
-M 644 inline a
-data 13
-test 1
-test 3
-M 644 inline c
-data 6
-test 4
+fast_export_baseline_data1 = """reset refs/heads/master
+commit refs/heads/master
+mark :1
+committer
+data 15
+add c, remove b
+M 644 inline a
+data 13
+test 1
+test 3
+M 644 inline c
+data 6
+test 4
+commit refs/heads/master
+mark :2
+committer
+data 14
+modify a again
+from :1
+M 644 inline a
+data 20
+test 1
+test 3
+test 5
+commit refs/heads/master
+mark :3
+committer
+data 5
+add d
+from :2
+M 644 inline d
+data 6
+test 6
+"""
+
+
+fast_export_baseline_data2 = """reset refs/heads/master
+commit refs/heads/master
+mark :1
+committer
+data 15
+add c, remove b
+M 644 inline c
+data 6
+test 4
+M 644 inline a
+data 13
+test 1
+test 3
 commit refs/heads/master
 mark :2
 committer
@@ -188,7 +224,7 @@
         # followed by the deltas for 4 and 5
         data = self.run_bzr("fast-export --baseline -r 3.. bl")[0]
         data = re.sub('committer.*', 'committer', data)
-        self.assertEquals(fast_export_baseline_data, data)
+        self.assertIn(data, (fast_export_baseline_data1, fast_export_baseline_data2))
 
         # Also confirm that --baseline with no args is identical to full export
         data1 = self.run_bzr("fast-export --baseline bl")[0]