Merge lp:~jelmer/brz/optional-all-file-ids into lp:brz

[Jelmer Vernooij]

Make implementing Tree.all_file_ids() optional.

Make implementing Tree.all_file_ids() optional.

This is only used to find duplicate file ids in transform at the moment.
Because git file ids are based on the path, and paths are unique, we're
never going to have clashes.

[Martin Packman (gz)]

Thanks!

review: Approve

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

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

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2018-11-16 11:37:47 +0000
+++ breezy/git/mapping.py	2018-11-16 23:22:15 +0000
@@ -663,9 +663,6 @@
         self.paths = None
         self.mapping = mapping
 
-    def all_file_ids(self):
-        return self.file_ids.values()
-
     def set_file_id(self, path, file_id):
         if type(path) is not str:
             raise TypeError(path)

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-11-16 22:18:20 +0000
+++ breezy/git/tree.py	2018-11-16 23:22:15 +0000
@@ -322,7 +322,7 @@
         return self._fileid_map.lookup_file_id(osutils.safe_unicode(path))
 
     def all_file_ids(self):
-        return {self.path2id(path) for path in self.all_versioned_paths()}
+        raise errors.UnsupportedOperation(self.all_file_ids, self)
 
     def all_versioned_paths(self):
         ret = {u''}

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2018-11-16 19:47:19 +0000
+++ breezy/git/workingtree.py	2018-11-16 23:22:15 +0000
@@ -833,17 +833,7 @@
                                                                self.is_ignored(path) else "?"), kind, None, ie)
 
     def all_file_ids(self):
-        with self.lock_read():
-            ids = {u"": self.path2id("")}
-            for path in self.index:
-                if self.mapping.is_special_file(path):
-                    continue
-                path = path.decode("utf-8")
-                parent = posixpath.dirname(path).strip("/")
-                for e in self._add_missing_parent_ids(parent, ids):
-                    pass
-                ids[path] = self.path2id(path)
-            return set(ids.values())
+        raise errors.UnsupportedOperation(self.all_file_ids, self)
 
     def all_versioned_paths(self):
         with self.lock_read():

=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2018-11-16 23:22:15 +0000
@@ -176,12 +176,17 @@
                              list(tree.unknowns()))
         # __iter__ has no strongly defined order
         tree_root = tree.path2id('')
+        try:
+            all_file_ids = set(tree.all_file_ids())
+        except errors.UnsupportedOperation:
+            all_file_ids = None
         if tree.has_versioned_directories():
-            self.assertEqual(
-                {tree.path2id(p) for p in [
-                    '', '0file', '1top-dir', '1top-dir/1dir-in-1topdir',
-                    '1top-dir/0file-in-1topdir', 'symlink', u'2utf\u1234file']},
-                set(tree.all_file_ids()))
+            if all_file_ids is not None:
+                self.assertEqual(
+                    {tree.path2id(p) for p in [
+                        '', '0file', '1top-dir', '1top-dir/1dir-in-1topdir',
+                        '1top-dir/0file-in-1topdir', 'symlink', u'2utf\u1234file']},
+                    set(tree.all_file_ids()))
             # note that the order of the paths and fileids is deliberately
             # mismatched to ensure that the result order is path based.
             self.assertEqual(
@@ -194,11 +199,13 @@
                  ('1top-dir/1dir-in-1topdir', 'directory')],
                 [(path, node.kind) for path, node in tree.iter_entries_by_dir()])
         else:
-            self.assertEqual(
-                {tree.path2id(p) for p in [
-                    '', '0file', '1top-dir',
-                    '1top-dir/0file-in-1topdir', 'symlink', u'2utf\u1234file']},
-                set(tree.all_file_ids()))
+            if all_file_ids is not None:
+                self.assertEqual(
+                    {tree.path2id(p) for p in [
+                        '', '0file', '1top-dir',
+                        '1top-dir/0file-in-1topdir', 'symlink',
+                        u'2utf\u1234file']},
+                    set(tree.all_file_ids()))
             # note that the order of the paths and fileids is deliberately
             # mismatched to ensure that the result order is path based.
             self.assertEqual(

=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/per_tree/test_tree.py	2018-11-16 23:22:15 +0000
@@ -147,9 +147,13 @@
         tree = self.get_tree_no_parents_abc_content(work_tree)
         tree.lock_read()
         self.addCleanup(tree.unlock)
-        self.assertEqual(tree.all_file_ids(),
-                         {tree.path2id('a'), tree.path2id(''),
-                          tree.path2id('b'), tree.path2id('b/c')})
+        try:
+            self.assertEqual(tree.all_file_ids(),
+                             {tree.path2id('a'), tree.path2id(''),
+                              tree.path2id('b'), tree.path2id('b/c')})
+        except errors.UnsupportedOperation:
+            raise tests.TestNotApplicable(
+                'Tree does not support all_file_ids')
 
 
 class TestStoredKind(TestCaseWithTree):

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2018-11-16 23:22:15 +0000
@@ -1075,9 +1075,12 @@
         self.build_tree(['tree/a', 'tree/b'])
         tree.add(['a', 'b'])
         os.unlink('tree/a')
-        self.assertEqual(
-            {'a', 'b', ''},
-            set(tree.all_versioned_paths()))
+        try:
+            self.assertEqual(
+                    {'a', 'b', ''},
+                    set(tree.all_versioned_paths()))
+        except errors.UnsupportedOperation:
+            raise TestNotApplicable('tree does not support all_file_ids')
 
     def test_sprout_hardlink(self):
         real_os_link = getattr(os, 'link', None)

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-11-16 19:47:19 +0000
+++ breezy/transform.py	2018-11-16 23:22:15 +0000
@@ -720,9 +720,13 @@
     def _duplicate_ids(self):
         """Each inventory id may only be used once"""
         conflicts = []
+        try:
+            all_ids = self._tree.all_file_ids()
+        except errors.UnsupportedOperation:
+            # it's okay for non-file-id trees to raise UnsupportedOperation.
+            return []
         removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
                                 self._removed_id))
-        all_ids = self._tree.all_file_ids()
         active_tree_ids = all_ids.difference(removed_tree_ids)
         for trans_id, file_id in viewitems(self._new_id):
             if file_id in active_tree_ids:
@@ -2064,7 +2068,17 @@
         return tree_ids
 
     def all_versioned_paths(self):
-        return {self.id2path(fid) for fid in self.all_file_ids()}
+        tree_paths = set(self._transform._tree.all_versioned_paths())
+
+        tree_paths.difference_update(
+            self._transform.trans_id_tree_path(t)
+            for t in self._transform._removed_id)
+
+        tree_paths.update(
+            self._final_paths._determine_path(t)
+            for t in self._transform._new_id)
+
+        return tree_paths
 
     def _has_id(self, file_id, fallback_check):
         if file_id in self._transform._r_new_id: