Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~jelmer/brz/merge-3.2 |
Merge into: | lp:brz |
Diff against target: |
426 lines (+57/-29) 23 files modified
breezy/bzr/bundle/serializer/v4.py (+2/-1) breezy/bzr/chk_serializer.py (+2/-1) breezy/bzr/remote.py (+2/-1) breezy/bzr/smart/branch.py (+2/-1) breezy/bzr/smart/bzrdir.py (+2/-1) breezy/bzr/smart/protocol.py (+3/-1) breezy/bzr/smart/repository.py (+2/-1) breezy/bzr/tag.py (+2/-1) breezy/bzr/tests/test_remote.py (+2/-1) breezy/bzr/tests/test_smart.py (+2/-1) breezy/bzr/transform.py (+2/-2) breezy/bzr/versionedfile.py (+4/-2) breezy/git/mapping.py (+2/-1) breezy/multiparent.py (+8/-5) breezy/plugins/bash_completion/tests/test_bashcomp.py (+5/-2) breezy/shelf.py (+2/-1) breezy/tests/__init__.py (+0/-1) breezy/tests/test_source.py (+0/-2) breezy/tests/test_transform.py (+2/-1) breezy/tests/test_transport.py (+1/-0) byov.conf (+1/-1) doc/en/release-notes/brz-3.2.txt (+8/-0) setup.py (+1/-1) |
To merge this branch: | bzr merge lp:~jelmer/brz/merge-3.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+407455@code.launchpad.net |
Commit message
Merge lp:brz/3.2.
Description of the change
Merge lp:brz/3.2.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'breezy/_bencode_pyx.h' | |||
2 | === removed file 'breezy/_bencode_pyx.pyx' | |||
3 | === removed file 'breezy/bencode.py' | |||
4 | === modified file 'breezy/bzr/bundle/serializer/v4.py' | |||
5 | --- breezy/bzr/bundle/serializer/v4.py 2020-07-18 23:14:00 +0000 | |||
6 | +++ breezy/bzr/bundle/serializer/v4.py 2021-08-20 12:58:08 +0000 | |||
7 | @@ -20,8 +20,9 @@ | |||
8 | 20 | ) | 20 | ) |
9 | 21 | import re | 21 | import re |
10 | 22 | 22 | ||
11 | 23 | import fastbencode as bencode | ||
12 | 24 | |||
13 | 23 | from .... import ( | 25 | from .... import ( |
14 | 24 | bencode, | ||
15 | 25 | errors, | 26 | errors, |
16 | 26 | iterablefile, | 27 | iterablefile, |
17 | 27 | lru_cache, | 28 | lru_cache, |
18 | 28 | 29 | ||
19 | === modified file 'breezy/bzr/chk_serializer.py' | |||
20 | --- breezy/bzr/chk_serializer.py 2020-07-18 23:14:00 +0000 | |||
21 | +++ breezy/bzr/chk_serializer.py 2021-08-20 12:58:08 +0000 | |||
22 | @@ -20,6 +20,8 @@ | |||
23 | 20 | BytesIO, | 20 | BytesIO, |
24 | 21 | ) | 21 | ) |
25 | 22 | 22 | ||
26 | 23 | import fastbencode as bencode | ||
27 | 24 | |||
28 | 23 | from .. import lazy_import | 25 | from .. import lazy_import |
29 | 24 | lazy_import.lazy_import(globals(), | 26 | lazy_import.lazy_import(globals(), |
30 | 25 | """ | 27 | """ |
31 | @@ -29,7 +31,6 @@ | |||
32 | 29 | ) | 31 | ) |
33 | 30 | """) | 32 | """) |
34 | 31 | from .. import ( | 33 | from .. import ( |
35 | 32 | bencode, | ||
36 | 33 | cache_utf8, | 34 | cache_utf8, |
37 | 34 | errors, | 35 | errors, |
38 | 35 | revision as _mod_revision, | 36 | revision as _mod_revision, |
39 | 36 | 37 | ||
40 | === modified file 'breezy/bzr/remote.py' | |||
41 | --- breezy/bzr/remote.py 2020-07-18 23:14:00 +0000 | |||
42 | +++ breezy/bzr/remote.py 2021-08-20 12:58:08 +0000 | |||
43 | @@ -20,8 +20,9 @@ | |||
44 | 20 | import sys | 20 | import sys |
45 | 21 | import zlib | 21 | import zlib |
46 | 22 | 22 | ||
47 | 23 | import fastbencode as bencode | ||
48 | 24 | |||
49 | 23 | from .. import ( | 25 | from .. import ( |
50 | 24 | bencode, | ||
51 | 25 | branch, | 26 | branch, |
52 | 26 | bzr as _mod_bzr, | 27 | bzr as _mod_bzr, |
53 | 27 | config as _mod_config, | 28 | config as _mod_config, |
54 | 28 | 29 | ||
55 | === modified file 'breezy/bzr/smart/branch.py' | |||
56 | --- breezy/bzr/smart/branch.py 2020-02-18 01:57:45 +0000 | |||
57 | +++ breezy/bzr/smart/branch.py 2021-08-20 12:58:08 +0000 | |||
58 | @@ -16,8 +16,9 @@ | |||
59 | 16 | 16 | ||
60 | 17 | """Server-side branch related request implmentations.""" | 17 | """Server-side branch related request implmentations.""" |
61 | 18 | 18 | ||
62 | 19 | import fastbencode as bencode | ||
63 | 20 | |||
64 | 19 | from ... import ( | 21 | from ... import ( |
65 | 20 | bencode, | ||
66 | 21 | errors, | 22 | errors, |
67 | 22 | revision as _mod_revision, | 23 | revision as _mod_revision, |
68 | 23 | ) | 24 | ) |
69 | 24 | 25 | ||
70 | === modified file 'breezy/bzr/smart/bzrdir.py' | |||
71 | --- breezy/bzr/smart/bzrdir.py 2020-05-06 02:13:25 +0000 | |||
72 | +++ breezy/bzr/smart/bzrdir.py 2021-08-20 12:58:08 +0000 | |||
73 | @@ -16,8 +16,9 @@ | |||
74 | 16 | 16 | ||
75 | 17 | """Server-side bzrdir related request implmentations.""" | 17 | """Server-side bzrdir related request implmentations.""" |
76 | 18 | 18 | ||
77 | 19 | import fastbencode as bencode | ||
78 | 20 | |||
79 | 19 | from ... import ( | 21 | from ... import ( |
80 | 20 | bencode, | ||
81 | 21 | branch, | 22 | branch, |
82 | 22 | errors, | 23 | errors, |
83 | 23 | repository, | 24 | repository, |
84 | 24 | 25 | ||
85 | === modified file 'breezy/bzr/smart/protocol.py' | |||
86 | --- breezy/bzr/smart/protocol.py 2020-02-18 01:57:45 +0000 | |||
87 | +++ breezy/bzr/smart/protocol.py 2021-08-20 12:58:08 +0000 | |||
88 | @@ -18,6 +18,7 @@ | |||
89 | 18 | client and server. | 18 | client and server. |
90 | 19 | """ | 19 | """ |
91 | 20 | 20 | ||
92 | 21 | |||
93 | 21 | try: | 22 | try: |
94 | 22 | from collections.abc import deque | 23 | from collections.abc import deque |
95 | 23 | except ImportError: # python < 3.7 | 24 | except ImportError: # python < 3.7 |
96 | @@ -29,6 +30,8 @@ | |||
97 | 29 | import _thread | 30 | import _thread |
98 | 30 | import time | 31 | import time |
99 | 31 | 32 | ||
100 | 33 | from fastbencode import bdecode_as_tuple, bencode | ||
101 | 34 | |||
102 | 32 | import breezy | 35 | import breezy |
103 | 33 | from ... import ( | 36 | from ... import ( |
104 | 34 | debug, | 37 | debug, |
105 | @@ -37,7 +40,6 @@ | |||
106 | 37 | ) | 40 | ) |
107 | 38 | from . import message, request | 41 | from . import message, request |
108 | 39 | from ...trace import log_exception_quietly, mutter | 42 | from ...trace import log_exception_quietly, mutter |
109 | 40 | from ...bencode import bdecode_as_tuple, bencode | ||
110 | 41 | 43 | ||
111 | 42 | 44 | ||
112 | 43 | # Protocol version strings. These are sent as prefixes of bzr requests and | 45 | # Protocol version strings. These are sent as prefixes of bzr requests and |
113 | 44 | 46 | ||
114 | === modified file 'breezy/bzr/smart/repository.py' | |||
115 | --- breezy/bzr/smart/repository.py 2020-02-18 01:57:45 +0000 | |||
116 | +++ breezy/bzr/smart/repository.py 2021-08-20 12:58:08 +0000 | |||
117 | @@ -25,8 +25,9 @@ | |||
118 | 25 | import threading | 25 | import threading |
119 | 26 | import zlib | 26 | import zlib |
120 | 27 | 27 | ||
121 | 28 | import fastbencode as bencode | ||
122 | 29 | |||
123 | 28 | from ... import ( | 30 | from ... import ( |
124 | 29 | bencode, | ||
125 | 30 | errors, | 31 | errors, |
126 | 31 | estimate_compressed_size, | 32 | estimate_compressed_size, |
127 | 32 | osutils, | 33 | osutils, |
128 | 33 | 34 | ||
129 | === modified file 'breezy/bzr/tag.py' | |||
130 | --- breezy/bzr/tag.py 2020-02-18 01:32:25 +0000 | |||
131 | +++ breezy/bzr/tag.py 2021-08-20 12:58:08 +0000 | |||
132 | @@ -17,10 +17,11 @@ | |||
133 | 17 | 17 | ||
134 | 18 | from __future__ import absolute_import | 18 | from __future__ import absolute_import |
135 | 19 | 19 | ||
136 | 20 | import fastbencode as bencode | ||
137 | 21 | |||
138 | 20 | from ..tag import Tags | 22 | from ..tag import Tags |
139 | 21 | 23 | ||
140 | 22 | from .. import ( | 24 | from .. import ( |
141 | 23 | bencode, | ||
142 | 24 | errors, | 25 | errors, |
143 | 25 | trace, | 26 | trace, |
144 | 26 | ) | 27 | ) |
145 | 27 | 28 | ||
146 | === modified file 'breezy/bzr/tests/test_remote.py' | |||
147 | --- breezy/bzr/tests/test_remote.py 2020-06-10 23:47:24 +0000 | |||
148 | +++ breezy/bzr/tests/test_remote.py 2021-08-20 12:58:08 +0000 | |||
149 | @@ -29,8 +29,9 @@ | |||
150 | 29 | import tarfile | 29 | import tarfile |
151 | 30 | import zlib | 30 | import zlib |
152 | 31 | 31 | ||
153 | 32 | import fastbencode as bencode | ||
154 | 33 | |||
155 | 32 | from ... import ( | 34 | from ... import ( |
156 | 33 | bencode, | ||
157 | 34 | branch, | 35 | branch, |
158 | 35 | config, | 36 | config, |
159 | 36 | controldir, | 37 | controldir, |
160 | 37 | 38 | ||
161 | === modified file 'breezy/bzr/tests/test_smart.py' | |||
162 | --- breezy/bzr/tests/test_smart.py 2020-06-10 02:56:53 +0000 | |||
163 | +++ breezy/bzr/tests/test_smart.py 2021-08-20 12:58:08 +0000 | |||
164 | @@ -29,8 +29,9 @@ | |||
165 | 29 | import tarfile | 29 | import tarfile |
166 | 30 | import zlib | 30 | import zlib |
167 | 31 | 31 | ||
168 | 32 | import fastbencode as bencode | ||
169 | 33 | |||
170 | 32 | from breezy import ( | 34 | from breezy import ( |
171 | 33 | bencode, | ||
172 | 34 | branch as _mod_branch, | 35 | branch as _mod_branch, |
173 | 35 | controldir, | 36 | controldir, |
174 | 36 | errors, | 37 | errors, |
175 | 37 | 38 | ||
176 | === modified file 'breezy/bzr/transform.py' | |||
177 | --- breezy/bzr/transform.py 2020-11-19 01:52:56 +0000 | |||
178 | +++ breezy/bzr/transform.py 2021-08-20 12:58:08 +0000 | |||
179 | @@ -872,7 +872,7 @@ | |||
180 | 872 | 872 | ||
181 | 873 | :param serializer: A Serialiser like pack.ContainerSerializer. | 873 | :param serializer: A Serialiser like pack.ContainerSerializer. |
182 | 874 | """ | 874 | """ |
184 | 875 | from .. import bencode | 875 | import fastbencode as bencode |
185 | 876 | new_name = {k.encode('utf-8'): v.encode('utf-8') | 876 | new_name = {k.encode('utf-8'): v.encode('utf-8') |
186 | 877 | for k, v in self._new_name.items()} | 877 | for k, v in self._new_name.items()} |
187 | 878 | new_parent = {k.encode('utf-8'): v.encode('utf-8') | 878 | new_parent = {k.encode('utf-8'): v.encode('utf-8') |
188 | @@ -924,7 +924,7 @@ | |||
189 | 924 | :param records: An iterable of (names, content) tuples, as per | 924 | :param records: An iterable of (names, content) tuples, as per |
190 | 925 | pack.ContainerPushParser. | 925 | pack.ContainerPushParser. |
191 | 926 | """ | 926 | """ |
193 | 927 | from .. import bencode | 927 | import fastbencode as bencode |
194 | 928 | names, content = next(records) | 928 | names, content = next(records) |
195 | 929 | attribs = bencode.bdecode(content) | 929 | attribs = bencode.bdecode(content) |
196 | 930 | self._id_number = attribs[b'_id_number'] | 930 | self._id_number = attribs[b'_id_number'] |
197 | 931 | 931 | ||
198 | === modified file 'breezy/bzr/versionedfile.py' | |||
199 | --- breezy/bzr/versionedfile.py 2020-07-18 23:14:00 +0000 | |||
200 | +++ breezy/bzr/versionedfile.py 2021-08-20 12:58:08 +0000 | |||
201 | @@ -23,11 +23,13 @@ | |||
202 | 23 | import struct | 23 | import struct |
203 | 24 | from zlib import adler32 | 24 | from zlib import adler32 |
204 | 25 | 25 | ||
205 | 26 | |||
206 | 26 | from ..lazy_import import lazy_import | 27 | from ..lazy_import import lazy_import |
207 | 27 | lazy_import(globals(), """ | 28 | lazy_import(globals(), """ |
208 | 29 | import fastbencode as bencode | ||
209 | 30 | |||
210 | 28 | from breezy import ( | 31 | from breezy import ( |
211 | 29 | annotate, | 32 | annotate, |
212 | 30 | bencode, | ||
213 | 31 | graph as _mod_graph, | 33 | graph as _mod_graph, |
214 | 32 | osutils, | 34 | osutils, |
215 | 33 | multiparent, | 35 | multiparent, |
216 | @@ -1984,7 +1986,7 @@ | |||
217 | 1984 | if record.parents is None: | 1986 | if record.parents is None: |
218 | 1985 | parents = b'nil' | 1987 | parents = b'nil' |
219 | 1986 | else: | 1988 | else: |
221 | 1987 | parents = record.parents | 1989 | parents = tuple([tuple(p) for p in record.parents]) |
222 | 1988 | record_meta = bencode.bencode((record.key, parents)) | 1990 | record_meta = bencode.bencode((record.key, parents)) |
223 | 1989 | record_content = record.get_bytes_as('fulltext') | 1991 | record_content = record.get_bytes_as('fulltext') |
224 | 1990 | return b"fulltext\n%s%s%s" % ( | 1992 | return b"fulltext\n%s%s%s" % ( |
225 | 1991 | 1993 | ||
226 | === modified file 'breezy/git/mapping.py' | |||
227 | --- breezy/git/mapping.py 2021-05-24 01:44:16 +0000 | |||
228 | +++ breezy/git/mapping.py 2021-08-20 12:58:08 +0000 | |||
229 | @@ -21,8 +21,9 @@ | |||
230 | 21 | import base64 | 21 | import base64 |
231 | 22 | import stat | 22 | import stat |
232 | 23 | 23 | ||
233 | 24 | import fastbencode as bencode | ||
234 | 25 | |||
235 | 24 | from .. import ( | 26 | from .. import ( |
236 | 25 | bencode, | ||
237 | 26 | errors, | 27 | errors, |
238 | 27 | foreign, | 28 | foreign, |
239 | 28 | trace, | 29 | trace, |
240 | 29 | 30 | ||
241 | === modified file 'breezy/multiparent.py' | |||
242 | --- breezy/multiparent.py 2020-02-18 01:57:45 +0000 | |||
243 | +++ breezy/multiparent.py 2021-08-20 12:58:08 +0000 | |||
244 | @@ -28,7 +28,6 @@ | |||
245 | 28 | import patiencediff | 28 | import patiencediff |
246 | 29 | 29 | ||
247 | 30 | from breezy import ( | 30 | from breezy import ( |
248 | 31 | bencode, | ||
249 | 32 | ui, | 31 | ui, |
250 | 33 | ) | 32 | ) |
251 | 34 | """) | 33 | """) |
252 | @@ -596,12 +595,16 @@ | |||
253 | 596 | raise | 595 | raise |
254 | 597 | 596 | ||
255 | 598 | def save(self): | 597 | def save(self): |
258 | 599 | open(self._filename + '.mpidx', 'wb').write(bencode.bencode( | 598 | import fastbencode as bencode |
259 | 600 | (self._parents, list(self._snapshots), self._diff_offset))) | 599 | with open(self._filename + '.mpidx', 'wb') as f: |
260 | 600 | f.write(bencode.bencode( | ||
261 | 601 | (self._parents, list(self._snapshots), self._diff_offset))) | ||
262 | 601 | 602 | ||
263 | 602 | def load(self): | 603 | def load(self): |
266 | 603 | self._parents, snapshots, self._diff_offset = bencode.bdecode( | 604 | import fastbencode as bencode |
267 | 604 | open(self._filename + '.mpidx', 'rb').read()) | 605 | with open(self._filename + '.mpidx', 'rb') as f: |
268 | 606 | self._parents, snapshots, self._diff_offset = bencode.bdecode( | ||
269 | 607 | f.read()) | ||
270 | 605 | self._snapshots = set(snapshots) | 608 | self._snapshots = set(snapshots) |
271 | 606 | 609 | ||
272 | 607 | 610 | ||
273 | 608 | 611 | ||
274 | === modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py' | |||
275 | --- breezy/plugins/bash_completion/tests/test_bashcomp.py 2020-05-30 01:48:46 +0000 | |||
276 | +++ breezy/plugins/bash_completion/tests/test_bashcomp.py 2021-08-20 12:58:08 +0000 | |||
277 | @@ -42,7 +42,8 @@ | |||
278 | 42 | '--noprofile'], | 42 | '--noprofile'], |
279 | 43 | stdin=subprocess.PIPE, | 43 | stdin=subprocess.PIPE, |
280 | 44 | stdout=subprocess.PIPE, | 44 | stdout=subprocess.PIPE, |
282 | 45 | stderr=subprocess.PIPE) | 45 | stderr=subprocess.PIPE, |
283 | 46 | env={'PYTHONPATH': ':'.join(sys.path)}) | ||
284 | 46 | if cword < 0: | 47 | if cword < 0: |
285 | 47 | cword = len(words) + cword | 48 | cword = len(words) + cword |
286 | 48 | encoding = osutils.get_user_encoding() | 49 | encoding = osutils.get_user_encoding() |
287 | @@ -164,7 +165,9 @@ | |||
288 | 164 | 165 | ||
289 | 165 | def get_script(self): | 166 | def get_script(self): |
290 | 166 | s = super(TestBashCompletionInvoking, self).get_script() | 167 | s = super(TestBashCompletionInvoking, self).get_script() |
292 | 167 | return s.replace("$(brz ", "$('%s' " % self.get_brz_path()) | 168 | s = s.replace("$(brz ", "$('%s' " % self.get_brz_path()) |
293 | 169 | s = s.replace("2>/dev/null", "") | ||
294 | 170 | return s | ||
295 | 168 | 171 | ||
296 | 169 | def test_revspec_tag_all(self): | 172 | def test_revspec_tag_all(self): |
297 | 170 | self.requireFeature(features.sed_feature) | 173 | self.requireFeature(features.sed_feature) |
298 | 171 | 174 | ||
299 | === modified file 'breezy/shelf.py' | |||
300 | --- breezy/shelf.py 2020-07-18 23:14:00 +0000 | |||
301 | +++ breezy/shelf.py 2021-08-20 12:58:08 +0000 | |||
302 | @@ -17,11 +17,12 @@ | |||
303 | 17 | import errno | 17 | import errno |
304 | 18 | import re | 18 | import re |
305 | 19 | 19 | ||
306 | 20 | import fastbencode as bencode | ||
307 | 21 | |||
308 | 20 | from . import errors | 22 | from . import errors |
309 | 21 | from .lazy_import import lazy_import | 23 | from .lazy_import import lazy_import |
310 | 22 | lazy_import(globals(), """ | 24 | lazy_import(globals(), """ |
311 | 23 | from breezy import ( | 25 | from breezy import ( |
312 | 24 | bencode, | ||
313 | 25 | merge, | 26 | merge, |
314 | 26 | merge3, | 27 | merge3, |
315 | 27 | transform, | 28 | transform, |
316 | 28 | 29 | ||
317 | === modified file 'breezy/tests/__init__.py' | |||
318 | --- breezy/tests/__init__.py 2021-01-10 00:25:52 +0000 | |||
319 | +++ breezy/tests/__init__.py 2021-08-20 12:58:08 +0000 | |||
320 | @@ -3985,7 +3985,6 @@ | |||
321 | 3985 | 'breezy.tests.per_uifactory', | 3985 | 'breezy.tests.per_uifactory', |
322 | 3986 | 'breezy.tests.per_workingtree', | 3986 | 'breezy.tests.per_workingtree', |
323 | 3987 | 'breezy.tests.test__annotator', | 3987 | 'breezy.tests.test__annotator', |
324 | 3988 | 'breezy.tests.test__bencode', | ||
325 | 3989 | 'breezy.tests.test__known_graph', | 3988 | 'breezy.tests.test__known_graph', |
326 | 3990 | 'breezy.tests.test__simple_set', | 3989 | 'breezy.tests.test__simple_set', |
327 | 3991 | 'breezy.tests.test__static_tuple', | 3990 | 'breezy.tests.test__static_tuple', |
328 | 3992 | 3991 | ||
329 | === removed file 'breezy/tests/test__bencode.py' | |||
330 | === modified file 'breezy/tests/test_source.py' | |||
331 | --- breezy/tests/test_source.py 2021-01-10 00:25:52 +0000 | |||
332 | +++ breezy/tests/test_source.py 2021-08-20 12:58:08 +0000 | |||
333 | @@ -40,13 +40,11 @@ | |||
334 | 40 | # Files which are listed here will be skipped when testing for Copyright (or | 40 | # Files which are listed here will be skipped when testing for Copyright (or |
335 | 41 | # GPL) statements. | 41 | # GPL) statements. |
336 | 42 | COPYRIGHT_EXCEPTIONS = [ | 42 | COPYRIGHT_EXCEPTIONS = [ |
337 | 43 | 'breezy/_bencode_py.py', | ||
338 | 44 | 'breezy/doc_generate/conf.py', | 43 | 'breezy/doc_generate/conf.py', |
339 | 45 | 'breezy/lsprof.py', | 44 | 'breezy/lsprof.py', |
340 | 46 | ] | 45 | ] |
341 | 47 | 46 | ||
342 | 48 | LICENSE_EXCEPTIONS = [ | 47 | LICENSE_EXCEPTIONS = [ |
343 | 49 | 'breezy/_bencode_py.py', | ||
344 | 50 | 'breezy/doc_generate/conf.py', | 48 | 'breezy/doc_generate/conf.py', |
345 | 51 | 'breezy/lsprof.py', | 49 | 'breezy/lsprof.py', |
346 | 52 | ] | 50 | ] |
347 | 53 | 51 | ||
348 | === modified file 'breezy/tests/test_transform.py' | |||
349 | --- breezy/tests/test_transform.py 2020-11-18 02:15:43 +0000 | |||
350 | +++ breezy/tests/test_transform.py 2021-08-20 12:58:08 +0000 | |||
351 | @@ -21,8 +21,9 @@ | |||
352 | 21 | import sys | 21 | import sys |
353 | 22 | import time | 22 | import time |
354 | 23 | 23 | ||
355 | 24 | import fastbencode as bencode | ||
356 | 25 | |||
357 | 24 | from .. import ( | 26 | from .. import ( |
358 | 25 | bencode, | ||
359 | 26 | errors, | 27 | errors, |
360 | 27 | filters, | 28 | filters, |
361 | 28 | osutils, | 29 | osutils, |
362 | 29 | 30 | ||
363 | === modified file 'breezy/tests/test_transport.py' | |||
364 | --- breezy/tests/test_transport.py 2021-01-10 00:25:52 +0000 | |||
365 | +++ breezy/tests/test_transport.py 2021-08-20 12:58:08 +0000 | |||
366 | @@ -1068,6 +1068,7 @@ | |||
367 | 1068 | else: | 1068 | else: |
368 | 1069 | bzr_remote_path = self.get_brz_path() | 1069 | bzr_remote_path = self.get_brz_path() |
369 | 1070 | self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path) | 1070 | self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path) |
370 | 1071 | self.overrideEnv('PYTHONPATH', ':'.join(sys.path)) | ||
371 | 1071 | 1072 | ||
372 | 1072 | # Access the branch via a bzr+ssh URL. The BZR_REMOTE_PATH environment | 1073 | # Access the branch via a bzr+ssh URL. The BZR_REMOTE_PATH environment |
373 | 1073 | # variable is used to tell bzr what command to run on the remote end. | 1074 | # variable is used to tell bzr what command to run on the remote end. |
374 | 1074 | 1075 | ||
375 | === removed file 'breezy/util/_bencode_py.py' | |||
376 | === modified file 'byov.conf' | |||
377 | --- byov.conf 2021-02-19 03:14:41 +0000 | |||
378 | +++ byov.conf 2021-08-20 12:58:08 +0000 | |||
379 | @@ -22,7 +22,7 @@ | |||
380 | 22 | vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml | 22 | vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml |
381 | 23 | [brz-xenial] | 23 | [brz-xenial] |
382 | 24 | vm.release = bionic | 24 | vm.release = bionic |
384 | 25 | 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}]') | 25 | 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}]') |
385 | 26 | # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 | 26 | # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 |
386 | 27 | 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" | 27 | 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" |
387 | 28 | [brz-cosmic] | 28 | [brz-cosmic] |
388 | 29 | 29 | ||
389 | === modified file 'doc/en/release-notes/brz-3.2.txt' | |||
390 | --- doc/en/release-notes/brz-3.2.txt 2021-08-14 15:50:14 +0000 | |||
391 | +++ doc/en/release-notes/brz-3.2.txt 2021-08-20 12:58:08 +0000 | |||
392 | @@ -23,6 +23,14 @@ | |||
393 | 23 | * Extend test certificate expiry to 1000 years. | 23 | * Extend test certificate expiry to 1000 years. |
394 | 24 | (Bernhard M. Wiedemann, #1926151) | 24 | (Bernhard M. Wiedemann, #1926151) |
395 | 25 | 25 | ||
396 | 26 | External Compatibility Breaks | ||
397 | 27 | ***************************** | ||
398 | 28 | |||
399 | 29 | .. These may require users to change the way they use Breezy. | ||
400 | 30 | |||
401 | 31 | * Breezy now uses the fastbencode Python package for bencoding. | ||
402 | 32 | (Jelmer Vernooij) | ||
403 | 33 | |||
404 | 26 | brz 3.2.0 | 34 | brz 3.2.0 |
405 | 27 | ######### | 35 | ######### |
406 | 28 | 36 | ||
407 | 29 | 37 | ||
408 | === modified file 'setup.py' | |||
409 | --- setup.py 2021-07-06 16:33:42 +0000 | |||
410 | +++ setup.py 2021-08-20 12:58:08 +0000 | |||
411 | @@ -59,6 +59,7 @@ | |||
412 | 59 | ], | 59 | ], |
413 | 60 | 'install_requires': [ | 60 | 'install_requires': [ |
414 | 61 | 'configobj', | 61 | 'configobj', |
415 | 62 | 'fastbencode', | ||
416 | 62 | 'patiencediff', | 63 | 'patiencediff', |
417 | 63 | # Technically, Breezy works without these two dependencies too. But there's | 64 | # Technically, Breezy works without these two dependencies too. But there's |
418 | 64 | # no way to enable them by default and let users opt out. | 65 | # no way to enable them by default and let users opt out. |
419 | @@ -311,7 +312,6 @@ | |||
420 | 311 | ext_modules.append(Extension('breezy._static_tuple_c', | 312 | ext_modules.append(Extension('breezy._static_tuple_c', |
421 | 312 | ['breezy/_static_tuple_c.c'])) | 313 | ['breezy/_static_tuple_c.c'])) |
422 | 313 | add_cython_extension('breezy._annotator_pyx') | 314 | add_cython_extension('breezy._annotator_pyx') |
423 | 314 | add_cython_extension('breezy._bencode_pyx') | ||
424 | 315 | add_cython_extension('breezy._chunks_to_lines_pyx') | 315 | add_cython_extension('breezy._chunks_to_lines_pyx') |
425 | 316 | add_cython_extension('breezy.bzr._groupcompress_pyx', | 316 | add_cython_extension('breezy.bzr._groupcompress_pyx', |
426 | 317 | extra_source=['breezy/bzr/diff-delta.c']) | 317 | extra_source=['breezy/bzr/diff-delta.c']) |