Merge lp:~jelmer/brz/iter-references into lp:brz

[Jelmer Vernooij]

Drop file_id return value from Tree.iter_references.

Drop file_id return value from Tree.iter_references.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2019-03-06 22:05:54 +0000
+++ breezy/branch.py	2019-06-18 13:59:46 +0000
@@ -1409,8 +1409,8 @@
                                            hardlink=hardlink)
         basis_tree = tree.basis_tree()
         with basis_tree.lock_read():
-            for path, file_id in basis_tree.iter_references():
-                reference_parent = self.reference_parent(path, file_id)
+            for path in basis_tree.iter_references():
+                reference_parent = self.reference_parent(path)
                 reference_parent.create_checkout(
                     tree.abspath(path),
                     basis_tree.get_reference_revision(path), lightweight)
@@ -1423,12 +1423,11 @@
         """
         raise NotImplementedError(self.reconcile)
 
-    def reference_parent(self, path, file_id=None, possible_transports=None):
+    def reference_parent(self, path, possible_transports=None):
         """Return the parent branch for a tree-reference file_id
 
-        :param path: The path of the file_id in the tree
-        :param file_id: Optional file_id of the tree reference
-        :return: A branch associated with the file_id
+        :param path: The path of the nested tree in the tree
+        :return: A branch associated with the nested tree
         """
         # FIXME should provide multiple branches, based on config
         return Branch.open(self.controldir.root_transport.clone(path).base,
 
=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2019-06-14 23:32:21 +0000
+++ breezy/bzr/branch.py	2019-06-18 13:59:46 +0000
@@ -575,17 +575,15 @@
         """
         return self._get_all_reference_info().get(path, (None, None))
 
-    def reference_parent(self, path, file_id=None, possible_transports=None):
-        """Return the parent branch for a tree-reference file_id.
+    def reference_parent(self, path, possible_transports=None):
+        """Return the parent branch for a tree-reference.
 
-        :param file_id: The file_id of the tree reference
-        :param path: The path of the file_id in the tree
-        :return: A branch associated with the file_id
+        :param path: The path of the nested tree in the tree
+        :return: A branch associated with the nested tree
         """
         branch_location = self.get_reference_info(path)[0]
         if branch_location is None:
-            return Branch.reference_parent(self, path, file_id,
-                                           possible_transports)
+            return Branch.reference_parent(self, path, possible_transports)
         branch_location = urlutils.join(self.user_url, branch_location)
         return Branch.open(branch_location,
                            possible_transports=possible_transports)
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2019-06-06 22:22:47 +0000
+++ breezy/bzr/bzrdir.py	2019-06-18 13:59:46 +0000
@@ -474,9 +474,9 @@
                 subtrees = basis.iter_references()
             else:
                 subtrees = []
-            for path, file_id in subtrees:
+            for path in subtrees:
                 target = urlutils.join(url, urlutils.escape(path))
-                sublocation = source_branch.reference_parent(path, file_id)
+                sublocation = source_branch.reference_parent(path)
                 sublocation.controldir.sprout(
                     target, basis.get_reference_revision(path),
                     force_new_repo=force_new_repo, recurse=recurse,
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-06-16 23:54:50 +0000
+++ breezy/bzr/workingtree_4.py	2019-06-18 13:59:46 +0000
@@ -563,7 +563,7 @@
             relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
             try:
                 if self.kind(relpath) == 'tree-reference':
-                    yield relpath, key[2]
+                    yield relpath
             except errors.NoSuchFile:
                 # path is missing on disk.
                 continue
 
=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2019-04-11 02:09:36 +0000
+++ breezy/git/branch.py	2019-06-18 13:59:46 +0000
@@ -790,12 +790,11 @@
         return GitMemoryTree(self, self.repository._git.object_store,
                              self.head)
 
-    def reference_parent(self, path, file_id=None, possible_transports=None):
-        """Return the parent branch for a tree-reference file_id
+    def reference_parent(self, path, possible_transports=None):
+        """Return the parent branch for a tree-reference.
 
-        :param path: The path of the file_id in the tree
-        :param file_id: Optional file_id of the tree reference
-        :return: A branch associated with the file_id
+        :param path: The path of the nested tree in the tree
+        :return: A branch associated with the nested tree
         """
         # FIXME should provide multiple branches, based on config
         url = urlutils.join(self.user_url, path)
 
=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2019-06-15 01:02:49 +0000
+++ breezy/git/tree.py	2019-06-18 13:59:46 +0000
@@ -524,7 +524,7 @@
         if self.supports_tree_reference():
             for path, entry in self.iter_entries_by_dir():
                 if entry.kind == 'tree-reference':
-                    yield path, self.mapping.generate_file_id(b'')
+                    yield path
 
     def get_revision_id(self):
         """See RevisionTree.get_revision_id."""
@@ -1136,7 +1136,7 @@
         # TODO(jelmer): Implement a more efficient version of this
         for path, entry in self.iter_entries_by_dir():
             if entry.kind == 'tree-reference':
-                yield path, self.mapping.generate_file_id(b'')
+                yield path
 
     def _get_dir_ie(self, path, parent_id):
         file_id = self.path2id(path)
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2019-06-15 12:04:34 +0000
+++ breezy/merge.py	2019-06-18 13:59:46 +0000
@@ -637,7 +637,7 @@
         for hook in Merger.hooks['post_merge']:
             hook(merge)
         if self.recurse == 'down':
-            for relpath, file_id in self.this_tree.iter_references():
+            for relpath in self.this_tree.iter_references():
                 sub_tree = self.this_tree.get_nested_tree(relpath)
                 other_revision = self.other_tree.get_reference_revision(
                     relpath)
@@ -645,8 +645,7 @@
                     continue
                 sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
                 sub_merge.merge_type = self.merge_type
-                other_branch = self.other_branch.reference_parent(
-                    relpath, file_id)
+                other_branch = self.other_branch.reference_parent(relpath)
                 sub_merge.set_other_revision(other_revision, other_branch)
                 base_tree_path = _mod_tree.find_previous_path(
                     self.this_tree, self.base_tree, relpath)
 
=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2018-11-16 23:21:31 +0000
+++ breezy/tests/per_tree/test_tree.py	2019-06-18 13:59:46 +0000
@@ -108,7 +108,7 @@
         tree.lock_read()
         self.addCleanup(tree.unlock)
         self.assertEqual(
-            [(u'subtree', subtree.get_root_id())],
+            [u'subtree'],
             list(tree.iter_references()))
 
     def test_get_root_id(self):
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2019-06-16 02:23:42 +0000
+++ breezy/tree.py	2019-06-18 13:59:46 +0000
@@ -347,7 +347,7 @@
         if self.supports_tree_reference():
             for path, entry in self.iter_entries_by_dir():
                 if entry.kind == 'tree-reference':
-                    yield path, entry.file_id
+                    yield path
 
     def kind(self, path):
         raise NotImplementedError("Tree subclass %s must implement kind"