Merge lp:~jelmer/brz/supports-rename-tracking into lp:brz

[Jelmer Vernooij]

Add a flag for Trees to indicate whether they support rename tracking.

Add a flag for Trees to indicate whether they support rename tracking.

For now, this just causes tests to stop expecting rename tracking. In the future, this can be used to determine whether rename guessing should be used (e.g. for git).

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/tests/matchers.py'
--- breezy/tests/matchers.py	2018-03-23 23:31:30 +0000
+++ breezy/tests/matchers.py	2018-03-23 23:31:30 +0000
@@ -200,7 +200,13 @@
         """Get the (path, previous_path) pairs for the current tree."""
         with tree.lock_read(), self.previous_tree.lock_read():
             for path, ie in tree.iter_entries_by_dir():
-                previous_path = find_previous_path(tree, self.previous_tree, path)
+                if tree.supports_rename_tracking():
+                    previous_path = find_previous_path(tree, self.previous_tree, path)
+                else:
+                    if self.previous_tree.is_versioned(path):
+                        previous_path = path
+                    else:
+                        previous_path = None
                 if previous_path:
                     kind = self.previous_tree.kind(previous_path)
                     if kind == 'directory':
@@ -242,6 +248,10 @@
             entries = list(self._strip_unreferenced_directories(self.previous_entries))
         else:
             entries = self.previous_entries
+        if not tree.supports_rename_tracking():
+            entries = [
+                (path, path if self.previous_tree.is_versioned(path) else None)
+                for (path, previous_path) in entries]
         return Equals(entries).match(actual)
 
 

=== modified file 'breezy/tests/per_branch/test_commit.py'
--- breezy/tests/per_branch/test_commit.py	2018-01-12 08:52:43 +0000
+++ breezy/tests/per_branch/test_commit.py	2018-03-23 23:31:30 +0000
@@ -194,7 +194,8 @@
             dir_id = tree.path2id('dir')
             tree.add('dir/subfile')
             dir_subfile_id = tree.path2id('dir/subfile')
-            tree.mkdir('to_be_unversioned')
+            tree.put_file_bytes_non_atomic('to_be_unversioned', 'blah')
+            tree.add(['to_be_unversioned'])
             to_be_unversioned_id = tree.path2id('to_be_unversioned')
             tree.put_file_bytes_non_atomic('dir/subfile', 'def')
             revid1 = tree.commit('first revision')
@@ -212,11 +213,19 @@
             revid2 = tree.commit('second revision')
 
         expected_delta = delta.TreeDelta()
-        expected_delta.added = [('added_dir', added_dir_id, 'directory')]
-        expected_delta.removed = [('to_be_unversioned',
-                                   to_be_unversioned_id, 'directory')]
-        expected_delta.renamed = [('dir/subfile', 'dir/subfile_renamed',
-                                   dir_subfile_id, 'file', False, False)]
+        if tree.has_versioned_directories():
+            expected_delta.added.append(('added_dir', added_dir_id, 'directory'))
+        if tree.supports_rename_tracking():
+            expected_delta.removed = [('to_be_unversioned',
+                                       to_be_unversioned_id, 'file')]
+            expected_delta.renamed = [('dir/subfile', 'dir/subfile_renamed',
+                                       dir_subfile_id, 'file', False, False)]
+        else:
+            expected_delta.added.append(('dir/subfile_renamed',
+                                        tree.path2id('dir/subfile_renamed'), 'file'))
+            expected_delta.removed = [
+                    ('dir/subfile', dir_subfile_id, 'file'),
+                    ('to_be_unversioned', to_be_unversioned_id, 'file')]
         expected_delta.modified=[('rootfile', rootfile_id, 'file', True,
                                   False)]
         self.assertEqual([('pre_commit', 1, revid1, 2, revid2,

=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2018-03-02 00:38:34 +0000
+++ breezy/tests/per_tree/test_tree.py	2018-03-23 23:31:30 +0000
@@ -359,4 +359,12 @@
     def test_has_versioned_directories(self):
         work_tree = self.make_branch_and_tree('tree')
         tree = self._convert_tree(work_tree)
-        self.assertSubset([tree.has_versioned_directories()], (True, False))
+        self.assertIn(tree.has_versioned_directories(), (True, False))
+
+
+class TestSupportsRenameTracking(TestCaseWithTree):
+
+    def test_supports_rename_tracking(self):
+        work_tree = self.make_branch_and_tree('tree')
+        tree = self._convert_tree(work_tree)
+        self.assertSubset([tree.supports_rename_tracking()], (True, False))

=== modified file 'breezy/tests/per_workingtree/test_check_state.py'
--- breezy/tests/per_workingtree/test_check_state.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_workingtree/test_check_state.py	2018-03-23 23:31:30 +0000
@@ -81,8 +81,11 @@
         tree = self.make_initial_tree()
         foo_id = tree.path2id('foo')
         tree.rename_one('foo', 'baz')
-        self.assertEqual(None, tree.path2id('foo'))
-        self.assertEqual(foo_id, tree.path2id('baz'))
+        self.assertFalse(tree.is_versioned('foo'))
+        if tree.supports_rename_tracking():
+            self.assertEqual(foo_id, tree.path2id('baz'))
+        else:
+            self.assertTrue(tree.is_versioned('baz'))
         tree.reset_state()
         # After reset, we should have forgotten about the rename, but we won't
         # have

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-03-23 23:31:30 +0000
+++ breezy/tree.py	2018-03-23 23:31:30 +0000
@@ -108,6 +108,14 @@
     trees or versioned trees.
     """
 
+    def supports_rename_tracking(self):
+        """Whether this tree supports rename tracking.
+
+        This defaults to True, but some implementations may want to override
+        it.
+        """
+        return True
+
     def has_versioned_directories(self):
         """Whether this tree can contain explicitly versioned directories.