Merge lp:~jelmer/brz/fix-submodule-import into lp:brz

[Jelmer Vernooij]

Support importing Git submodules as tree references.

Support importing Git submodules as tree references.

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

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2020-01-20 00:51:05 +0000
+++ breezy/git/branch.py	2020-01-24 02:05:30 +0000
@@ -987,8 +987,8 @@
                 for path, url, section in parse_submodules(
                         GitConfigFile.from_file(f)):
                     self.target.set_reference_info(
-                        path.decode('utf-8'), url.decode('utf-8'),
-                        tree.path2id(path.decode('utf-8')))
+                        tree.path2id(path.decode('utf-8')), url.decode('utf-8'),
+                        path.decode('utf-8'))
         except errors.NoSuchFile:
             pass
 

=== modified file 'breezy/git/fetch.py'
--- breezy/git/fetch.py	2020-01-18 00:08:16 +0000
+++ breezy/git/fetch.py	2020-01-24 02:05:30 +0000
@@ -126,7 +126,7 @@
     # Check what revision we should store
     parent_keys = []
     for ptree in parent_bzr_trees:
-        ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, file_id)
+        ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, file_id, recurse='none')
         if ppath is None:
             continue
         pkind = ptree.kind(ppath)
@@ -182,12 +182,13 @@
     (base_mode, mode) = modes
     if base_hexsha == hexsha and base_mode == mode:
         return [], {}
+    path = path.decode('utf-8')
     file_id = lookup_file_id(path)
     invdelta = []
     ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
     ie.revision = revision_id
     if base_hexsha is not None:
-        old_path = path.decode("utf-8")  # Renames are not supported yet
+        old_path = path  # Renames are not supported yet
         if stat.S_ISDIR(base_mode):
             invdelta.extend(remove_disappeared_children(
                 base_bzr_tree, old_path, lookup_object(base_hexsha), [],

=== modified file 'breezy/git/tests/__init__.py'
--- breezy/git/tests/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/__init__.py	2020-01-24 02:05:30 +0000
@@ -96,6 +96,12 @@
         self.commit_info.append(b'M %s :%d %s\n'
                                 % (mode, mark, self._encode_path(path)))
 
+    def set_submodule(self, path, commit_sha):
+        """Create or update submodule at a given path."""
+        mode = b'160000'
+        self.commit_info.append(
+            b'M %s %s %s\n' % (mode, commit_sha, self._encode_path(path)))
+
     def set_file(self, path, content, executable):
         """Create or update content at a given path."""
         mark = self._create_blob(content)

=== modified file 'breezy/git/tests/test_branch.py'
--- breezy/git/tests/test_branch.py	2019-02-15 18:31:22 +0000
+++ breezy/git/tests/test_branch.py	2020-01-24 02:05:30 +0000
@@ -245,6 +245,35 @@
         # Dulwich raises a UserWarning for tags with invalid target
         self.assertIn(('ref refs/tags/lala points at non-present sha ' + ("aa" * 20), ), [w.args for w in warnings])
 
+    def test_interbranch_pull_submodule(self):
+        path = "d"
+        os.mkdir(path)
+        os.chdir(path)
+        GitRepo.init('.')
+        bb = tests.GitBranchBuilder()
+        bb.set_file("foobar", b"foo\nbar\n", False)
+        mark1 = bb.commit(b"Somebody <[e-mail]>", b"mymsg")
+        bb.set_submodule("core", b'102ee7206ebc4227bec8ac02450972e6738f4a33')
+        bb.set_file('.gitmodules', b"""\
+[submodule "core"]
+  path = core
+  url = https://github.com/phhusson/QuasselC.git
+""", False)
+        mark2 = bb.commit(b"Somebody <[e-mail]>", b"mymsg")
+        marks = bb.finish()
+        os.chdir("..")
+        gitsha1 = marks[mark1]
+        gitsha2 = marks[mark2]
+        oldrepo = Repository.open(path)
+        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
+        newbranch = self.make_branch('g')
+        inter_branch = InterBranch.get(Branch.open(path), newbranch)
+        inter_branch.pull()
+        self.assertEqual(revid2, newbranch.last_revision())
+        self.assertEqual(
+            ('https://github.com/phhusson/QuasselC.git', 'core'),
+            newbranch.get_reference_info(newbranch.basis_tree().path2id('core')))
+
     def test_interbranch_pull(self):
         path, (gitsha1, gitsha2) = self.make_tworev_branch()
         oldrepo = Repository.open(path)

=== modified file 'breezy/git/tests/test_fetch.py'
--- breezy/git/tests/test_fetch.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_fetch.py	2020-01-24 02:05:30 +0000
@@ -502,7 +502,7 @@
         self.assertEqual(2, len(ret))
         self.assertEqual(
             ret[0], ("foo/bar", None, base_inv.path2id("foo/bar"), None))
-        self.assertEqual(ret[1][:3], ("foo", b"foo",
+        self.assertEqual(ret[1][:3], ("foo", "foo",
                                       self._mapping.generate_file_id("foo")))
         ie = ret[1][3]
         self.assertEqual(ie.kind, "tree-reference")

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2020-01-19 14:53:22 +0000
+++ breezy/tree.py	2020-01-24 02:05:30 +0000
@@ -1207,7 +1207,7 @@
 InterTree.register_optimiser(InterTree)
 
 
-def find_previous_paths(from_tree, to_tree, paths):
+def find_previous_paths(from_tree, to_tree, paths, recurse='none'):
     """Find previous tree paths.
 
     :param from_tree: From tree
@@ -1218,11 +1218,11 @@
     """
     ret = {}
     for path in paths:
-        ret[path] = find_previous_path(from_tree, to_tree, path)
+        ret[path] = find_previous_path(from_tree, to_tree, path, recurse=recurse)
     return ret
 
 
-def find_previous_path(from_tree, to_tree, path, file_id=None):
+def find_previous_path(from_tree, to_tree, path, file_id=None, recurse='none'):
     """Find previous tree path.
 
     :param from_tree: From tree
@@ -1236,7 +1236,7 @@
     if file_id is None:
         raise errors.NoSuchFile(path)
     try:
-        return to_tree.id2path(file_id)
+        return to_tree.id2path(file_id, recurse=recurse)
     except errors.NoSuchId:
         return None
 

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-01-19 15:58:34 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-01-24 02:05:30 +0000
@@ -99,6 +99,10 @@
 * CVS pserver URLs now indicate that the pserver protocol is not
   supported. (Jelmer Vernooij)
 
+ * Git repositories with submodules can now be imported into 2a
+   branches; submodules are converted to nested trees.
+   (Jelmer Vernooij, #402814)
+
 Bug Fixes
 *********