Merge lp:~jelmer/brz/find-related-paths-git-directories into lp:brz

[Jelmer Vernooij]

Fix handling of empty directories in iter_changes

Fix handling of empty directories in iter_changes.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/2594/

=== modified file 'breezy/git/tests/test_tree.py'
--- breezy/git/tests/test_tree.py	2022-01-21 17:19:24 +0000
+++ breezy/git/tests/test_tree.py	2022-10-02 17:03:24 +0000
@@ -17,10 +17,9 @@
 
 """Tests for breezy.git.tests."""
 
-from __future__ import absolute_import
-
 import stat
-from unittest import TestCase
+from breezy.errors import PathsNotVersionedError
+from breezy.tests import TestCase, TestCaseWithTransport
 
 from dulwich.objects import Tree, Blob
 
@@ -32,6 +31,7 @@
     )
 
 from breezy.git.mapping import default_mapping
+from breezy.workingtree import WorkingTree
 
 
 REG_MODE = stat.S_IFREG | 0o644
@@ -340,3 +340,53 @@
             (b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'symlink'),
             (False, False), False))
         self.assertEqual(expected_delta, delta)
+
+
+class FindRelatedPathsAcrossTrees(TestCaseWithTransport):
+
+    def test_none(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.assertIs(None, wt.find_related_paths_across_trees(None))
+
+    def test_empty(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.assertEqual([], list(wt.find_related_paths_across_trees([])))
+
+    def test_directory(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.build_tree(['t1/dir/', 't1/dir/file'])
+        wt.add(['dir', 'dir/file'])
+        self.assertEqual(['dir/file'], list(wt.find_related_paths_across_trees(['dir/file'])))
+        self.assertEqual(['dir'], list(wt.find_related_paths_across_trees(['dir'])))
+
+    def test_empty_directory(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.build_tree(['t1/dir/'])
+        wt.add(['dir'])
+        self.assertEqual(['dir'], list(wt.find_related_paths_across_trees(['dir'])))
+        self.assertRaises(PathsNotVersionedError, wt.find_related_paths_across_trees, ['dir/file'])
+
+    def test_missing(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.assertRaises(PathsNotVersionedError, wt.find_related_paths_across_trees, ['file'])
+
+    def test_not_versioned(self):
+        self.make_branch_and_tree('t1', format='git')
+        self.make_branch_and_tree('t2', format='git')
+        wt1 = WorkingTree.open('t1')
+        wt2 = WorkingTree.open('t2')
+        self.build_tree(['t1/file'])
+        self.build_tree(['t2/file'])
+        self.assertRaises(PathsNotVersionedError, wt1.find_related_paths_across_trees, ['file'], [wt2])
+
+    def test_single(self):
+        self.make_branch_and_tree('t1', format='git')
+        wt = WorkingTree.open('t1')
+        self.build_tree(['t1/file'])
+        wt.add('file')
+        self.assertEqual(['file'], list(wt.find_related_paths_across_trees(['file'])))

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2022-08-22 18:19:46 +0000
+++ breezy/git/tree.py	2022-10-02 17:03:24 +0000
@@ -19,6 +19,7 @@
 
 from collections import deque
 import errno
+from functools import partial
 from io import BytesIO
 import os
 
@@ -282,18 +283,31 @@
                                         require_versioned=True):
         if paths is None:
             return None
+
+        def include(t, p):
+            if t.is_versioned(p):
+                return True
+            # Include directories, since they may exist but just be
+            # empty
+            try:
+                if t.kind(p) == 'directory':
+                    return True
+            except _mod_transport.NoSuchFile:
+                return False
+            return False
+
         if require_versioned:
             trees = [self] + (trees if trees is not None else [])
             unversioned = set()
             for p in paths:
                 for t in trees:
-                    if t.is_versioned(p):
+                    if include(t, p):
                         break
                 else:
                     unversioned.add(p)
             if unversioned:
                 raise errors.PathsNotVersionedError(unversioned)
-        return filter(self.is_versioned, paths)
+        return filter(partial(include, self), paths)
 
     def _submodule_config(self):
         if self._submodules is None: