Merge lp:brz/3.2 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.2.

[Jelmer Vernooij (jelmer)]

review: Approve

[lp:brz/3.2]

7573. By Jelmer Vernooij on 2022-01-08

Fix checking out git repositories with submodules with relative paths.

Merged from https://code.launchpad.net/~jelmer/brz/submodule-relative/+merge/413825

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2021-11-13 13:01:39 +0000
+++ breezy/git/dir.py	2022-01-08 02:04:36 +0000
@@ -208,14 +208,13 @@
                     subtrees = []
                 for path in subtrees:
                     target = urlutils.join(url, urlutils.escape(path))
-                    sublocation = wt.reference_parent(
-                        path, possible_transports=possible_transports)
+                    sublocation = wt.get_reference_info(path)
                     if sublocation is None:
-                        trace.warning(
-                            'Ignoring nested tree %s, parent location unknown.',
-                            path)
-                        continue
-                    sublocation.controldir.sprout(
+                        trace.warning("Unable to find submodule info for %s", path)
+                        return None
+                    remote_url = urlutils.join(self.user_url, sublocation)
+                    subbranch = _mod_branch.Branch.open(remote_url, possible_transports=possible_transports)
+                    subbranch.controldir.sprout(
                         target, basis.get_reference_revision(path),
                         force_new_repo=force_new_repo, recurse=recurse,
                         stacked=stacked)

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2021-04-03 12:58:34 +0000
+++ breezy/git/tests/test_remote.py	2022-01-08 02:04:36 +0000
@@ -34,6 +34,7 @@
     TestCaseWithTransport,
     )
 from ...tests.features import ExecutableFeature
+from ...urlutils import join as urljoin
 
 from ..mapping import default_mapping
 from ..remote import (
@@ -292,6 +293,41 @@
                 self.remote_real.head()),
             local.open_branch().last_revision())
 
+    def test_sprout_submodule_relative(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]>')
+
+        with open('remote/.gitmodules', 'w') as f:
+            f.write("""
+[submodule "lala"]
+\tpath = nested
+\turl = ../sub/.git
+""")
+        self.remote_real.stage('.gitmodules')
+        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.assertEqual(
+            default_mapping.revision_id_foreign_to_bzr(
+                self.sub_real.head()),
+            local.open_workingtree().get_nested_tree('nested').last_revision())
+
     def test_sprout_with_tags(self):
         c1 = self.remote_real.do_commit(
             message=b'message',

=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2021-08-21 13:02:55 +0000
+++ breezy/tests/test_source.py	2022-01-08 02:04:36 +0000
@@ -20,7 +20,7 @@
 """
 
 import os
-import parser
+import ast
 import re
 import symbol
 import sys
@@ -345,18 +345,6 @@
         """bzr shouldn't use the 'assert' statement."""
         # assert causes too much variation between -O and not, and tends to
         # give bad errors to the user
-        def search(x):
-            # scan down through x for assert statements, report any problems
-            # this is a bit cheesy; it may get some false positives?
-            if x[0] == symbol.assert_stmt:
-                return True
-            elif x[0] == token.NAME:
-                # can't search further down
-                return False
-            for sub in x[1:]:
-                if sub and search(sub):
-                    return True
-            return False
         badfiles = []
         assert_re = re.compile(r'\bassert\b')
         for fname, text in self.get_source_file_contents():
@@ -364,10 +352,11 @@
                 continue
             if not assert_re.search(text):
                 continue
-            st = parser.suite(text)
-            code = parser.st2tuple(st)
-            if search(code):
-                badfiles.append(fname)
+            tree = ast.parse(text)
+            for entry in ast.walk(tree):
+                if isinstance(entry, ast.Assert):
+                    badfiles.append(fname)
+                    break
         if badfiles:
             self.fail(
                 "these files contain an assert statement and should not:\n%s"

=== modified file 'doc/en/release-notes/brz-3.2.txt'
--- doc/en/release-notes/brz-3.2.txt	2021-08-18 23:37:47 +0000
+++ doc/en/release-notes/brz-3.2.txt	2022-01-08 02:04:36 +0000
@@ -17,6 +17,10 @@
  * Fix compatibility with newer versions of Dulwich.
    (Jelmer Vernooij)
 
+ * Avoid using the ``parser`` module, which
+   has been removed in Python 3.10.
+   (Jelmer Vernooij, #1956500)
+
 Testing
 *******
 

=== modified file 'setup.py'
--- setup.py	2021-12-27 15:10:53 +0000
+++ setup.py	2022-01-08 02:04:36 +0000
@@ -86,6 +86,7 @@
         'testtools',
         'testtools<=2.4.0;python_version<"3.0"',
         'python-subunit',
+        'dulwich>=0.20.29',
     ],
     'python_requires': '>=3.5',
 }