Merge lp:~jelmer/brz/git-submodule-not-checked-out into lp:brz

[Jelmer Vernooij]

Don't show submodules that are not checked out as deltas.

Don't show submodules that are not checked out as deltas.

[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/622/

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

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

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

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

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2019-09-21 17:08:09 +0000
+++ breezy/git/tests/test_workingtree.py	2020-01-19 15:24:53 +0000
@@ -275,3 +275,15 @@
         t.add(b"a", S_IFGITLINK, a.id)
         self.store.add_object(t)
         self.expectDelta([], tree_id=t.id)
+
+    def test_submodule_not_checked_out(self):
+        a = Blob.from_string(b'irrelevant\n')
+        with self.wt.lock_tree_write():
+            (index, index_path) = self.wt._lookup_index(b'a')
+            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
+            self.wt._index_dirty = True
+        os.mkdir(self.wt.abspath('a'))
+        t = Tree()
+        t.add(b"a", S_IFGITLINK, a.id)
+        self.store.add_object(t)
+        self.expectDelta([], tree_id=t.id)

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2020-01-11 04:11:04 +0000
+++ breezy/git/tree.py	2020-01-19 15:24:53 +0000
@@ -1603,24 +1603,18 @@
             if e.errno == errno.ENOENT:
                 # Entry was removed; keep it listed, but mark it as gone.
                 blobs[path] = (ZERO_SHA, 0)
-            elif e.errno == errno.EISDIR:
-                # Backwards compatibility with Dulwich < 0.19.12;
-                # newer versions of Dulwich return either an entry for the
-                # submodule or None for directories.
+            else:
+                raise
+        else:
+            if live_entry is None:
+                # Entry was turned into a directory.
+                # Maybe it's just a submodule that's not checked out?
                 if S_ISGITLINK(index_entry.mode):
                     blobs[path] = (index_entry.sha, index_entry.mode)
                 else:
-                    # Entry was turned into a directory
                     dirified.append((path, Tree().id, stat.S_IFDIR))
                     store.add_object(Tree())
             else:
-                raise
-        else:
-            if live_entry is None:
-                # Entry was turned into a directory
-                dirified.append((path, Tree().id, stat.S_IFDIR))
-                store.add_object(Tree())
-            else:
                 mode = live_entry.mode
                 if not trust_executable:
                     if mode_is_executable(index_entry.mode):

=== modified file 'setup.py'
--- setup.py	2019-06-02 05:13:10 +0000
+++ setup.py	2020-01-19 15:24:53 +0000
@@ -69,7 +69,7 @@
         # Technically, Breezy works without these two dependencies too. But there's
         # no way to enable them by default and let users opt out.
         'fastimport>=0.9.8',
-        'dulwich>=0.19.11',
+        'dulwich>=0.19.12',
         ],
     'extras_require': {
         'fastimport': [],