Merge lp:~jelmer/brz/has-path-relations into lp:brz

[Jelmer Vernooij]

Use HasPathRelations in a few more places.

Simplify the actual HasPathRelations implementation to always take tuples with
current and previous path. The mode in which only the current path is specified
is not useful; the HasLayout matcher can already be used for that.

[Martin Packman (gz)]

Looks good, thanks.

review: Approve

=== modified file 'breezy/tests/matchers.py'
--- breezy/tests/matchers.py	2018-03-18 14:48:55 +0000
+++ breezy/tests/matchers.py	2018-03-24 13:52:34 +0000
@@ -222,22 +222,20 @@
 
         :param entries: List of path strings or (path, previous_path) tuples to process
         """
+        directory_used = set()
         directories = []
-        for entry in entries:
-            if isinstance(entry, (str, text_type)):
-                path = entry
-            else:
-                path = entry[0]
+        for (path, previous_path) in entries:
             if not path or path[-1] == "/":
                 # directory
-                directories.append((path, entry))
+                directories.append((path, previous_path))
             else:
                 # Yield the referenced parent directories
-                for dirpath, direntry in directories:
-                    if osutils.is_inside(dirpath, path):
-                        yield direntry
-                directories = []
-                yield entry
+                for direntry in directories:
+                    if osutils.is_inside(direntry[0], path):
+                        directory_used.add(direntry[0])
+        for (path, previous_path) in entries:
+            if (not path.endswith("/")) or path in directory_used:
+                yield (path, previous_path)
 
     def __str__(self):
         return 'HasPathRelations(%r, %r)' % (self.previous_tree, self.previous_entries)
 
=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2018-03-10 14:20:40 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2018-03-24 13:52:34 +0000
@@ -33,6 +33,7 @@
     CannotCommitSelectedFileMerge,
     PointlessCommit,
     )
+from breezy.tests.matchers import HasPathRelations
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 from breezy.tests.testui import ProgressRecordingUIFactory
 
@@ -66,51 +67,37 @@
         tree_a = self.make_branch_and_tree('a')
         self.build_tree(['a/dir/', 'a/dir/f1', 'a/dir/f2', 'a/dir2/'])
         tree_a.add(['dir', 'dir/f1', 'dir/f2', 'dir2'])
-        dir2_id =  tree_a.path2id('dir2')
-        f1_id = tree_a.path2id('dir/f1')
         rev_id1 = tree_a.commit('init')
+        revtree = tree_a.branch.repository.revision_tree(rev_id1)
         # Rename one entry out of this directory
         tree_a.rename_one('dir/f1', 'dir2/a')
         osutils.rmtree('a/dir')
         tree_a.commit('autoremoved')
 
-        with tree_a.lock_read():
-            root_id = tree_a.get_root_id()
-            paths = [(path, ie.file_id)
-                     for path, ie in tree_a.iter_entries_by_dir()]
         # The only paths left should be the root
-        self.assertEqual([('', root_id),
-                          ('dir2', dir2_id),
-                          ('dir2/a', f1_id),
-                         ], paths)
+        self.assertThat(
+            tree_a, HasPathRelations(
+                revtree,
+                [('', ''), ('dir2/', 'dir2/'), ('dir2/a', 'dir/f1')]))
 
     def test_no_autodelete_alternate_renamed(self):
         # Test for bug #114615
         tree_a = self.make_branch_and_tree('A')
         self.build_tree(['A/a/', 'A/a/m', 'A/a/n'])
         tree_a.add(['a', 'a/m', 'a/n'])
-        a_id = tree_a.path2id('a')
-        m_id = tree_a.path2id('a/m')
-        n_id = tree_a.path2id('a/n')
         tree_a.commit('init')
 
-        with tree_a.lock_read():
-            root_id = tree_a.get_root_id()
-
         tree_b = tree_a.controldir.sprout('B').open_workingtree()
         self.build_tree(['B/xyz/'])
         tree_b.add(['xyz'])
-        xyz_id = tree_b.path2id('xyz')
         tree_b.rename_one('a/m', 'xyz/m')
         osutils.rmtree('B/a')
         tree_b.commit('delete in B')
 
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('xyz', xyz_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+        self.assertThat(
+                tree_b,
+                HasPathRelations(
+                    tree_a, [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
 
         self.build_tree_contents([('A/a/n', 'new contents for n\n')])
         tree_a.commit('change n in A')
@@ -119,14 +106,13 @@
         # (in A) and removed (in B), so 'a' needs to be restored.
         num_conflicts = tree_b.merge_from_branch(tree_a.branch)
         self.assertEqual(3, num_conflicts)
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('a', a_id),
-                          ('xyz', xyz_id),
-                          ('a/n.OTHER', n_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+
+        self.assertThat(
+                tree_b, HasPathRelations(
+                    tree_a,
+                    [('', ''), ('a/', 'a/'), ('xyz/', None),
+                     ('a/n.OTHER', 'a/n'), ('xyz/m', 'a/m')]))
+
         osutils.rmtree('B/a')
         try:
             # bzr resolve --all
@@ -136,12 +122,11 @@
             # effect.
             pass
         tree_b.commit('autoremove a, without touching xyz/m')
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('xyz', xyz_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+
+        self.assertThat(
+                tree_b, HasPathRelations(
+                    tree_a,
+                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
 
     def test_commit_exclude_pending_merge_fails(self):
         """Excludes are a form of partial commit."""
@@ -173,15 +158,13 @@
         tree.lock_read()
         self.addCleanup(tree.unlock)
         changes = list(tree.iter_changes(tree.basis_tree()))
-        self.assertEqual(2, len(changes))
-        self.assertEqual((None, 'b'), changes[0][1])
-        self.assertEqual((None, 'c'), changes[1][1])
+        self.assertEqual([(None, 'b'), (None, 'c')], [c[1] for c in changes])
 
     def test_commit_exclude_subtree_of_selected(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree(['a/', 'a/b'])
+        self.build_tree(['a/', 'a/b', 'a/c'])
         tree.smart_add(['.'])
-        tree.commit('test', specific_files=['a'], exclude=['a/b'])
+        tree.commit('test', specific_files=['a', 'a/c'], exclude=['a/b'])
         # If a/b was excluded it will still be 'added' in status.
         tree.lock_read()
         self.addCleanup(tree.unlock)
 
=== modified file 'breezy/tests/per_workingtree/test_unversion.py'
--- breezy/tests/per_workingtree/test_unversion.py	2018-03-10 14:20:40 +0000
+++ breezy/tests/per_workingtree/test_unversion.py	2018-03-24 13:52:34 +0000
@@ -19,6 +19,7 @@
 from breezy import (
     errors,
     )
+from breezy.tests.matchers import HasPathRelations
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
 
@@ -44,12 +45,19 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['del/', 'del/sub/', 'del/sub/b'])
         tree.add(['del', 'del/sub', 'del/sub/b'])
-        b_id = tree.path2id('del/sub/b')
-        tree.commit('setup')
+        revid = tree.commit('setup')
+        revtree = tree.branch.repository.revision_tree(revid)
         tree.rename_one('del/sub', 'sub')
-        self.assertEqual('sub/b', tree.id2path(b_id))
-        tree.unversion(['del', 'sub/b'])
-        self.assertRaises(errors.NoSuchId, tree.id2path, b_id)
+        self.assertThat(
+                tree,
+                HasPathRelations(revtree, [('', ''), ('del/', 'del/'), ('sub/', 'del/sub/'), ('sub/b', 'del/sub/b')]))
+        if tree.has_versioned_directories():
+            tree.unversion(['del', 'sub/b'])
+        else:
+            tree.unversion(['sub/b'])
+        self.assertThat(
+                tree,
+                HasPathRelations(revtree, [('', ''), ('sub/', 'del/sub/')]))
 
     def test_unversion_several_files(self):
         """After unversioning several files, they should not be versioned."""
@@ -119,72 +127,47 @@
         self.build_tree(['a/dir/', 'a/dir/f1', 'a/dir/f2', 'a/dir/f3',
                          'a/dir2/'])
         tree.add(['dir', 'dir/f1', 'dir/f2', 'dir/f3', 'dir2'])
-        dir_id = tree.path2id('dir')
-        dir2_id = tree.path2id('dir2')
-        f1_id = tree.path2id('dir/f1')
-        f2_id = tree.path2id('dir/f2')
-        f3_id = tree.path2id('dir/f3')
         rev_id1 = tree.commit('init')
+        revtree = tree.branch.repository.revision_tree(rev_id1)
         # Start off by renaming entries, and then unversion a bunch of entries
         # https://bugs.launchpad.net/bzr/+bug/114615
         tree.rename_one('dir/f1', 'dir/a')
         tree.rename_one('dir/f2', 'dir/z')
         tree.move(['dir/f3'], 'dir2')
 
-        tree.lock_read()
-        try:
-            root_id = tree.get_root_id()
-            paths = [(path, ie.file_id)
-                     for path, ie in tree.iter_entries_by_dir()]
-        finally:
-            tree.unlock()
-        self.assertEqual([('', root_id),
-                          ('dir', dir_id),
-                          ('dir2', dir2_id),
-                          ('dir/a', f1_id),
-                          ('dir/z', f2_id),
-                          ('dir2/f3', f3_id),
-                         ], paths)
+        self.assertThat(
+                tree, HasPathRelations(
+                    revtree,
+                    [('', ''), ('dir/', 'dir/'), ('dir2/', 'dir2/'),
+                     ('dir/a', 'dir/f1'), ('dir/z', 'dir/f2'),
+                     ('dir2/f3', 'dir/f3')]))
 
         tree.unversion({'dir'})
-        paths = [(path, ie.file_id)
-                 for path, ie in tree.iter_entries_by_dir()]
-
-        self.assertEqual([('', root_id),
-                          ('dir2', dir2_id),
-                          ('dir2/f3', f3_id),
-                         ], paths)
+        self.assertThat(
+                tree,
+                HasPathRelations(
+                    revtree,
+                    [('', ''), ('dir2/', 'dir2/'), ('dir2/f3', 'dir/f3')]))
 
     def test_unversion_after_conflicted_merge(self):
         # Test for bug #114615
         tree_a = self.make_branch_and_tree('A')
         self.build_tree(['A/a/', 'A/a/m', 'A/a/n'])
         tree_a.add(['a', 'a/m', 'a/n'])
-        a_id = tree_a.path2id('a')
-        m_id = tree_a.path2id('a/m')
-        n_id = tree_a.path2id('a/n')
         tree_a.commit('init')
 
-        tree_a.lock_read()
-        try:
-            root_id = tree_a.get_root_id()
-        finally:
-            tree_a.unlock()
-
         tree_b = tree_a.controldir.sprout('B').open_workingtree()
         self.build_tree(['B/xyz/'])
         tree_b.add(['xyz'])
-        xyz_id = tree_b.path2id('xyz')
         tree_b.rename_one('a/m', 'xyz/m')
         tree_b.unversion(['a'])
         tree_b.commit('delete in B')
 
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('xyz', xyz_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+        self.assertThat(
+                tree_b,
+                HasPathRelations(
+                    tree_a,
+                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
 
         self.build_tree_contents([('A/a/n', 'new contents for n\n')])
         tree_a.commit('change n in A')
@@ -194,18 +177,17 @@
         # because 'a' is still an existing directory
         num_conflicts = tree_b.merge_from_branch(tree_a.branch)
         self.assertEqual(4, num_conflicts)
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('a', a_id),
-                          ('xyz', xyz_id),
-                          ('a/n.OTHER', n_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+
+        self.assertThat(
+                tree_b,
+                HasPathRelations(
+                    tree_a,
+                    [('', ''), ('a/', 'a/'), ('xyz/', None),
+                     ('a/n.OTHER', 'a/n'), ('xyz/m', 'a/m')]))
+
         tree_b.unversion(['a'])
-        paths = [(path, ie.file_id)
-                 for path, ie in tree_b.iter_entries_by_dir()]
-        self.assertEqual([('', root_id),
-                          ('xyz', xyz_id),
-                          ('xyz/m', m_id),
-                         ], paths)
+        self.assertThat(
+                tree_b,
+                HasPathRelations(
+                    tree_a,
+                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))