Merge lp:~jelmer/brz/submodule-missing into lp:brz/3.2

[Jelmer Vernooij]

Cope with invalid submodules.

Cope with invalid submodules.

[Jelmer Vernooij (jelmer)]

review: Approve

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/109/

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

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

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2022-01-08 01:23:14 +0000
+++ breezy/git/dir.py	2022-01-25 14:16:15 +0000
@@ -210,9 +210,15 @@
                     sublocation = wt.get_reference_info(path)
                     if sublocation is None:
                         trace.warning("Unable to find submodule info for %s", path)
-                        return None
+                        continue
                     remote_url = urlutils.join(self.user_url, sublocation)
-                    subbranch = _mod_branch.Branch.open(remote_url, possible_transports=possible_transports)
+                    try:
+                        subbranch = _mod_branch.Branch.open(remote_url, possible_transports=possible_transports)
+                    except brz_errors.NotBranchError as e:
+                        trace.warning(
+                            'Unable to clone submodule %s from %s: %s',
+                            path, remote_url, e)
+                        continue
                     subbranch.controldir.sprout(
                         target, basis.get_reference_revision(path),
                         force_new_repo=force_new_repo, recurse=recurse,

=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2022-01-16 17:24:02 +0000
+++ breezy/git/repository.py	2022-01-25 14:16:15 +0000
@@ -186,7 +186,8 @@
             transaction = self._transaction
             self._transaction = None
             transaction.finish()
-            self._git.close()
+            if hasattr(self, '_git'):
+                self._git.close()
 
     def is_write_locked(self):
         return (self._lock_mode == 'w')

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-01-08 01:23:14 +0000
+++ breezy/git/tests/test_remote.py	2022-01-25 14:16:15 +0000
@@ -293,6 +293,33 @@
                 self.remote_real.head()),
             local.open_branch().last_revision())
 
+    def test_sprout_submodule_invalid(self):
+        self.sub_real = GitRepo.init('sub', mkdir=True)
+        self.sub_real.do_commit(
+            message=b'message in sub',
+            committer=b'committer <[e-mail]>',
+            author=b'author <[e-mail]>')
+
+        self.sub_real.clone('remote/nested')
+        self.remote_real.stage('nested')
+        self.permit_url(urljoin(self.remote_url, '../sub'))
+        self.assertIn(b'nested', self.remote_real.open_index())
+        self.remote_real.do_commit(
+            message=b'message',
+            committer=b'committer <[e-mail]>',
+            author=b'author <[e-mail]>')
+
+        remote = ControlDir.open(self.remote_url)
+        self.make_controldir('local', format=self._to_format)
+        local = remote.sprout('local')
+        self.assertEqual(
+            default_mapping.revision_id_foreign_to_bzr(
+                self.remote_real.head()),
+            local.open_branch().last_revision())
+        self.assertRaises(
+            NotBranchError,
+            local.open_workingtree().get_nested_tree, 'nested')
+
     def test_sprout_submodule_relative(self):
         self.sub_real = GitRepo.init('sub', mkdir=True)
         self.sub_real.do_commit(