Merge lp:~jelmer/brz/nomore-invtree into lp:brz

[Jelmer Vernooij]

Some refactoring; check for features rather than a specific implementation (InventoryTree).

Some refactoring; check for features rather than a specific implementation (InventoryTree).

[Martin Packman (gz)]

Makes sense, thanks.

review: Approve

=== modified file 'breezy/tests/per_tree/__init__.py'
--- breezy/tests/per_tree/__init__.py	2018-09-15 00:32:05 +0000
+++ breezy/tests/per_tree/__init__.py	2018-09-17 12:34:26 +0000
@@ -347,13 +347,13 @@
         'get_root_id',
         'get_symlink_target',
         'ids',
-        'inv',
         'iter_search_rules',
         'is_executable',
         'list_files',
         'locking',
         'path_content_summary',
         'revision_tree',
+        'symlinks',
         'test_trees',
         'tree',
         'walkdirs',
 
=== modified file 'breezy/tests/per_tree/test_ids.py'
--- breezy/tests/per_tree/test_ids.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/per_tree/test_ids.py	2018-09-17 12:34:26 +0000
@@ -16,14 +16,15 @@
 
 from breezy import (
     errors,
-)
+    tests,
+    )
 from breezy.tests.per_tree import TestCaseWithTree
 
 
-class IdTests(TestCaseWithTree):
+class Path2IdTests(TestCaseWithTree):
 
     def setUp(self):
-        super(IdTests, self).setUp()
+        super(Path2IdTests, self).setUp()
         work_a = self.make_branch_and_tree('wta')
         if not work_a.supports_setting_file_ids():
             self.skipTest("working tree does not support setting file ids")
@@ -52,3 +53,33 @@
         self.assertEqual('dir', self.tree_a.id2path(b'dir-id'))
         self.assertEqual('dir/file', self.tree_a.id2path(b'file-id'))
         self.assertRaises(errors.NoSuchId, self.tree_a.id2path, b'nonexistant')
+
+class Path2IdsTests(TestCaseWithTree):
+
+    def test_paths2ids_recursive(self):
+        work_tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/dir/', 'tree/dir/file'])
+        work_tree.add(['dir', 'dir/file'])
+        if not work_tree.supports_setting_file_ids():
+            raise tests.TestNotApplicable(
+                "test not applicable on non-inventory tests")
+        tree = self._convert_tree(work_tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertEqual({tree.path2id('dir'), tree.path2id('dir/file')},
+                         tree.paths2ids(['dir']))
+
+    def test_paths2ids_forget_old(self):
+        work_tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/file'])
+        work_tree.add('file')
+        work_tree.commit('commit old state')
+        work_tree.remove('file')
+        if not work_tree.supports_setting_file_ids():
+            raise tests.TestNotApplicable(
+                "test not applicable on non-inventory tests")
+        tree = self._convert_tree(work_tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertEqual(set([]), tree.paths2ids(['file'],
+                         require_versioned=False))
 
=== renamed file 'breezy/tests/per_tree/test_inv.py' => 'breezy/tests/per_tree/test_symlinks.py'
--- breezy/tests/per_tree/test_inv.py	2018-09-14 13:54:04 +0000
+++ breezy/tests/per_tree/test_symlinks.py	2018-09-17 12:34:26 +0000
@@ -23,7 +23,6 @@
 from breezy.tests import (
     per_tree,
     )
-from breezy.bzr.inventorytree import InventoryTree
 from breezy.mutabletree import MutableTree
 from breezy.tests import TestSkipped
 from breezy.transform import _PreviewTree
@@ -36,12 +35,12 @@
     return next(tree.iter_entries_by_dir(specific_files=[path]))[1]
 
 
-class TestInventoryWithSymlinks(per_tree.TestCaseWithTree):
+class TestTreeWithSymlinks(per_tree.TestCaseWithTree):
 
     _test_needs_features = [features.SymlinkFeature]
 
     def setUp(self):
-        super(TestInventoryWithSymlinks, self).setUp()
+        super(TestTreeWithSymlinks, self).setUp()
         self.tree = self.get_tree_with_subdirs_and_all_content_types()
         self.tree.lock_read()
         self.addCleanup(self.tree.unlock)
@@ -67,33 +66,3 @@
         self.assertEqual(entry.kind, 'symlink')
         self.assertEqual(None, entry.text_size)
 
-
-class TestInventory(per_tree.TestCaseWithTree):
-
-    def test_paths2ids_recursive(self):
-        work_tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/dir/', 'tree/dir/file'])
-        work_tree.add(['dir', 'dir/file'])
-        tree = self._convert_tree(work_tree)
-        if not isinstance(tree, InventoryTree):
-            raise tests.TestNotApplicable(
-                "test not applicable on non-inventory tests")
-        tree.lock_read()
-        self.addCleanup(tree.unlock)
-        self.assertEqual({tree.path2id('dir'), tree.path2id('dir/file')},
-                         tree.paths2ids(['dir']))
-
-    def test_paths2ids_forget_old(self):
-        work_tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/file'])
-        work_tree.add('file')
-        work_tree.commit('commit old state')
-        work_tree.remove('file')
-        tree = self._convert_tree(work_tree)
-        if not isinstance(tree, InventoryTree):
-            raise tests.TestNotApplicable(
-                "test not applicable on non-inventory tests")
-        tree.lock_read()
-        self.addCleanup(tree.unlock)
-        self.assertEqual(set([]), tree.paths2ids(['file'],
-                         require_versioned=False))