Merge lp:~jelmer/brz/merge-3.2 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.2.

Merge lp:brz/3.2.

[Jelmer Vernooij (jelmer)]

review: Approve

=== removed file 'breezy/_bencode_pyx.h'
=== removed file 'breezy/_bencode_pyx.pyx'
=== removed file 'breezy/bencode.py'
=== modified file 'breezy/bzr/bundle/serializer/v4.py'
--- breezy/bzr/bundle/serializer/v4.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/bundle/serializer/v4.py	2021-08-20 12:58:08 +0000
@@ -20,8 +20,9 @@
     )
 import re
 
+import fastbencode as bencode
+
 from .... import (
-    bencode,
     errors,
     iterablefile,
     lru_cache,

=== modified file 'breezy/bzr/chk_serializer.py'
--- breezy/bzr/chk_serializer.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/chk_serializer.py	2021-08-20 12:58:08 +0000
@@ -20,6 +20,8 @@
     BytesIO,
     )
 
+import fastbencode as bencode
+
 from .. import lazy_import
 lazy_import.lazy_import(globals(),
                         """
@@ -29,7 +31,6 @@
     )
 """)
 from .. import (
-    bencode,
     cache_utf8,
     errors,
     revision as _mod_revision,

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/remote.py	2021-08-20 12:58:08 +0000
@@ -20,8 +20,9 @@
 import sys
 import zlib
 
+import fastbencode as bencode
+
 from .. import (
-    bencode,
     branch,
     bzr as _mod_bzr,
     config as _mod_config,

=== modified file 'breezy/bzr/smart/branch.py'
--- breezy/bzr/smart/branch.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/branch.py	2021-08-20 12:58:08 +0000
@@ -16,8 +16,9 @@
 
 """Server-side branch related request implmentations."""
 
+import fastbencode as bencode
+
 from ... import (
-    bencode,
     errors,
     revision as _mod_revision,
     )

=== modified file 'breezy/bzr/smart/bzrdir.py'
--- breezy/bzr/smart/bzrdir.py	2020-05-06 02:13:25 +0000
+++ breezy/bzr/smart/bzrdir.py	2021-08-20 12:58:08 +0000
@@ -16,8 +16,9 @@
 
 """Server-side bzrdir related request implmentations."""
 
+import fastbencode as bencode
+
 from ... import (
-    bencode,
     branch,
     errors,
     repository,

=== modified file 'breezy/bzr/smart/protocol.py'
--- breezy/bzr/smart/protocol.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/protocol.py	2021-08-20 12:58:08 +0000
@@ -18,6 +18,7 @@
 client and server.
 """
 
+
 try:
     from collections.abc import deque
 except ImportError:  # python < 3.7
@@ -29,6 +30,8 @@
 import _thread
 import time
 
+from fastbencode import bdecode_as_tuple, bencode
+
 import breezy
 from ... import (
     debug,
@@ -37,7 +40,6 @@
     )
 from . import message, request
 from ...trace import log_exception_quietly, mutter
-from ...bencode import bdecode_as_tuple, bencode
 
 
 # Protocol version strings.  These are sent as prefixes of bzr requests and

=== modified file 'breezy/bzr/smart/repository.py'
--- breezy/bzr/smart/repository.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/repository.py	2021-08-20 12:58:08 +0000
@@ -25,8 +25,9 @@
 import threading
 import zlib
 
+import fastbencode as bencode
+
 from ... import (
-    bencode,
     errors,
     estimate_compressed_size,
     osutils,

=== modified file 'breezy/bzr/tag.py'
--- breezy/bzr/tag.py	2020-02-18 01:32:25 +0000
+++ breezy/bzr/tag.py	2021-08-20 12:58:08 +0000
@@ -17,10 +17,11 @@
 
 from __future__ import absolute_import
 
+import fastbencode as bencode
+
 from ..tag import Tags
 
 from .. import (
-    bencode,
     errors,
     trace,
     )

=== modified file 'breezy/bzr/tests/test_remote.py'
--- breezy/bzr/tests/test_remote.py	2020-06-10 23:47:24 +0000
+++ breezy/bzr/tests/test_remote.py	2021-08-20 12:58:08 +0000
@@ -29,8 +29,9 @@
 import tarfile
 import zlib
 
+import fastbencode as bencode
+
 from ... import (
-    bencode,
     branch,
     config,
     controldir,

=== modified file 'breezy/bzr/tests/test_smart.py'
--- breezy/bzr/tests/test_smart.py	2020-06-10 02:56:53 +0000
+++ breezy/bzr/tests/test_smart.py	2021-08-20 12:58:08 +0000
@@ -29,8 +29,9 @@
 import tarfile
 import zlib
 
+import fastbencode as bencode
+
 from breezy import (
-    bencode,
     branch as _mod_branch,
     controldir,
     errors,

=== modified file 'breezy/bzr/transform.py'
--- breezy/bzr/transform.py	2020-11-19 01:52:56 +0000
+++ breezy/bzr/transform.py	2021-08-20 12:58:08 +0000
@@ -872,7 +872,7 @@
 
         :param serializer: A Serialiser like pack.ContainerSerializer.
         """
-        from .. import bencode
+        import fastbencode as bencode
         new_name = {k.encode('utf-8'): v.encode('utf-8')
                     for k, v in self._new_name.items()}
         new_parent = {k.encode('utf-8'): v.encode('utf-8')
@@ -924,7 +924,7 @@
         :param records: An iterable of (names, content) tuples, as per
             pack.ContainerPushParser.
         """
-        from .. import bencode
+        import fastbencode as bencode
         names, content = next(records)
         attribs = bencode.bdecode(content)
         self._id_number = attribs[b'_id_number']

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/versionedfile.py	2021-08-20 12:58:08 +0000
@@ -23,11 +23,13 @@
 import struct
 from zlib import adler32
 
+
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
+import fastbencode as bencode
+
 from breezy import (
     annotate,
-    bencode,
     graph as _mod_graph,
     osutils,
     multiparent,
@@ -1984,7 +1986,7 @@
     if record.parents is None:
         parents = b'nil'
     else:
-        parents = record.parents
+        parents = tuple([tuple(p) for p in record.parents])
     record_meta = bencode.bencode((record.key, parents))
     record_content = record.get_bytes_as('fulltext')
     return b"fulltext\n%s%s%s" % (

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2021-05-24 01:44:16 +0000
+++ breezy/git/mapping.py	2021-08-20 12:58:08 +0000
@@ -21,8 +21,9 @@
 import base64
 import stat
 
+import fastbencode as bencode
+
 from .. import (
-    bencode,
     errors,
     foreign,
     trace,

=== modified file 'breezy/multiparent.py'
--- breezy/multiparent.py	2020-02-18 01:57:45 +0000
+++ breezy/multiparent.py	2021-08-20 12:58:08 +0000
@@ -28,7 +28,6 @@
 import patiencediff
 
 from breezy import (
-    bencode,
     ui,
     )
 """)
@@ -596,12 +595,16 @@
                 raise
 
     def save(self):
-        open(self._filename + '.mpidx', 'wb').write(bencode.bencode(
-            (self._parents, list(self._snapshots), self._diff_offset)))
+        import fastbencode as bencode
+        with open(self._filename + '.mpidx', 'wb') as f:
+            f.write(bencode.bencode(
+                (self._parents, list(self._snapshots), self._diff_offset)))
 
     def load(self):
-        self._parents, snapshots, self._diff_offset = bencode.bdecode(
-            open(self._filename + '.mpidx', 'rb').read())
+        import fastbencode as bencode
+        with open(self._filename + '.mpidx', 'rb') as f:
+            self._parents, snapshots, self._diff_offset = bencode.bdecode(
+                f.read())
         self._snapshots = set(snapshots)
 
 

=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py	2020-05-30 01:48:46 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py	2021-08-20 12:58:08 +0000
@@ -42,7 +42,8 @@
                                  '--noprofile'],
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
+                                stderr=subprocess.PIPE,
+                                env={'PYTHONPATH': ':'.join(sys.path)})
         if cword < 0:
             cword = len(words) + cword
         encoding = osutils.get_user_encoding()
@@ -164,7 +165,9 @@
 
     def get_script(self):
         s = super(TestBashCompletionInvoking, self).get_script()
-        return s.replace("$(brz ", "$('%s' " % self.get_brz_path())
+        s = s.replace("$(brz ", "$('%s' " % self.get_brz_path())
+        s = s.replace("2>/dev/null", "")
+        return s
 
     def test_revspec_tag_all(self):
         self.requireFeature(features.sed_feature)

=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2020-07-18 23:14:00 +0000
+++ breezy/shelf.py	2021-08-20 12:58:08 +0000
@@ -17,11 +17,12 @@
 import errno
 import re
 
+import fastbencode as bencode
+
 from . import errors
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy import (
-    bencode,
     merge,
     merge3,
     transform,

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2021-01-10 00:25:52 +0000
+++ breezy/tests/__init__.py	2021-08-20 12:58:08 +0000
@@ -3985,7 +3985,6 @@
         'breezy.tests.per_uifactory',
         'breezy.tests.per_workingtree',
         'breezy.tests.test__annotator',
-        'breezy.tests.test__bencode',
         'breezy.tests.test__known_graph',
         'breezy.tests.test__simple_set',
         'breezy.tests.test__static_tuple',

=== removed file 'breezy/tests/test__bencode.py'
=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2021-01-10 00:25:52 +0000
+++ breezy/tests/test_source.py	2021-08-20 12:58:08 +0000
@@ -40,13 +40,11 @@
 # Files which are listed here will be skipped when testing for Copyright (or
 # GPL) statements.
 COPYRIGHT_EXCEPTIONS = [
-    'breezy/_bencode_py.py',
     'breezy/doc_generate/conf.py',
     'breezy/lsprof.py',
     ]
 
 LICENSE_EXCEPTIONS = [
-    'breezy/_bencode_py.py',
     'breezy/doc_generate/conf.py',
     'breezy/lsprof.py',
     ]

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2020-11-18 02:15:43 +0000
+++ breezy/tests/test_transform.py	2021-08-20 12:58:08 +0000
@@ -21,8 +21,9 @@
 import sys
 import time
 
+import fastbencode as bencode
+
 from .. import (
-    bencode,
     errors,
     filters,
     osutils,

=== modified file 'breezy/tests/test_transport.py'
--- breezy/tests/test_transport.py	2021-01-10 00:25:52 +0000
+++ breezy/tests/test_transport.py	2021-08-20 12:58:08 +0000
@@ -1068,6 +1068,7 @@
         else:
             bzr_remote_path = self.get_brz_path()
         self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path)
+        self.overrideEnv('PYTHONPATH', ':'.join(sys.path))
 
         # Access the branch via a bzr+ssh URL.  The BZR_REMOTE_PATH environment
         # variable is used to tell bzr what command to run on the remote end.

=== removed file 'breezy/util/_bencode_py.py'
=== modified file 'byov.conf'
--- byov.conf	2021-02-19 03:14:41 +0000
+++ byov.conf	2021-08-20 12:58:08 +0000
@@ -22,7 +22,7 @@
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = bionic
-byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install3} && python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
+byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
 # 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:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-cosmic]

=== modified file 'doc/en/release-notes/brz-3.2.txt'
--- doc/en/release-notes/brz-3.2.txt	2021-08-14 15:50:14 +0000
+++ doc/en/release-notes/brz-3.2.txt	2021-08-20 12:58:08 +0000
@@ -23,6 +23,14 @@
  * Extend test certificate expiry to 1000 years.
    (Bernhard M. Wiedemann, #1926151)
 
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Breezy.
+
+ * Breezy now uses the fastbencode Python package for bencoding.
+   (Jelmer Vernooij)
+
 brz 3.2.0
 #########
 

=== modified file 'setup.py'
--- setup.py	2021-07-06 16:33:42 +0000
+++ setup.py	2021-08-20 12:58:08 +0000
@@ -59,6 +59,7 @@
         ],
     'install_requires': [
         'configobj',
+        'fastbencode',
         'patiencediff',
         # Technically, Breezy works without these two dependencies too. But there's
         # no way to enable them by default and let users opt out.
@@ -311,7 +312,6 @@
 ext_modules.append(Extension('breezy._static_tuple_c',
                              ['breezy/_static_tuple_c.c']))
 add_cython_extension('breezy._annotator_pyx')
-add_cython_extension('breezy._bencode_pyx')
 add_cython_extension('breezy._chunks_to_lines_pyx')
 add_cython_extension('breezy.bzr._groupcompress_pyx',
                      extra_source=['breezy/bzr/diff-delta.c'])