Merge lp:~jelmer/brz/objects-2b into lp:brz

[Jelmer Vernooij]

Remove file_id from transform's create_from_tree, get filter tree paths by path.

Remove file_id from transform's create_from_tree, get filter tree paths by path.

[Martin Packman (gz)]

Thanks!

review: Approve

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

Project setup failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/401/

=== modified file 'breezy/conflicts.py'
--- breezy/conflicts.py	2018-11-11 04:08:32 +0000
+++ breezy/conflicts.py	2019-06-17 18:22:03 +0000
@@ -525,7 +525,7 @@
             tid = tt.trans_id_tree_path(path_to_create)
             tree = self._revision_tree(tt._tree, revid)
             transform.create_from_tree(
-                tt, tid, tree, tree.id2path(file_id), file_id=file_id)
+                tt, tid, tree, tree.id2path(file_id))
             tt.version_file(file_id, tid)
         else:
             tid = tt.trans_id_file_id(file_id)
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2019-06-15 12:04:34 +0000
+++ breezy/merge.py	2019-06-17 18:22:03 +0000
@@ -1307,8 +1307,8 @@
                     self.tt.version_file(file_id, trans_id)
                     transform.create_from_tree(
                         self.tt, trans_id, self.other_tree,
-                        other_path, file_id=file_id,
-                        filter_tree_path=self._get_filter_tree_path(file_id))
+                        other_path,
+                        filter_tree_path=self._get_filter_tree_path(other_path))
                     inhibit_content_conflict = True
             elif params.other_kind is None:  # file_id is not in OTHER
                 # Is the name used for a different file_id ?
@@ -1360,14 +1360,13 @@
 
     def _default_other_winner_merge(self, merge_hook_params):
         """Replace this contents with other."""
-        file_id = merge_hook_params.file_id
         trans_id = merge_hook_params.trans_id
         if merge_hook_params.other_path is not None:
             # OTHER changed the file
             transform.create_from_tree(
                 self.tt, trans_id, self.other_tree,
-                merge_hook_params.other_path, file_id=file_id,
-                filter_tree_path=self._get_filter_tree_path(file_id))
+                merge_hook_params.other_path,
+                filter_tree_path=self._get_filter_tree_path(merge_hook_params.other_path))
             return 'done', None
         elif merge_hook_params.this_path is not None:
             # OTHER deleted the file
@@ -1452,17 +1451,18 @@
                                               other_lines)
             file_group.append(trans_id)
 
-    def _get_filter_tree_path(self, file_id):
+    def _get_filter_tree_path(self, path):
         if self.this_tree.supports_content_filtering():
             # We get the path from the working tree if it exists.
             # That fails though when OTHER is adding a file, so
             # we fall back to the other tree to find the path if
             # it doesn't exist locally.
-            try:
-                return self.this_tree.id2path(file_id)
-            except errors.NoSuchId:
-                return self.other_tree.id2path(file_id)
-        # Skip the id2path lookup for older formats
+            filter_path = _mod_tree.find_previous_path(
+                self.other_tree, self.working_tree, path)
+            if filter_path is None:
+                filter_path = path
+            return filter_path
+        # Skip the lookup for older formats
         return None
 
     def _dump_conflicts(self, name, paths, parent_id, file_id, this_lines=None,
@@ -1497,7 +1497,7 @@
         for suffix, tree, path, lines in data:
             if path is not None:
                 trans_id = self._conflict_file(
-                    name, parent_id, path, tree, file_id, suffix, lines,
+                    name, parent_id, path, tree, suffix, lines,
                     filter_tree_path)
                 file_group.append(trans_id)
                 if set_version and not versioned:
@@ -1505,14 +1505,14 @@
                     versioned = True
         return file_group
 
-    def _conflict_file(self, name, parent_id, path, tree, file_id, suffix,
+    def _conflict_file(self, name, parent_id, path, tree, suffix,
                        lines=None, filter_tree_path=None):
         """Emit a single conflict file."""
         name = name + '.' + suffix
         trans_id = self.tt.create_path(name, parent_id)
         transform.create_from_tree(
             self.tt, trans_id, tree, path,
-            file_id=file_id, chunks=lines,
+            chunks=lines,
             filter_tree_path=filter_tree_path)
         return trans_id
 
 
=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2019-06-15 12:04:34 +0000
+++ breezy/shelf.py	2019-06-17 18:22:03 +0000
@@ -208,8 +208,7 @@
     def _content_from_tree(tt, tree, file_id):
         trans_id = tt.trans_id_file_id(file_id)
         tt.delete_contents(trans_id)
-        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id),
-                                   file_id)
+        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
 
     def shelve_content_change(self, file_id):
         """Shelve a kind change or binary file content change.
@@ -267,7 +266,7 @@
                 else:
                     transform.create_from_tree(
                         to_transform, s_trans_id, tree,
-                        tree.id2path(file_id), file_id)
+                        tree.id2path(file_id))
         if version:
             to_transform.version_file(file_id, s_trans_id)
 
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2019-06-15 15:59:17 +0000
+++ breezy/tests/test_transform.py	2019-06-17 18:22:03 +0000
@@ -1666,9 +1666,9 @@
         tree2 = self.make_branch_and_tree('tree2')
         tt = TreeTransform(tree2)
         foo_trans_id = tt.create_path('foo', tt.root)
-        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
+        create_from_tree(tt, foo_trans_id, tree1, 'foo')
         bar_trans_id = tt.create_path('bar', tt.root)
-        create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id=b'bar-id')
+        create_from_tree(tt, bar_trans_id, tree1, 'bar')
         tt.apply()
         self.assertEqual('directory', osutils.file_kind('tree2/foo'))
         self.assertFileEqual(b'baz', 'tree2/bar')
@@ -1681,8 +1681,7 @@
         tree2 = self.make_branch_and_tree('tree2')
         tt = TreeTransform(tree2)
         foo_trans_id = tt.create_path('foo', tt.root)
-        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
-                         chunks=[b'qux'])
+        create_from_tree(tt, foo_trans_id, tree1, 'foo', chunks=[b'qux'])
         tt.apply()
         self.assertFileEqual(b'qux', 'tree2/foo')
 
@@ -1693,7 +1692,7 @@
         tree1.add('foo', b'foo-id')
         tt = TreeTransform(self.make_branch_and_tree('tree2'))
         foo_trans_id = tt.create_path('foo', tt.root)
-        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
+        create_from_tree(tt, foo_trans_id, tree1, 'foo')
         tt.apply()
         self.assertEqual('bar', os.readlink('tree2/foo'))
 
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2019-06-15 15:59:17 +0000
+++ breezy/transform.py	2019-06-17 18:22:03 +0000
@@ -2814,7 +2814,7 @@
         raise errors.BadFileKindError(name, kind)
 
 
-def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
+def create_from_tree(tt, trans_id, tree, path, chunks=None,
                      filter_tree_path=None):
     """Create new file contents according to tree contents.
 
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2019-06-16 02:23:42 +0000
+++ breezy/tree.py	2019-06-17 18:22:03 +0000
@@ -1184,6 +1184,7 @@
     :param to_tree: To tree
     :param path: Path to search for (exists in from_tree)
     :return: path in to_tree, or None if there is no equivalent path.
+    :raise NoSuchFile: If the path doesn't exist in from_tree
     """
     if file_id is None:
         file_id = from_tree.path2id(path)