Merge lp:~jelmer/brz/ignored-directory into lp:brz

[Jelmer Vernooij]

Properly handled ignored directories in Git trees.

Properly handled ignored directories in Git trees.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2018-08-04 17:32:58 +0000
+++ breezy/git/tests/test_workingtree.py	2018-08-12 03:29:07 +0000
@@ -76,6 +76,17 @@
         self.tree.revert(['a'])
         self.assertFalse(self.tree.is_versioned('a'))
 
+    def test_is_ignored_directory(self):
+        self.assertFalse(self.tree.is_ignored('a'))
+        self.build_tree(['a/'])
+        self.assertFalse(self.tree.is_ignored('a'))
+        self.build_tree_contents([('.gitignore', 'a\n')])
+        self.tree._ignoremanager = None
+        self.assertTrue(self.tree.is_ignored('a'))
+        self.build_tree_contents([('.gitignore', 'a/\n')])
+        self.tree._ignoremanager = None
+        self.assertTrue(self.tree.is_ignored('a'))
+
 
 class TreeDeltaFromGitChangesTests(TestCase):
 
 
=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-08-04 17:32:58 +0000
+++ breezy/git/tree.py	2018-08-12 03:29:07 +0000
@@ -1294,6 +1294,8 @@
         kind = osutils.file_kind(self.abspath(relpath))
         if kind == 'directory':
             (index, index_path) = self._lookup_index(relpath.encode('utf-8'))
+            if index is None:
+                return kind
             try:
                 mode = index[index_path].mode
             except KeyError:
 
=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2018-08-04 17:32:58 +0000
+++ breezy/git/workingtree.py	2018-08-12 03:29:07 +0000
@@ -631,13 +631,12 @@
         match = self._global_ignoreglobster.match(filename)
         if match is not None:
             return match
-        encoded_filename = filename.encode('utf-8')
         try:
             if self.kind(filename) == 'directory':
-                encoded_filename += b'/'
+                filename += '/'
         except errors.NoSuchFile:
             pass
-        encoded_filename = encoded_filename.lstrip(b'/')
+        filename = filename.lstrip('/')
         ignore_manager = self._get_ignore_manager()
         ps = list(ignore_manager.find_matching(filename))
         if not ps: