Merge lp:~jelmer/brz/3.0-fix-sphinx into lp:brz/3.0

[Jelmer Vernooij]

Cherry-pick fix for running with newer versions of sphinx, dulwich and flake8.

Cherry-pick fix for running with newer versions of sphinx, dulwich and flake8.

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

Voting criteria not met
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/30/

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-02-17 04:08:56 +0000
+++ breezy/git/tests/test_blackbox.py	2019-05-28 21:58:16 +0000
@@ -197,9 +197,9 @@
         output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
         self.assertEqual(error, '')
         self.assertEqual(output,
-                         'diff --git /dev/null b/a\n'
-                         'old mode 0\n'
-                         'new mode 100644\n'
+                         'diff --git a/a b/a\n'
+                         'old file mode 0\n'
+                         'new file mode 100644\n'
                          'index 0000000..c197bd8 100644\n'
                          '--- /dev/null\n'
                          '+++ b/a\n'

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2019-02-04 17:10:54 +0000
+++ breezy/git/tests/test_workingtree.py	2019-05-28 21:58:16 +0000
@@ -268,8 +268,9 @@
             ], [b'a'], want_unversioned=True)
 
     def test_submodule(self):
-        self.build_tree(['a/'])
+        self.subtree = self.make_branch_and_tree('a', format="git")
         a = Blob.from_string(b'irrelevant\n')
+        self.build_tree_contents([('a/.git/HEAD', a.id)])
         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)

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-12-18 20:55:37 +0000
+++ breezy/git/tree.py	2019-05-28 21:58:16 +0000
@@ -1455,7 +1455,9 @@
                 # Entry was removed; keep it listed, but mark it as gone.
                 blobs[path] = (ZERO_SHA, 0)
             elif e.errno == errno.EISDIR:
-                # TODO(jelmer): Only do this if 'path' appears in .gitmodules?
+                # Backwards compatibility with Dulwich < 0.19.12;
+                # newer versions of Dulwich return either an entry for the
+                # submodule or None for directories.
                 if S_ISGITLINK(index_entry.mode):
                     blobs[path] = (index_entry.sha, index_entry.mode)
                 else:
@@ -1465,7 +1467,12 @@
             else:
                 raise
         else:
-            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
+            if live_entry is None:
+                # Entry was turned into a directory
+                dirified.append((path, Tree().id, stat.S_IFDIR))
+                store.add_object(Tree())
+            else:
+                blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
     if want_unversioned:
         for e in target.extras():
             st = target._lstat(e)

=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2018-11-16 19:10:17 +0000
+++ breezy/tests/test_source.py	2019-05-28 21:58:16 +0000
@@ -332,10 +332,31 @@
         new_path.insert(
             0, os.path.join(os.path.dirname(__file__), '..', '..', 'tools'))
         self.overrideAttr(sys, 'path', new_path)
-        from flake8.api import legacy as flake8
-        style_guide = flake8.get_style_guide(config=u'setup.cfg', jobs="1")
-        report = style_guide.check_files(list(self.get_source_files()))
-        self.assertEqual([], report.get_statistics(''))
+        from flake8.main.application import Application
+        from flake8.formatting.base import BaseFormatter
+        app = Application()
+        app.config = u'setup.cfg'
+        app.jobs = 1
+
+        class Formatter(BaseFormatter):
+
+            def __init__(self):
+                self.errors = []
+
+            def start(self):
+                pass
+
+            def stop(self):
+                app.file_checker_manager.report()
+
+            def handle(self, error):
+                self.errors.append(error)
+
+        app.formatter = Formatter()
+        app.initialize([])
+        app.run_checks()
+        app.report()
+        self.assertEqual(app.formatter.errors, [])
 
     def test_no_asserts(self):
         """bzr shouldn't use the 'assert' statement."""

=== modified file 'byov.conf'
--- byov.conf	2019-03-04 10:18:17 +0000
+++ byov.conf	2019-05-28 21:58:16 +0000
@@ -34,7 +34,7 @@
 vm.release = xenial
 byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3})
 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-bionic]
 vm.release = bionic
 [brz-cosmic]
@@ -45,7 +45,7 @@
 vm.release = buster
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
 byoci.setup.command = ({subunit.clone})
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
 [brz-sid]
 vm.distribution = debian
 vm.release = sid