Merge lp:~bzr-core/ubuntu/oneiric/bzr/sru-2.4.2 into lp:ubuntu/oneiric/bzr

Proposed by Jelmer Vernooij on 2011-11-02
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp:~bzr-core/ubuntu/oneiric/bzr/sru-2.4.2
Merge into: lp:ubuntu/oneiric/bzr
Diff against target: 45810 lines (+8587/-8117)
64 files modified
.bzr-builddeb/default.conf (+1/-0)
Makefile (+2/-0)
bzr (+1/-1)
bzrlib/__init__.py (+1/-1)
bzrlib/_annotator_pyx.c (+140/-140)
bzrlib/_bencode_pyx.c (+231/-231)
bzrlib/_btree_serializer_pyx.c (+470/-470)
bzrlib/_chk_map_pyx.c (+260/-260)
bzrlib/_chunks_to_lines_pyx.c (+52/-52)
bzrlib/_dirstate_helpers_pyx.c (+5233/-5009)
bzrlib/_dirstate_helpers_pyx.pyx (+9/-6)
bzrlib/_groupcompress_pyx.c (+302/-302)
bzrlib/_knit_load_data_pyx.c (+115/-115)
bzrlib/_known_graph_pyx.c (+484/-484)
bzrlib/_readdir_pyx.c (+132/-132)
bzrlib/_rio_pyx.c (+119/-119)
bzrlib/_simple_set_pyx.c (+245/-245)
bzrlib/_simple_set_pyx.h (+1/-1)
bzrlib/branch.py (+2/-1)
bzrlib/builtins.py (+44/-7)
bzrlib/config.py (+44/-19)
bzrlib/diff-delta.c (+5/-0)
bzrlib/dirstate.py (+3/-2)
bzrlib/help_topics/__init__.py (+1/-2)
bzrlib/i18n.py (+5/-1)
bzrlib/osutils.py (+17/-2)
bzrlib/plugins/launchpad/__init__.py (+1/-1)
bzrlib/remote.py (+2/-1)
bzrlib/repository.py (+4/-0)
bzrlib/smart/repository.py (+1/-1)
bzrlib/tests/__init__.py (+10/-1)
bzrlib/tests/blackbox/test_branch.py (+14/-4)
bzrlib/tests/per_repository_reference/__init__.py (+28/-9)
bzrlib/tests/stub_sftp.py (+2/-2)
bzrlib/tests/test__dirstate_helpers.py (+53/-0)
bzrlib/tests/test_config.py (+73/-8)
bzrlib/tests/test_i18n.py (+15/-2)
bzrlib/tests/test_osutils.py (+10/-0)
bzrlib/tests/test_repository.py (+8/-0)
bzrlib/tests/test_selftest.py (+16/-9)
bzrlib/tests/test_server.py (+3/-2)
bzrlib/tests/test_test_server.py (+55/-19)
bzrlib/transport/__init__.py (+1/-1)
bzrlib/transport/http/_pycurl.py (+7/-5)
bzrlib/transport/local.py (+1/-1)
bzrlib/urlutils.py (+2/-3)
bzrlib/version.py (+1/-1)
bzrlib/vf_repository.py (+3/-1)
debian/changelog (+24/-0)
debian/patches/01_selftest_package (+5/-5)
debian/patches/04_fix_i18n (+0/-61)
debian/patches/10_testtools_compatibility (+0/-319)
debian/patches/11_localhost_locks (+22/-0)
debian/patches/series (+1/-2)
doc/en/admin-guide/simple-setups.txt (+4/-4)
doc/en/mini-tutorial/index.txt (+61/-38)
doc/en/release-notes/bzr-2.0.txt (+3/-0)
doc/en/release-notes/bzr-2.1.txt (+24/-0)
doc/en/release-notes/bzr-2.2.txt (+40/-14)
doc/en/release-notes/bzr-2.3.txt (+5/-0)
doc/en/release-notes/bzr-2.4.txt (+156/-0)
doc/en/whats-new/whats-new-in-2.2.txt (+3/-0)
doc/en/whats-new/whats-new-in-2.4.txt (+9/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~bzr-core/ubuntu/oneiric/bzr/sru-2.4.2
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2012-01-23 Pending
Ubuntu Stable Release Updates Team 2011-11-02 Pending
Review via email: mp+81039@code.launchpad.net

Description of the change

SRU bzr 2.4.2, which fixes about a dozen bugs.

Bazaar is in the SRU MicroReleaseExceptions group (https://lists.ubuntu.com/archives/technical-board/2010-September/000513.html)

To post a comment you must log in.
Martin Pool (mbp) wrote :

Actually merging it is blocked because https://bugs.launchpad.net/udd/+bug/848064 affects the target branch.

3951. By Jelmer Vernooij on 2011-11-03

releasing version 2.4.2-0ubuntu1

Colin Watson (cjwatson) wrote :

In practice this has been uploaded:

  https://launchpad.net/ubuntu/+source/bzr/2.4.2-0ubuntu1

... so I'm artificially marking it as merged to get it off the sponsorship queue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzr-builddeb/default.conf'
2--- .bzr-builddeb/default.conf 2011-08-31 16:04:52 +0000
3+++ .bzr-builddeb/default.conf 2011-11-03 14:37:19 +0000
4@@ -1,3 +1,4 @@
5 [BUILDDEB]
6 upstream-branch = lp:bzr/2.4
7+export-upstream-revision = tag:bzr-$UPSTREAM_VERSION
8 #upstream-branch = lp:bzr
9
10=== modified file 'Makefile'
11--- Makefile 2011-05-21 17:34:06 +0000
12+++ Makefile 2011-11-03 14:37:19 +0000
13@@ -42,7 +42,9 @@
14 set -e
15 # Generate a stream for PQM to watch.
16 -$(RM) -f selftest.log
17+ echo `date` ": selftest starts" 1>&2
18 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
19+ echo `date` ": selftest ends" 1>&2
20 # An empty log file should catch errors in the $(PYTHON)
21 # command above (the '|' swallow any errors since 'make'
22 # sees the 'tee' exit code for the whole line
23
24=== modified file 'bzr'
25--- bzr 2011-08-31 16:04:52 +0000
26+++ bzr 2011-11-03 14:37:19 +0000
27@@ -23,7 +23,7 @@
28 import warnings
29
30 # update this on each release
31-_script_version = (2, 4, 0)
32+_script_version = (2, 4, 2)
33
34 try:
35 version_info = sys.version_info
36
37=== modified file 'bzrlib/__init__.py'
38--- bzrlib/__init__.py 2011-08-31 16:04:52 +0000
39+++ bzrlib/__init__.py 2011-11-03 14:37:19 +0000
40@@ -52,7 +52,7 @@
41 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
42 # releaselevel of 'dev' for unreleased under-development code.
43
44-version_info = (2, 4, 0, 'final', 0)
45+version_info = (2, 4, 2, 'final', 0)
46
47 # API compatibility version
48 api_minimum_version = (2, 4, 0)
49
50=== modified file 'bzrlib/_annotator_pyx.c'
51--- bzrlib/_annotator_pyx.c 2011-08-31 15:04:43 +0000
52+++ bzrlib/_annotator_pyx.c 2011-11-03 14:37:19 +0000
53@@ -1,4 +1,4 @@
54-/* Generated by Cython 0.13 on Thu Aug 11 09:45:13 2011 */
55+/* Generated by Cython 0.13 on Mon Sep 19 20:18:37 2011 */
56
57 #define PY_SSIZE_T_CLEAN
58 #include "Python.h"
59@@ -538,7 +538,7 @@
60 static PyObject *__pyx_n_s__self;
61 static PyObject *__pyx_n_s__this_annotation;
62
63-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":61
64+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":61
65 *
66 *
67 * cdef int _check_annotations_are_lists(annotations, # <<<<<<<<<<<<<<
68@@ -553,7 +553,7 @@
69 PyObject *__pyx_t_3 = NULL;
70 __Pyx_RefNannySetupContext("_check_annotations_are_lists");
71
72- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":63
73+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":63
74 * cdef int _check_annotations_are_lists(annotations,
75 * parent_annotations) except -1:
76 * if not PyList_CheckExact(annotations): # <<<<<<<<<<<<<<
77@@ -563,7 +563,7 @@
78 __pyx_t_1 = (!PyList_CheckExact(__pyx_v_annotations));
79 if (__pyx_t_1) {
80
81- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":64
82+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":64
83 * parent_annotations) except -1:
84 * if not PyList_CheckExact(annotations):
85 * raise TypeError('annotations must be a list') # <<<<<<<<<<<<<<
86@@ -585,7 +585,7 @@
87 }
88 __pyx_L3:;
89
90- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":65
91+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":65
92 * if not PyList_CheckExact(annotations):
93 * raise TypeError('annotations must be a list')
94 * if not PyList_CheckExact(parent_annotations): # <<<<<<<<<<<<<<
95@@ -595,7 +595,7 @@
96 __pyx_t_1 = (!PyList_CheckExact(__pyx_v_parent_annotations));
97 if (__pyx_t_1) {
98
99- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":66
100+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":66
101 * raise TypeError('annotations must be a list')
102 * if not PyList_CheckExact(parent_annotations):
103 * raise TypeError('parent_annotations must be a list') # <<<<<<<<<<<<<<
104@@ -617,7 +617,7 @@
105 }
106 __pyx_L4:;
107
108- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":67
109+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":67
110 * if not PyList_CheckExact(parent_annotations):
111 * raise TypeError('parent_annotations must be a list')
112 * return 0 # <<<<<<<<<<<<<<
113@@ -639,7 +639,7 @@
114 return __pyx_r;
115 }
116
117-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":70
118+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":70
119 *
120 *
121 * cdef int _check_match_ranges(parent_annotations, annotations, # <<<<<<<<<<<<<<
122@@ -655,7 +655,7 @@
123 PyObject *__pyx_t_4 = NULL;
124 __Pyx_RefNannySetupContext("_check_match_ranges");
125
126- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":73
127+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":73
128 * Py_ssize_t parent_idx, Py_ssize_t lines_idx,
129 * Py_ssize_t match_len) except -1:
130 * if parent_idx + match_len > PyList_GET_SIZE(parent_annotations): # <<<<<<<<<<<<<<
131@@ -665,7 +665,7 @@
132 __pyx_t_1 = ((__pyx_v_parent_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_parent_annotations));
133 if (__pyx_t_1) {
134
135- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":76
136+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":76
137 * raise ValueError('Match length exceeds len of'
138 * ' parent_annotations %s > %s'
139 * % (parent_idx + match_len, # <<<<<<<<<<<<<<
140@@ -675,7 +675,7 @@
141 __pyx_t_2 = PyInt_FromSsize_t((__pyx_v_parent_idx + __pyx_v_match_len)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
142 __Pyx_GOTREF(__pyx_t_2);
143
144- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":77
145+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":77
146 * ' parent_annotations %s > %s'
147 * % (parent_idx + match_len,
148 * PyList_GET_SIZE(parent_annotations))) # <<<<<<<<<<<<<<
149@@ -710,7 +710,7 @@
150 }
151 __pyx_L3:;
152
153- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":78
154+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":78
155 * % (parent_idx + match_len,
156 * PyList_GET_SIZE(parent_annotations)))
157 * if lines_idx + match_len > PyList_GET_SIZE(annotations): # <<<<<<<<<<<<<<
158@@ -720,7 +720,7 @@
159 __pyx_t_1 = ((__pyx_v_lines_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_annotations));
160 if (__pyx_t_1) {
161
162- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":81
163+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":81
164 * raise ValueError('Match length exceeds len of'
165 * ' annotations %s > %s'
166 * % (lines_idx + match_len, # <<<<<<<<<<<<<<
167@@ -730,7 +730,7 @@
168 __pyx_t_3 = PyInt_FromSsize_t((__pyx_v_lines_idx + __pyx_v_match_len)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
169 __Pyx_GOTREF(__pyx_t_3);
170
171- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":82
172+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":82
173 * ' annotations %s > %s'
174 * % (lines_idx + match_len,
175 * PyList_GET_SIZE(annotations))) # <<<<<<<<<<<<<<
176@@ -765,7 +765,7 @@
177 }
178 __pyx_L4:;
179
180- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":83
181+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":83
182 * % (lines_idx + match_len,
183 * PyList_GET_SIZE(annotations)))
184 * return 0 # <<<<<<<<<<<<<<
185@@ -788,7 +788,7 @@
186 return __pyx_r;
187 }
188
189-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":86
190+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":86
191 *
192 *
193 * cdef PyObject *_next_tuple_entry(object tpl, Py_ssize_t *pos): # cannot_raise # <<<<<<<<<<<<<<
194@@ -801,7 +801,7 @@
195 int __pyx_t_1;
196 __Pyx_RefNannySetupContext("_next_tuple_entry");
197
198- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":94
199+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":94
200 * This cannot raise an exception, as it does no error checking.
201 * """
202 * pos[0] = pos[0] + 1 # <<<<<<<<<<<<<<
203@@ -810,7 +810,7 @@
204 */
205 (__pyx_v_pos[0]) = ((__pyx_v_pos[0]) + 1);
206
207- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":95
208+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":95
209 * """
210 * pos[0] = pos[0] + 1
211 * if pos[0] >= PyTuple_GET_SIZE(tpl): # <<<<<<<<<<<<<<
212@@ -820,7 +820,7 @@
213 __pyx_t_1 = ((__pyx_v_pos[0]) >= PyTuple_GET_SIZE(__pyx_v_tpl));
214 if (__pyx_t_1) {
215
216- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":96
217+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":96
218 * pos[0] = pos[0] + 1
219 * if pos[0] >= PyTuple_GET_SIZE(tpl):
220 * return NULL # <<<<<<<<<<<<<<
221@@ -833,7 +833,7 @@
222 }
223 __pyx_L3:;
224
225- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":97
226+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":97
227 * if pos[0] >= PyTuple_GET_SIZE(tpl):
228 * return NULL
229 * return PyTuple_GET_ITEM(tpl, pos[0]) # <<<<<<<<<<<<<<
230@@ -849,7 +849,7 @@
231 return __pyx_r;
232 }
233
234-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":100
235+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":100
236 *
237 *
238 * cdef object _combine_annotations(ann_one, ann_two, cache): # <<<<<<<<<<<<<<
239@@ -877,7 +877,7 @@
240 __pyx_v_cache_key = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
241 __pyx_v_new_ann = Py_None; __Pyx_INCREF(Py_None);
242
243- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":106
244+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":106
245 * cdef PyObject *temp, *left, *right
246 *
247 * if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)): # <<<<<<<<<<<<<<
248@@ -887,7 +887,7 @@
249 __pyx_t_1 = PyObject_RichCompareBool(__pyx_v_ann_one, __pyx_v_ann_two, Py_LT); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
250 if (__pyx_t_1) {
251
252- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":107
253+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":107
254 *
255 * if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)):
256 * cache_key = (ann_one, ann_two) # <<<<<<<<<<<<<<
257@@ -910,7 +910,7 @@
258 }
259 /*else*/ {
260
261- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":109
262+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":109
263 * cache_key = (ann_one, ann_two)
264 * else:
265 * cache_key = (ann_two, ann_one) # <<<<<<<<<<<<<<
266@@ -932,7 +932,7 @@
267 }
268 __pyx_L3:;
269
270- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":110
271+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":110
272 * else:
273 * cache_key = (ann_two, ann_one)
274 * temp = PyDict_GetItem(cache, cache_key) # <<<<<<<<<<<<<<
275@@ -941,7 +941,7 @@
276 */
277 __pyx_v_temp = PyDict_GetItem(__pyx_v_cache, ((PyObject *)__pyx_v_cache_key));
278
279- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":111
280+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":111
281 * cache_key = (ann_two, ann_one)
282 * temp = PyDict_GetItem(cache, cache_key)
283 * if temp != NULL: # <<<<<<<<<<<<<<
284@@ -951,7 +951,7 @@
285 __pyx_t_3 = (__pyx_v_temp != NULL);
286 if (__pyx_t_3) {
287
288- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":112
289+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":112
290 * temp = PyDict_GetItem(cache, cache_key)
291 * if temp != NULL:
292 * return <object>temp # <<<<<<<<<<<<<<
293@@ -966,7 +966,7 @@
294 }
295 __pyx_L4:;
296
297- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":114
298+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":114
299 * return <object>temp
300 *
301 * if not PyTuple_CheckExact(ann_one) or not PyTuple_CheckExact(ann_two): # <<<<<<<<<<<<<<
302@@ -982,7 +982,7 @@
303 }
304 if (__pyx_t_5) {
305
306- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":115
307+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":115
308 *
309 * if not PyTuple_CheckExact(ann_one) or not PyTuple_CheckExact(ann_two):
310 * raise TypeError('annotations must be tuples') # <<<<<<<<<<<<<<
311@@ -1004,7 +1004,7 @@
312 }
313 __pyx_L5:;
314
315- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":118
316+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":118
317 * # We know that annotations are tuples, and that both sides are already
318 * # sorted, so we can just walk and update a new list.
319 * pos_one = -1 # <<<<<<<<<<<<<<
320@@ -1013,7 +1013,7 @@
321 */
322 __pyx_v_pos_one = -1;
323
324- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":119
325+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":119
326 * # sorted, so we can just walk and update a new list.
327 * pos_one = -1
328 * pos_two = -1 # <<<<<<<<<<<<<<
329@@ -1022,7 +1022,7 @@
330 */
331 __pyx_v_pos_two = -1;
332
333- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":120
334+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":120
335 * pos_one = -1
336 * pos_two = -1
337 * out_pos = 0 # <<<<<<<<<<<<<<
338@@ -1031,7 +1031,7 @@
339 */
340 __pyx_v_out_pos = 0;
341
342- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":121
343+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":121
344 * pos_two = -1
345 * out_pos = 0
346 * left = _next_tuple_entry(ann_one, &pos_one) # <<<<<<<<<<<<<<
347@@ -1040,7 +1040,7 @@
348 */
349 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
350
351- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":122
352+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":122
353 * out_pos = 0
354 * left = _next_tuple_entry(ann_one, &pos_one)
355 * right = _next_tuple_entry(ann_two, &pos_two) # <<<<<<<<<<<<<<
356@@ -1049,7 +1049,7 @@
357 */
358 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
359
360- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":124
361+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":124
362 * right = _next_tuple_entry(ann_two, &pos_two)
363 * new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
364 * + PyTuple_GET_SIZE(ann_two)) # <<<<<<<<<<<<<<
365@@ -1062,7 +1062,7 @@
366 __pyx_v_new_ann = __pyx_t_6;
367 __pyx_t_6 = 0;
368
369- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":125
370+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":125
371 * new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
372 * + PyTuple_GET_SIZE(ann_two))
373 * while left != NULL and right != NULL: # <<<<<<<<<<<<<<
374@@ -1079,7 +1079,7 @@
375 }
376 if (!__pyx_t_4) break;
377
378- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":130
379+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":130
380 * # annotate NEWS' from 7.25s to 7.16s, so it *is* a visible impact.
381 * if (left == right
382 * or PyObject_RichCompareBool_ptr(left, right, Py_EQ)): # <<<<<<<<<<<<<<
383@@ -1094,7 +1094,7 @@
384 }
385 if (__pyx_t_5) {
386
387- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":132
388+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":132
389 * or PyObject_RichCompareBool_ptr(left, right, Py_EQ)):
390 * # Identical values, step both
391 * Py_INCREF_ptr(left) # <<<<<<<<<<<<<<
392@@ -1103,7 +1103,7 @@
393 */
394 Py_INCREF(__pyx_v_left);
395
396- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":133
397+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":133
398 * # Identical values, step both
399 * Py_INCREF_ptr(left)
400 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left) # <<<<<<<<<<<<<<
401@@ -1112,7 +1112,7 @@
402 */
403 PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
404
405- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":134
406+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":134
407 * Py_INCREF_ptr(left)
408 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
409 * left = _next_tuple_entry(ann_one, &pos_one) # <<<<<<<<<<<<<<
410@@ -1121,7 +1121,7 @@
411 */
412 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
413
414- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":135
415+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":135
416 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
417 * left = _next_tuple_entry(ann_one, &pos_one)
418 * right = _next_tuple_entry(ann_two, &pos_two) # <<<<<<<<<<<<<<
419@@ -1132,7 +1132,7 @@
420 goto __pyx_L8;
421 }
422
423- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":136
424+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":136
425 * left = _next_tuple_entry(ann_one, &pos_one)
426 * right = _next_tuple_entry(ann_two, &pos_two)
427 * elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)): # <<<<<<<<<<<<<<
428@@ -1142,7 +1142,7 @@
429 __pyx_t_1 = PyObject_RichCompareBool(__pyx_v_left, __pyx_v_right, Py_LT);
430 if (__pyx_t_1) {
431
432- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":138
433+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":138
434 * elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)):
435 * # left < right or right == NULL
436 * Py_INCREF_ptr(left) # <<<<<<<<<<<<<<
437@@ -1151,7 +1151,7 @@
438 */
439 Py_INCREF(__pyx_v_left);
440
441- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":139
442+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":139
443 * # left < right or right == NULL
444 * Py_INCREF_ptr(left)
445 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left) # <<<<<<<<<<<<<<
446@@ -1160,7 +1160,7 @@
447 */
448 PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
449
450- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":140
451+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":140
452 * Py_INCREF_ptr(left)
453 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
454 * left = _next_tuple_entry(ann_one, &pos_one) # <<<<<<<<<<<<<<
455@@ -1172,7 +1172,7 @@
456 }
457 /*else*/ {
458
459- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":142
460+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":142
461 * left = _next_tuple_entry(ann_one, &pos_one)
462 * else: # right < left or left == NULL
463 * Py_INCREF_ptr(right) # <<<<<<<<<<<<<<
464@@ -1181,7 +1181,7 @@
465 */
466 Py_INCREF(__pyx_v_right);
467
468- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":143
469+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":143
470 * else: # right < left or left == NULL
471 * Py_INCREF_ptr(right)
472 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right) # <<<<<<<<<<<<<<
473@@ -1190,7 +1190,7 @@
474 */
475 PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);
476
477- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":144
478+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":144
479 * Py_INCREF_ptr(right)
480 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
481 * right = _next_tuple_entry(ann_two, &pos_two) # <<<<<<<<<<<<<<
482@@ -1201,7 +1201,7 @@
483 }
484 __pyx_L8:;
485
486- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":145
487+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":145
488 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
489 * right = _next_tuple_entry(ann_two, &pos_two)
490 * out_pos = out_pos + 1 # <<<<<<<<<<<<<<
491@@ -1211,7 +1211,7 @@
492 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
493 }
494
495- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":146
496+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":146
497 * right = _next_tuple_entry(ann_two, &pos_two)
498 * out_pos = out_pos + 1
499 * while left != NULL: # <<<<<<<<<<<<<<
500@@ -1222,7 +1222,7 @@
501 __pyx_t_5 = (__pyx_v_left != NULL);
502 if (!__pyx_t_5) break;
503
504- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":147
505+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":147
506 * out_pos = out_pos + 1
507 * while left != NULL:
508 * Py_INCREF_ptr(left) # <<<<<<<<<<<<<<
509@@ -1231,7 +1231,7 @@
510 */
511 Py_INCREF(__pyx_v_left);
512
513- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":148
514+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":148
515 * while left != NULL:
516 * Py_INCREF_ptr(left)
517 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left) # <<<<<<<<<<<<<<
518@@ -1240,7 +1240,7 @@
519 */
520 PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
521
522- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":149
523+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":149
524 * Py_INCREF_ptr(left)
525 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
526 * left = _next_tuple_entry(ann_one, &pos_one) # <<<<<<<<<<<<<<
527@@ -1249,7 +1249,7 @@
528 */
529 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
530
531- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":150
532+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":150
533 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
534 * left = _next_tuple_entry(ann_one, &pos_one)
535 * out_pos = out_pos + 1 # <<<<<<<<<<<<<<
536@@ -1259,7 +1259,7 @@
537 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
538 }
539
540- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":151
541+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":151
542 * left = _next_tuple_entry(ann_one, &pos_one)
543 * out_pos = out_pos + 1
544 * while right != NULL: # <<<<<<<<<<<<<<
545@@ -1270,7 +1270,7 @@
546 __pyx_t_5 = (__pyx_v_right != NULL);
547 if (!__pyx_t_5) break;
548
549- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":152
550+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":152
551 * out_pos = out_pos + 1
552 * while right != NULL:
553 * Py_INCREF_ptr(right) # <<<<<<<<<<<<<<
554@@ -1279,7 +1279,7 @@
555 */
556 Py_INCREF(__pyx_v_right);
557
558- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":153
559+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":153
560 * while right != NULL:
561 * Py_INCREF_ptr(right)
562 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right) # <<<<<<<<<<<<<<
563@@ -1288,7 +1288,7 @@
564 */
565 PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);
566
567- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":154
568+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":154
569 * Py_INCREF_ptr(right)
570 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
571 * right = _next_tuple_entry(ann_two, &pos_two) # <<<<<<<<<<<<<<
572@@ -1297,7 +1297,7 @@
573 */
574 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
575
576- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":155
577+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":155
578 * PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
579 * right = _next_tuple_entry(ann_two, &pos_two)
580 * out_pos = out_pos + 1 # <<<<<<<<<<<<<<
581@@ -1307,7 +1307,7 @@
582 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
583 }
584
585- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":156
586+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":156
587 * right = _next_tuple_entry(ann_two, &pos_two)
588 * out_pos = out_pos + 1
589 * if out_pos != PyTuple_GET_SIZE(new_ann): # <<<<<<<<<<<<<<
590@@ -1317,7 +1317,7 @@
591 __pyx_t_5 = (__pyx_v_out_pos != PyTuple_GET_SIZE(__pyx_v_new_ann));
592 if (__pyx_t_5) {
593
594- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":159
595+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":159
596 * # Timing _PyTuple_Resize was not significantly faster that slicing
597 * # PyTuple_Resize((<PyObject **>new_ann), out_pos)
598 * new_ann = new_ann[0:out_pos] # <<<<<<<<<<<<<<
599@@ -1333,7 +1333,7 @@
600 }
601 __pyx_L13:;
602
603- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":160
604+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":160
605 * # PyTuple_Resize((<PyObject **>new_ann), out_pos)
606 * new_ann = new_ann[0:out_pos]
607 * PyDict_SetItem(cache, cache_key, new_ann) # <<<<<<<<<<<<<<
608@@ -1342,7 +1342,7 @@
609 */
610 __pyx_t_1 = PyDict_SetItem(__pyx_v_cache, ((PyObject *)__pyx_v_cache_key), __pyx_v_new_ann); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
611
612- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":161
613+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":161
614 * new_ann = new_ann[0:out_pos]
615 * PyDict_SetItem(cache, cache_key, new_ann)
616 * return new_ann # <<<<<<<<<<<<<<
617@@ -1369,7 +1369,7 @@
618 return __pyx_r;
619 }
620
621-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":164
622+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":164
623 *
624 *
625 * cdef int _apply_parent_annotations(annotations, parent_annotations, # <<<<<<<<<<<<<<
626@@ -1400,7 +1400,7 @@
627 PyObject *__pyx_t_11 = NULL;
628 __Pyx_RefNannySetupContext("_apply_parent_annotations");
629
630- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":174
631+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":174
632 * cdef PyObject **par_temp, **ann_temp
633 *
634 * _check_annotations_are_lists(annotations, parent_annotations) # <<<<<<<<<<<<<<
635@@ -1409,7 +1409,7 @@
636 */
637 __pyx_t_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(__pyx_v_annotations, __pyx_v_parent_annotations); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
638
639- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":175
640+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":175
641 *
642 * _check_annotations_are_lists(annotations, parent_annotations)
643 * par_list = <PyListObject *>parent_annotations # <<<<<<<<<<<<<<
644@@ -1418,7 +1418,7 @@
645 */
646 __pyx_v_par_list = ((PyListObject *)__pyx_v_parent_annotations);
647
648- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":176
649+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":176
650 * _check_annotations_are_lists(annotations, parent_annotations)
651 * par_list = <PyListObject *>parent_annotations
652 * ann_list = <PyListObject *>annotations # <<<<<<<<<<<<<<
653@@ -1427,7 +1427,7 @@
654 */
655 __pyx_v_ann_list = ((PyListObject *)__pyx_v_annotations);
656
657- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":181
658+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":181
659 * # that. Would be interesting if we could use memcpy() but we have to incref
660 * # and decref
661 * for parent_idx, lines_idx, match_len in matching_blocks: # <<<<<<<<<<<<<<
662@@ -1493,7 +1493,7 @@
663 __pyx_v_match_len = __pyx_t_8;
664 }
665
666- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":183
667+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":183
668 * for parent_idx, lines_idx, match_len in matching_blocks:
669 * _check_match_ranges(parent_annotations, annotations,
670 * parent_idx, lines_idx, match_len) # <<<<<<<<<<<<<<
671@@ -1502,7 +1502,7 @@
672 */
673 __pyx_t_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(__pyx_v_parent_annotations, __pyx_v_annotations, __pyx_v_parent_idx, __pyx_v_lines_idx, __pyx_v_match_len); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
674
675- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":184
676+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":184
677 * _check_match_ranges(parent_annotations, annotations,
678 * parent_idx, lines_idx, match_len)
679 * par_temp = par_list.ob_item + parent_idx # <<<<<<<<<<<<<<
680@@ -1511,7 +1511,7 @@
681 */
682 __pyx_v_par_temp = (__pyx_v_par_list->ob_item + __pyx_v_parent_idx);
683
684- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":185
685+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":185
686 * parent_idx, lines_idx, match_len)
687 * par_temp = par_list.ob_item + parent_idx
688 * ann_temp = ann_list.ob_item + lines_idx # <<<<<<<<<<<<<<
689@@ -1520,7 +1520,7 @@
690 */
691 __pyx_v_ann_temp = (__pyx_v_ann_list->ob_item + __pyx_v_lines_idx);
692
693- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":186
694+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":186
695 * par_temp = par_list.ob_item + parent_idx
696 * ann_temp = ann_list.ob_item + lines_idx
697 * for idx from 0 <= idx < match_len: # <<<<<<<<<<<<<<
698@@ -1530,7 +1530,7 @@
699 __pyx_t_8 = __pyx_v_match_len;
700 for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_t_8; __pyx_v_idx++) {
701
702- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":187
703+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":187
704 * ann_temp = ann_list.ob_item + lines_idx
705 * for idx from 0 <= idx < match_len:
706 * Py_INCREF_ptr(par_temp[idx]) # <<<<<<<<<<<<<<
707@@ -1539,7 +1539,7 @@
708 */
709 Py_INCREF((__pyx_v_par_temp[__pyx_v_idx]));
710
711- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":188
712+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":188
713 * for idx from 0 <= idx < match_len:
714 * Py_INCREF_ptr(par_temp[idx])
715 * Py_DECREF_ptr(ann_temp[idx]) # <<<<<<<<<<<<<<
716@@ -1548,7 +1548,7 @@
717 */
718 Py_DECREF((__pyx_v_ann_temp[__pyx_v_idx]));
719
720- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":189
721+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":189
722 * Py_INCREF_ptr(par_temp[idx])
723 * Py_DECREF_ptr(ann_temp[idx])
724 * ann_temp[idx] = par_temp[idx] # <<<<<<<<<<<<<<
725@@ -1560,7 +1560,7 @@
726 }
727 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
728
729- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":190
730+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":190
731 * Py_DECREF_ptr(ann_temp[idx])
732 * ann_temp[idx] = par_temp[idx]
733 * return 0 # <<<<<<<<<<<<<<
734@@ -1586,7 +1586,7 @@
735 return __pyx_r;
736 }
737
738-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":193
739+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":193
740 *
741 *
742 * cdef int _merge_annotations(this_annotation, annotations, parent_annotations, # <<<<<<<<<<<<<<
743@@ -1631,7 +1631,7 @@
744 __pyx_v_ann = Py_None; __Pyx_INCREF(Py_None);
745 __pyx_v_new_ann = Py_None; __Pyx_INCREF(Py_None);
746
747- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":199
748+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":199
749 * cdef PyObject *ann_temp, *par_temp
750 *
751 * _check_annotations_are_lists(annotations, parent_annotations) # <<<<<<<<<<<<<<
752@@ -1640,7 +1640,7 @@
753 */
754 __pyx_t_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(__pyx_v_annotations, __pyx_v_parent_annotations); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
755
756- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":200
757+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":200
758 *
759 * _check_annotations_are_lists(annotations, parent_annotations)
760 * last_ann = None # <<<<<<<<<<<<<<
761@@ -1651,7 +1651,7 @@
762 __Pyx_DECREF(__pyx_v_last_ann);
763 __pyx_v_last_ann = Py_None;
764
765- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":201
766+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":201
767 * _check_annotations_are_lists(annotations, parent_annotations)
768 * last_ann = None
769 * last_parent = None # <<<<<<<<<<<<<<
770@@ -1662,7 +1662,7 @@
771 __Pyx_DECREF(__pyx_v_last_parent);
772 __pyx_v_last_parent = Py_None;
773
774- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":202
775+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":202
776 * last_ann = None
777 * last_parent = None
778 * last_res = None # <<<<<<<<<<<<<<
779@@ -1673,7 +1673,7 @@
780 __Pyx_DECREF(__pyx_v_last_res);
781 __pyx_v_last_res = Py_None;
782
783- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":203
784+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":203
785 * last_parent = None
786 * last_res = None
787 * for parent_idx, lines_idx, match_len in matching_blocks: # <<<<<<<<<<<<<<
788@@ -1739,7 +1739,7 @@
789 __pyx_v_match_len = __pyx_t_8;
790 }
791
792- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":205
793+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":205
794 * for parent_idx, lines_idx, match_len in matching_blocks:
795 * _check_match_ranges(parent_annotations, annotations,
796 * parent_idx, lines_idx, match_len) # <<<<<<<<<<<<<<
797@@ -1748,7 +1748,7 @@
798 */
799 __pyx_t_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(__pyx_v_parent_annotations, __pyx_v_annotations, __pyx_v_parent_idx, __pyx_v_lines_idx, __pyx_v_match_len); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
800
801- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":208
802+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":208
803 * # For lines which match this parent, we will now resolve whether
804 * # this parent wins over the current annotation
805 * for idx from 0 <= idx < match_len: # <<<<<<<<<<<<<<
806@@ -1758,7 +1758,7 @@
807 __pyx_t_8 = __pyx_v_match_len;
808 for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_t_8; __pyx_v_idx++) {
809
810- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":209
811+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":209
812 * # this parent wins over the current annotation
813 * for idx from 0 <= idx < match_len:
814 * ann_idx = lines_idx + idx # <<<<<<<<<<<<<<
815@@ -1767,7 +1767,7 @@
816 */
817 __pyx_v_ann_idx = (__pyx_v_lines_idx + __pyx_v_idx);
818
819- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":210
820+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":210
821 * for idx from 0 <= idx < match_len:
822 * ann_idx = lines_idx + idx
823 * ann_temp = PyList_GET_ITEM(annotations, ann_idx) # <<<<<<<<<<<<<<
824@@ -1776,7 +1776,7 @@
825 */
826 __pyx_v_ann_temp = PyList_GET_ITEM(__pyx_v_annotations, __pyx_v_ann_idx);
827
828- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":211
829+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":211
830 * ann_idx = lines_idx + idx
831 * ann_temp = PyList_GET_ITEM(annotations, ann_idx)
832 * par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx) # <<<<<<<<<<<<<<
833@@ -1785,7 +1785,7 @@
834 */
835 __pyx_v_par_temp = PyList_GET_ITEM(__pyx_v_parent_annotations, (__pyx_v_parent_idx + __pyx_v_idx));
836
837- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":212
838+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":212
839 * ann_temp = PyList_GET_ITEM(annotations, ann_idx)
840 * par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx)
841 * if (ann_temp == par_temp): # <<<<<<<<<<<<<<
842@@ -1795,7 +1795,7 @@
843 __pyx_t_12 = (__pyx_v_ann_temp == __pyx_v_par_temp);
844 if (__pyx_t_12) {
845
846- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":220
847+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":220
848 * # PyObject_RichCompareBool using pointer comparison drops
849 * # timing from 215ms => 125ms
850 * continue # <<<<<<<<<<<<<<
851@@ -1807,7 +1807,7 @@
852 }
853 __pyx_L7:;
854
855- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":221
856+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":221
857 * # timing from 215ms => 125ms
858 * continue
859 * par_ann = <object>par_temp # <<<<<<<<<<<<<<
860@@ -1818,7 +1818,7 @@
861 __Pyx_DECREF(__pyx_v_par_ann);
862 __pyx_v_par_ann = ((PyObject *)__pyx_v_par_temp);
863
864- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":222
865+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":222
866 * continue
867 * par_ann = <object>par_temp
868 * ann = <object>ann_temp # <<<<<<<<<<<<<<
869@@ -1829,7 +1829,7 @@
870 __Pyx_DECREF(__pyx_v_ann);
871 __pyx_v_ann = ((PyObject *)__pyx_v_ann_temp);
872
873- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":223
874+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":223
875 * par_ann = <object>par_temp
876 * ann = <object>ann_temp
877 * if (ann is this_annotation): # <<<<<<<<<<<<<<
878@@ -1839,7 +1839,7 @@
879 __pyx_t_12 = (__pyx_v_ann == __pyx_v_this_annotation);
880 if (__pyx_t_12) {
881
882- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":226
883+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":226
884 * # Originally claimed 'this', but it was really in this
885 * # parent
886 * Py_INCREF(par_ann) # <<<<<<<<<<<<<<
887@@ -1848,7 +1848,7 @@
888 */
889 Py_INCREF(__pyx_v_par_ann);
890
891- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":227
892+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":227
893 * # parent
894 * Py_INCREF(par_ann)
895 * PyList_SetItem(annotations, ann_idx, par_ann) # <<<<<<<<<<<<<<
896@@ -1857,7 +1857,7 @@
897 */
898 __pyx_t_1 = PyList_SetItem(__pyx_v_annotations, __pyx_v_ann_idx, __pyx_v_par_ann); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
899
900- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":228
901+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":228
902 * Py_INCREF(par_ann)
903 * PyList_SetItem(annotations, ann_idx, par_ann)
904 * continue # <<<<<<<<<<<<<<
905@@ -1869,7 +1869,7 @@
906 }
907 __pyx_L8:;
908
909- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":231
910+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":231
911 * # Resolve the fact that both sides have a different value for
912 * # last modified
913 * if (ann is last_ann and par_ann is last_parent): # <<<<<<<<<<<<<<
914@@ -1885,7 +1885,7 @@
915 }
916 if (__pyx_t_14) {
917
918- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":232
919+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":232
920 * # last modified
921 * if (ann is last_ann and par_ann is last_parent):
922 * Py_INCREF(last_res) # <<<<<<<<<<<<<<
923@@ -1894,7 +1894,7 @@
924 */
925 Py_INCREF(__pyx_v_last_res);
926
927- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":233
928+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":233
929 * if (ann is last_ann and par_ann is last_parent):
930 * Py_INCREF(last_res)
931 * PyList_SetItem(annotations, ann_idx, last_res) # <<<<<<<<<<<<<<
932@@ -1906,7 +1906,7 @@
933 }
934 /*else*/ {
935
936- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":235
937+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":235
938 * PyList_SetItem(annotations, ann_idx, last_res)
939 * else:
940 * new_ann = _combine_annotations(ann, par_ann, ann_cache) # <<<<<<<<<<<<<<
941@@ -1919,7 +1919,7 @@
942 __pyx_v_new_ann = __pyx_t_4;
943 __pyx_t_4 = 0;
944
945- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":236
946+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":236
947 * else:
948 * new_ann = _combine_annotations(ann, par_ann, ann_cache)
949 * Py_INCREF(new_ann) # <<<<<<<<<<<<<<
950@@ -1928,7 +1928,7 @@
951 */
952 Py_INCREF(__pyx_v_new_ann);
953
954- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":237
955+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":237
956 * new_ann = _combine_annotations(ann, par_ann, ann_cache)
957 * Py_INCREF(new_ann)
958 * PyList_SetItem(annotations, ann_idx, new_ann) # <<<<<<<<<<<<<<
959@@ -1937,7 +1937,7 @@
960 */
961 __pyx_t_1 = PyList_SetItem(__pyx_v_annotations, __pyx_v_ann_idx, __pyx_v_new_ann); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
962
963- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":238
964+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":238
965 * Py_INCREF(new_ann)
966 * PyList_SetItem(annotations, ann_idx, new_ann)
967 * last_ann = ann # <<<<<<<<<<<<<<
968@@ -1948,7 +1948,7 @@
969 __Pyx_DECREF(__pyx_v_last_ann);
970 __pyx_v_last_ann = __pyx_v_ann;
971
972- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":239
973+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":239
974 * PyList_SetItem(annotations, ann_idx, new_ann)
975 * last_ann = ann
976 * last_parent = par_ann # <<<<<<<<<<<<<<
977@@ -1959,7 +1959,7 @@
978 __Pyx_DECREF(__pyx_v_last_parent);
979 __pyx_v_last_parent = __pyx_v_par_ann;
980
981- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":240
982+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":240
983 * last_ann = ann
984 * last_parent = par_ann
985 * last_res = new_ann # <<<<<<<<<<<<<<
986@@ -1976,7 +1976,7 @@
987 }
988 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
989
990- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":241
991+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":241
992 * last_parent = par_ann
993 * last_res = new_ann
994 * return 0 # <<<<<<<<<<<<<<
995@@ -2008,7 +2008,7 @@
996 return __pyx_r;
997 }
998
999-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":247
1000+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":247
1001 * """Class that drives performing annotations."""
1002 *
1003 * def _update_from_first_parent(self, key, annotations, lines, parent_key): # <<<<<<<<<<<<<<
1004@@ -2106,7 +2106,7 @@
1005 __pyx_v_parent_annotations = Py_None; __Pyx_INCREF(Py_None);
1006 __pyx_v_matching_blocks = Py_None; __Pyx_INCREF(Py_None);
1007
1008- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":250
1009+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":250
1010 * """Reannotate this text relative to its first parent."""
1011 * (parent_annotations,
1012 * matching_blocks) = self._get_parent_annotations_and_matches( # <<<<<<<<<<<<<<
1013@@ -2116,7 +2116,7 @@
1014 __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s_6); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1015 __Pyx_GOTREF(__pyx_t_1);
1016
1017- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":251
1018+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":251
1019 * (parent_annotations,
1020 * matching_blocks) = self._get_parent_annotations_and_matches(
1021 * key, lines, parent_key) # <<<<<<<<<<<<<<
1022@@ -2143,7 +2143,7 @@
1023 __pyx_t_2 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_2);
1024 __pyx_t_1 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_1);
1025
1026- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":249
1027+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":249
1028 * def _update_from_first_parent(self, key, annotations, lines, parent_key):
1029 * """Reannotate this text relative to its first parent."""
1030 * (parent_annotations, # <<<<<<<<<<<<<<
1031@@ -2175,7 +2175,7 @@
1032 __pyx_t_1 = 0;
1033 }
1034
1035- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":254
1036+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":254
1037 *
1038 * _apply_parent_annotations(annotations, parent_annotations,
1039 * matching_blocks) # <<<<<<<<<<<<<<
1040@@ -2201,7 +2201,7 @@
1041 return __pyx_r;
1042 }
1043
1044-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":256
1045+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":256
1046 * matching_blocks)
1047 *
1048 * def _update_from_other_parents(self, key, annotations, lines, # <<<<<<<<<<<<<<
1049@@ -2309,7 +2309,7 @@
1050 __pyx_v_parent_annotations = Py_None; __Pyx_INCREF(Py_None);
1051 __pyx_v_matching_blocks = Py_None; __Pyx_INCREF(Py_None);
1052
1053- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":260
1054+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":260
1055 * """Reannotate this text relative to a second (or more) parent."""
1056 * (parent_annotations,
1057 * matching_blocks) = self._get_parent_annotations_and_matches( # <<<<<<<<<<<<<<
1058@@ -2319,7 +2319,7 @@
1059 __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s_6); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1060 __Pyx_GOTREF(__pyx_t_1);
1061
1062- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":261
1063+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":261
1064 * (parent_annotations,
1065 * matching_blocks) = self._get_parent_annotations_and_matches(
1066 * key, lines, parent_key) # <<<<<<<<<<<<<<
1067@@ -2346,7 +2346,7 @@
1068 __pyx_t_2 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_2);
1069 __pyx_t_1 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_1);
1070
1071- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":259
1072+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":259
1073 * this_annotation, parent_key):
1074 * """Reannotate this text relative to a second (or more) parent."""
1075 * (parent_annotations, # <<<<<<<<<<<<<<
1076@@ -2378,7 +2378,7 @@
1077 __pyx_t_1 = 0;
1078 }
1079
1080- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":263
1081+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":263
1082 * key, lines, parent_key)
1083 * _merge_annotations(this_annotation, annotations, parent_annotations,
1084 * matching_blocks, self._ann_tuple_cache) # <<<<<<<<<<<<<<
1085@@ -2407,7 +2407,7 @@
1086 return __pyx_r;
1087 }
1088
1089-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":265
1090+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":265
1091 * matching_blocks, self._ann_tuple_cache)
1092 *
1093 * def annotate_flat(self, key): # <<<<<<<<<<<<<<
1094@@ -2496,7 +2496,7 @@
1095 __pyx_v_head = Py_None; __Pyx_INCREF(Py_None);
1096 __pyx_v_the_heads = Py_None; __Pyx_INCREF(Py_None);
1097
1098- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":272
1099+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":272
1100 * cdef Py_ssize_t pos, num_lines
1101 *
1102 * from bzrlib import annotate # <<<<<<<<<<<<<<
1103@@ -2519,7 +2519,7 @@
1104 __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
1105 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
1106
1107- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":274
1108+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":274
1109 * from bzrlib import annotate
1110 *
1111 * custom_tiebreaker = annotate._break_annotation_tie # <<<<<<<<<<<<<<
1112@@ -2532,7 +2532,7 @@
1113 __pyx_v_custom_tiebreaker = __pyx_t_2;
1114 __pyx_t_2 = 0;
1115
1116- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":275
1117+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":275
1118 *
1119 * custom_tiebreaker = annotate._break_annotation_tie
1120 * annotations, lines = self.annotate(key) # <<<<<<<<<<<<<<
1121@@ -2579,7 +2579,7 @@
1122 __pyx_t_2 = 0;
1123 }
1124
1125- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":276
1126+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":276
1127 * custom_tiebreaker = annotate._break_annotation_tie
1128 * annotations, lines = self.annotate(key)
1129 * num_lines = len(lines) # <<<<<<<<<<<<<<
1130@@ -2589,7 +2589,7 @@
1131 __pyx_t_5 = PyObject_Length(__pyx_v_lines); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1132 __pyx_v_num_lines = __pyx_t_5;
1133
1134- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":277
1135+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":277
1136 * annotations, lines = self.annotate(key)
1137 * num_lines = len(lines)
1138 * out = [] # <<<<<<<<<<<<<<
1139@@ -2602,7 +2602,7 @@
1140 __pyx_v_out = __pyx_t_3;
1141 __pyx_t_3 = 0;
1142
1143- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":278
1144+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":278
1145 * num_lines = len(lines)
1146 * out = []
1147 * heads = self._get_heads_provider().heads # <<<<<<<<<<<<<<
1148@@ -2621,7 +2621,7 @@
1149 __pyx_v_heads = __pyx_t_3;
1150 __pyx_t_3 = 0;
1151
1152- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":279
1153+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":279
1154 * out = []
1155 * heads = self._get_heads_provider().heads
1156 * for pos from 0 <= pos < num_lines: # <<<<<<<<<<<<<<
1157@@ -2631,7 +2631,7 @@
1158 __pyx_t_5 = __pyx_v_num_lines;
1159 for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_t_5; __pyx_v_pos++) {
1160
1161- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":280
1162+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":280
1163 * heads = self._get_heads_provider().heads
1164 * for pos from 0 <= pos < num_lines:
1165 * annotation = annotations[pos] # <<<<<<<<<<<<<<
1166@@ -2644,7 +2644,7 @@
1167 __pyx_v_annotation = __pyx_t_3;
1168 __pyx_t_3 = 0;
1169
1170- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":281
1171+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":281
1172 * for pos from 0 <= pos < num_lines:
1173 * annotation = annotations[pos]
1174 * line = lines[pos] # <<<<<<<<<<<<<<
1175@@ -2657,7 +2657,7 @@
1176 __pyx_v_line = __pyx_t_3;
1177 __pyx_t_3 = 0;
1178
1179- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":282
1180+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":282
1181 * annotation = annotations[pos]
1182 * line = lines[pos]
1183 * if len(annotation) == 1: # <<<<<<<<<<<<<<
1184@@ -2668,7 +2668,7 @@
1185 __pyx_t_7 = (__pyx_t_6 == 1);
1186 if (__pyx_t_7) {
1187
1188- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":283
1189+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":283
1190 * line = lines[pos]
1191 * if len(annotation) == 1:
1192 * head = annotation[0] # <<<<<<<<<<<<<<
1193@@ -2684,7 +2684,7 @@
1194 }
1195 /*else*/ {
1196
1197- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":285
1198+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":285
1199 * head = annotation[0]
1200 * else:
1201 * the_heads = heads(annotation) # <<<<<<<<<<<<<<
1202@@ -2703,7 +2703,7 @@
1203 __pyx_v_the_heads = __pyx_t_2;
1204 __pyx_t_2 = 0;
1205
1206- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":286
1207+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":286
1208 * else:
1209 * the_heads = heads(annotation)
1210 * if len(the_heads) == 1: # <<<<<<<<<<<<<<
1211@@ -2714,7 +2714,7 @@
1212 __pyx_t_7 = (__pyx_t_6 == 1);
1213 if (__pyx_t_7) {
1214
1215- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":287
1216+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":287
1217 * the_heads = heads(annotation)
1218 * if len(the_heads) == 1:
1219 * for head in the_heads: break # get the item out of the set # <<<<<<<<<<<<<<
1220@@ -2753,7 +2753,7 @@
1221 }
1222 /*else*/ {
1223
1224- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":291
1225+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":291
1226 * # We need to resolve the ambiguity, for now just pick the
1227 * # sorted smallest
1228 * head = self._resolve_annotation_tie(the_heads, line, # <<<<<<<<<<<<<<
1229@@ -2763,7 +2763,7 @@
1230 __pyx_t_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s_8); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1231 __Pyx_GOTREF(__pyx_t_2);
1232
1233- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":292
1234+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":292
1235 * # sorted smallest
1236 * head = self._resolve_annotation_tie(the_heads, line,
1237 * custom_tiebreaker) # <<<<<<<<<<<<<<
1238@@ -2793,7 +2793,7 @@
1239 }
1240 __pyx_L8:;
1241
1242- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":293
1243+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":293
1244 * head = self._resolve_annotation_tie(the_heads, line,
1245 * custom_tiebreaker)
1246 * PyList_Append(out, (head, line)) # <<<<<<<<<<<<<<
1247@@ -2811,7 +2811,7 @@
1248 __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
1249 }
1250
1251- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":294
1252+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":294
1253 * custom_tiebreaker)
1254 * PyList_Append(out, (head, line))
1255 * return out # <<<<<<<<<<<<<<
1256@@ -2977,7 +2977,7 @@
1257 /*--- Function import code ---*/
1258 /*--- Execution code ---*/
1259
1260- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":58
1261+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":58
1262 *
1263 *
1264 * from bzrlib import _annotator_py # <<<<<<<<<<<<<<
1265@@ -2998,7 +2998,7 @@
1266 __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
1267 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
1268
1269- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":244
1270+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":244
1271 *
1272 *
1273 * class Annotator(_annotator_py.Annotator): # <<<<<<<<<<<<<<
1274@@ -3022,7 +3022,7 @@
1275 __Pyx_GOTREF(__pyx_t_3);
1276 __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
1277
1278- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":247
1279+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":247
1280 * """Class that drives performing annotations."""
1281 *
1282 * def _update_from_first_parent(self, key, annotations, lines, parent_key): # <<<<<<<<<<<<<<
1283@@ -3037,7 +3037,7 @@
1284 if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s_11, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1285 __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
1286
1287- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":256
1288+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":256
1289 * matching_blocks)
1290 *
1291 * def _update_from_other_parents(self, key, annotations, lines, # <<<<<<<<<<<<<<
1292@@ -3052,7 +3052,7 @@
1293 if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s_12, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1294 __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
1295
1296- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":265
1297+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":265
1298 * matching_blocks, self._ann_tuple_cache)
1299 *
1300 * def annotate_flat(self, key): # <<<<<<<<<<<<<<
1301@@ -3070,7 +3070,7 @@
1302 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
1303 __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
1304
1305- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":1
1306+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":1
1307 * # Copyright (C) 2009, 2010 Canonical Ltd # <<<<<<<<<<<<<<
1308 * #
1309 * # This program is free software; you can redistribute it and/or modify
1310
1311=== modified file 'bzrlib/_bencode_pyx.c'
1312--- bzrlib/_bencode_pyx.c 2011-08-31 15:04:43 +0000
1313+++ bzrlib/_bencode_pyx.c 2011-11-03 14:37:19 +0000
1314@@ -1,4 +1,4 @@
1315-/* Generated by Cython 0.13 on Thu Aug 11 09:45:14 2011 */
1316+/* Generated by Cython 0.13 on Mon Sep 19 20:18:38 2011 */
1317
1318 #define PY_SSIZE_T_CLEAN
1319 #include "Python.h"
1320@@ -281,7 +281,7 @@
1321
1322 /* Type declarations */
1323
1324-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":240
1325+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":240
1326 *
1327 *
1328 * cdef enum: # <<<<<<<<<<<<<<
1329@@ -294,7 +294,7 @@
1330 __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE = 32
1331 };
1332
1333-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":54
1334+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":54
1335 * int snprintf(char* buffer, size_t nsize, char* fmt, ...)
1336 *
1337 * cdef class Decoder # <<<<<<<<<<<<<<
1338@@ -311,7 +311,7 @@
1339 PyObject *text;
1340 };
1341
1342-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":55
1343+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":55
1344 *
1345 * cdef class Decoder
1346 * cdef class Encoder # <<<<<<<<<<<<<<
1347@@ -329,7 +329,7 @@
1348 };
1349
1350
1351-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":245
1352+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":245
1353 *
1354 *
1355 * cdef class Encoder: # <<<<<<<<<<<<<<
1356@@ -349,7 +349,7 @@
1357 static struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *__pyx_vtabptr_6bzrlib_12_bencode_pyx_Encoder;
1358
1359
1360-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":69
1361+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":69
1362 *
1363 *
1364 * cdef class Decoder: # <<<<<<<<<<<<<<
1365@@ -636,7 +636,7 @@
1366 static PyObject *__pyx_int_0;
1367 static int __pyx_k_15;
1368
1369-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":72
1370+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":72
1371 * """Bencode decoder"""
1372 *
1373 * cdef readonly char *tail # <<<<<<<<<<<<<<
1374@@ -668,7 +668,7 @@
1375 return __pyx_r;
1376 }
1377
1378-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":73
1379+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":73
1380 *
1381 * cdef readonly char *tail
1382 * cdef readonly int size # <<<<<<<<<<<<<<
1383@@ -700,7 +700,7 @@
1384 return __pyx_r;
1385 }
1386
1387-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":74
1388+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":74
1389 * cdef readonly char *tail
1390 * cdef readonly int size
1391 * cdef readonly int _yield_tuples # <<<<<<<<<<<<<<
1392@@ -732,7 +732,7 @@
1393 return __pyx_r;
1394 }
1395
1396-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":77
1397+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":77
1398 * cdef object text
1399 *
1400 * def __init__(self, s, yield_tuples=0): # <<<<<<<<<<<<<<
1401@@ -799,7 +799,7 @@
1402 return -1;
1403 __pyx_L4_argument_unpacking_done:;
1404
1405- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":81
1406+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":81
1407 * @param s: Python string.
1408 * """
1409 * if not PyString_CheckExact(s): # <<<<<<<<<<<<<<
1410@@ -809,7 +809,7 @@
1411 __pyx_t_1 = (!PyString_CheckExact(__pyx_v_s));
1412 if (__pyx_t_1) {
1413
1414- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":82
1415+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":82
1416 * """
1417 * if not PyString_CheckExact(s):
1418 * raise TypeError("String required") # <<<<<<<<<<<<<<
1419@@ -831,7 +831,7 @@
1420 }
1421 __pyx_L6:;
1422
1423- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":84
1424+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":84
1425 * raise TypeError("String required")
1426 *
1427 * self.text = s # <<<<<<<<<<<<<<
1428@@ -844,7 +844,7 @@
1429 __Pyx_DECREF(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text);
1430 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text = __pyx_v_s;
1431
1432- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":85
1433+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":85
1434 *
1435 * self.text = s
1436 * self.tail = PyString_AS_STRING(s) # <<<<<<<<<<<<<<
1437@@ -854,7 +854,7 @@
1438 __pyx_t_4 = PyString_AS_STRING(__pyx_v_s); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1439 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->tail = __pyx_t_4;
1440
1441- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":86
1442+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":86
1443 * self.text = s
1444 * self.tail = PyString_AS_STRING(s)
1445 * self.size = PyString_GET_SIZE(s) # <<<<<<<<<<<<<<
1446@@ -864,7 +864,7 @@
1447 __pyx_t_5 = PyString_GET_SIZE(__pyx_v_s); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1448 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size = __pyx_t_5;
1449
1450- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":87
1451+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":87
1452 * self.tail = PyString_AS_STRING(s)
1453 * self.size = PyString_GET_SIZE(s)
1454 * self._yield_tuples = int(yield_tuples) # <<<<<<<<<<<<<<
1455@@ -895,7 +895,7 @@
1456 return __pyx_r;
1457 }
1458
1459-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":89
1460+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":89
1461 * self._yield_tuples = int(yield_tuples)
1462 *
1463 * def decode(self): # <<<<<<<<<<<<<<
1464@@ -913,7 +913,7 @@
1465 __Pyx_RefNannySetupContext("decode");
1466 __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
1467
1468- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":90
1469+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":90
1470 *
1471 * def decode(self):
1472 * result = self._decode_object() # <<<<<<<<<<<<<<
1473@@ -926,7 +926,7 @@
1474 __pyx_v_result = __pyx_t_1;
1475 __pyx_t_1 = 0;
1476
1477- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":91
1478+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":91
1479 * def decode(self):
1480 * result = self._decode_object()
1481 * if self.size != 0: # <<<<<<<<<<<<<<
1482@@ -936,7 +936,7 @@
1483 __pyx_t_2 = (((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size != 0);
1484 if (__pyx_t_2) {
1485
1486- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":92
1487+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":92
1488 * result = self._decode_object()
1489 * if self.size != 0:
1490 * raise ValueError('junk in stream') # <<<<<<<<<<<<<<
1491@@ -958,7 +958,7 @@
1492 }
1493 __pyx_L5:;
1494
1495- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":93
1496+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":93
1497 * if self.size != 0:
1498 * raise ValueError('junk in stream')
1499 * return result # <<<<<<<<<<<<<<
1500@@ -984,7 +984,7 @@
1501 return __pyx_r;
1502 }
1503
1504-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":95
1505+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":95
1506 * return result
1507 *
1508 * def decode_object(self): # <<<<<<<<<<<<<<
1509@@ -998,7 +998,7 @@
1510 PyObject *__pyx_t_1 = NULL;
1511 __Pyx_RefNannySetupContext("decode_object");
1512
1513- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":96
1514+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":96
1515 *
1516 * def decode_object(self):
1517 * return self._decode_object() # <<<<<<<<<<<<<<
1518@@ -1024,7 +1024,7 @@
1519 return __pyx_r;
1520 }
1521
1522-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":98
1523+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":98
1524 * return self._decode_object()
1525 *
1526 * cdef object _decode_object(self): # <<<<<<<<<<<<<<
1527@@ -1041,7 +1041,7 @@
1528 int __pyx_t_4;
1529 __Pyx_RefNannySetupContext("_decode_object");
1530
1531- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":101
1532+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":101
1533 * cdef char ch
1534 *
1535 * if 0 == self.size: # <<<<<<<<<<<<<<
1536@@ -1051,7 +1051,7 @@
1537 __pyx_t_1 = (0 == __pyx_v_self->size);
1538 if (__pyx_t_1) {
1539
1540- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":102
1541+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":102
1542 *
1543 * if 0 == self.size:
1544 * raise ValueError('stream underflow') # <<<<<<<<<<<<<<
1545@@ -1073,7 +1073,7 @@
1546 }
1547 __pyx_L3:;
1548
1549- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":104
1550+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":104
1551 * raise ValueError('stream underflow')
1552 *
1553 * if Py_EnterRecursiveCall("_decode_object"): # <<<<<<<<<<<<<<
1554@@ -1083,7 +1083,7 @@
1555 __pyx_t_4 = Py_EnterRecursiveCall(__pyx_k___decode_object);
1556 if (__pyx_t_4) {
1557
1558- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":105
1559+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":105
1560 *
1561 * if Py_EnterRecursiveCall("_decode_object"):
1562 * raise RuntimeError("too deeply nested") # <<<<<<<<<<<<<<
1563@@ -1105,7 +1105,7 @@
1564 }
1565 __pyx_L4:;
1566
1567- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":106
1568+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":106
1569 * if Py_EnterRecursiveCall("_decode_object"):
1570 * raise RuntimeError("too deeply nested")
1571 * try: # <<<<<<<<<<<<<<
1572@@ -1114,7 +1114,7 @@
1573 */
1574 /*try:*/ {
1575
1576- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":107
1577+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":107
1578 * raise RuntimeError("too deeply nested")
1579 * try:
1580 * ch = self.tail[0] # <<<<<<<<<<<<<<
1581@@ -1123,7 +1123,7 @@
1582 */
1583 __pyx_v_ch = (__pyx_v_self->tail[0]);
1584
1585- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":108
1586+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":108
1587 * try:
1588 * ch = self.tail[0]
1589 * if c'0' <= ch <= c'9': # <<<<<<<<<<<<<<
1590@@ -1136,7 +1136,7 @@
1591 }
1592 if (__pyx_t_1) {
1593
1594- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":109
1595+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":109
1596 * ch = self.tail[0]
1597 * if c'0' <= ch <= c'9':
1598 * return self._decode_string() # <<<<<<<<<<<<<<
1599@@ -1152,7 +1152,7 @@
1600 goto __pyx_L8;
1601 }
1602
1603- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":110
1604+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":110
1605 * if c'0' <= ch <= c'9':
1606 * return self._decode_string()
1607 * elif ch == c'l': # <<<<<<<<<<<<<<
1608@@ -1162,7 +1162,7 @@
1609 __pyx_t_1 = (__pyx_v_ch == 'l');
1610 if (__pyx_t_1) {
1611
1612- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":111
1613+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":111
1614 * return self._decode_string()
1615 * elif ch == c'l':
1616 * D_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
1617@@ -1171,7 +1171,7 @@
1618 */
1619 D_UPDATE_TAIL(__pyx_v_self, 1);
1620
1621- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":112
1622+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":112
1623 * elif ch == c'l':
1624 * D_UPDATE_TAIL(self, 1)
1625 * return self._decode_list() # <<<<<<<<<<<<<<
1626@@ -1187,7 +1187,7 @@
1627 goto __pyx_L8;
1628 }
1629
1630- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":113
1631+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":113
1632 * D_UPDATE_TAIL(self, 1)
1633 * return self._decode_list()
1634 * elif ch == c'i': # <<<<<<<<<<<<<<
1635@@ -1197,7 +1197,7 @@
1636 __pyx_t_1 = (__pyx_v_ch == 'i');
1637 if (__pyx_t_1) {
1638
1639- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":114
1640+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":114
1641 * return self._decode_list()
1642 * elif ch == c'i':
1643 * D_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
1644@@ -1206,7 +1206,7 @@
1645 */
1646 D_UPDATE_TAIL(__pyx_v_self, 1);
1647
1648- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":115
1649+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":115
1650 * elif ch == c'i':
1651 * D_UPDATE_TAIL(self, 1)
1652 * return self._decode_int() # <<<<<<<<<<<<<<
1653@@ -1222,7 +1222,7 @@
1654 goto __pyx_L8;
1655 }
1656
1657- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":116
1658+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":116
1659 * D_UPDATE_TAIL(self, 1)
1660 * return self._decode_int()
1661 * elif ch == c'd': # <<<<<<<<<<<<<<
1662@@ -1232,7 +1232,7 @@
1663 __pyx_t_1 = (__pyx_v_ch == 'd');
1664 if (__pyx_t_1) {
1665
1666- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":117
1667+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":117
1668 * return self._decode_int()
1669 * elif ch == c'd':
1670 * D_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
1671@@ -1241,7 +1241,7 @@
1672 */
1673 D_UPDATE_TAIL(__pyx_v_self, 1);
1674
1675- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":118
1676+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":118
1677 * elif ch == c'd':
1678 * D_UPDATE_TAIL(self, 1)
1679 * return self._decode_dict() # <<<<<<<<<<<<<<
1680@@ -1258,7 +1258,7 @@
1681 }
1682 /*else*/ {
1683
1684- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":120
1685+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":120
1686 * return self._decode_dict()
1687 * else:
1688 * raise ValueError('unknown object type identifier %r' % ch) # <<<<<<<<<<<<<<
1689@@ -1285,7 +1285,7 @@
1690 __pyx_L8:;
1691 }
1692
1693- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":122
1694+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":122
1695 * raise ValueError('unknown object type identifier %r' % ch)
1696 * finally:
1697 * Py_LeaveRecursiveCall() # <<<<<<<<<<<<<<
1698@@ -1336,7 +1336,7 @@
1699 return __pyx_r;
1700 }
1701
1702-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":124
1703+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":124
1704 * Py_LeaveRecursiveCall()
1705 *
1706 * cdef int _read_digits(self, char stop_char) except -1: # <<<<<<<<<<<<<<
1707@@ -1356,7 +1356,7 @@
1708 int __pyx_t_7;
1709 __Pyx_RefNannySetupContext("_read_digits");
1710
1711- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":126
1712+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":126
1713 * cdef int _read_digits(self, char stop_char) except -1:
1714 * cdef int i
1715 * i = 0 # <<<<<<<<<<<<<<
1716@@ -1365,7 +1365,7 @@
1717 */
1718 __pyx_v_i = 0;
1719
1720- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":127
1721+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":127
1722 * cdef int i
1723 * i = 0
1724 * while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or # <<<<<<<<<<<<<<
1725@@ -1374,7 +1374,7 @@
1726 */
1727 while (1) {
1728
1729- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":128
1730+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":128
1731 * i = 0
1732 * while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
1733 * self.tail[i] == c'-') and i < self.size: # <<<<<<<<<<<<<<
1734@@ -1384,7 +1384,7 @@
1735 __pyx_t_1 = ((__pyx_v_self->tail[__pyx_v_i]) >= '0');
1736 if (__pyx_t_1) {
1737
1738- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":127
1739+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":127
1740 * cdef int i
1741 * i = 0
1742 * while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or # <<<<<<<<<<<<<<
1743@@ -1398,7 +1398,7 @@
1744 }
1745 if (!__pyx_t_3) {
1746
1747- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":128
1748+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":128
1749 * i = 0
1750 * while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
1751 * self.tail[i] == c'-') and i < self.size: # <<<<<<<<<<<<<<
1752@@ -1418,7 +1418,7 @@
1753 }
1754 if (!__pyx_t_1) break;
1755
1756- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":129
1757+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":129
1758 * while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
1759 * self.tail[i] == c'-') and i < self.size:
1760 * i = i + 1 # <<<<<<<<<<<<<<
1761@@ -1428,7 +1428,7 @@
1762 __pyx_v_i = (__pyx_v_i + 1);
1763 }
1764
1765- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":131
1766+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":131
1767 * i = i + 1
1768 *
1769 * if self.tail[i] != stop_char: # <<<<<<<<<<<<<<
1770@@ -1438,7 +1438,7 @@
1771 __pyx_t_1 = ((__pyx_v_self->tail[__pyx_v_i]) != __pyx_v_stop_char);
1772 if (__pyx_t_1) {
1773
1774- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":133
1775+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":133
1776 * if self.tail[i] != stop_char:
1777 * raise ValueError("Stop character %c not found: %c" %
1778 * (stop_char, self.tail[i])) # <<<<<<<<<<<<<<
1779@@ -1475,7 +1475,7 @@
1780 }
1781 __pyx_L5:;
1782
1783- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":134
1784+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":134
1785 * raise ValueError("Stop character %c not found: %c" %
1786 * (stop_char, self.tail[i]))
1787 * if (self.tail[0] == c'0' or # <<<<<<<<<<<<<<
1788@@ -1485,7 +1485,7 @@
1789 __pyx_t_1 = ((__pyx_v_self->tail[0]) == '0');
1790 if (!__pyx_t_1) {
1791
1792- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":135
1793+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":135
1794 * (stop_char, self.tail[i]))
1795 * if (self.tail[0] == c'0' or
1796 * (self.tail[0] == c'-' and self.tail[1] == c'0')): # <<<<<<<<<<<<<<
1797@@ -1505,7 +1505,7 @@
1798 }
1799 if (__pyx_t_2) {
1800
1801- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":136
1802+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":136
1803 * if (self.tail[0] == c'0' or
1804 * (self.tail[0] == c'-' and self.tail[1] == c'0')):
1805 * if i == 1: # <<<<<<<<<<<<<<
1806@@ -1515,7 +1515,7 @@
1807 __pyx_t_2 = (__pyx_v_i == 1);
1808 if (__pyx_t_2) {
1809
1810- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":137
1811+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":137
1812 * (self.tail[0] == c'-' and self.tail[1] == c'0')):
1813 * if i == 1:
1814 * return i # <<<<<<<<<<<<<<
1815@@ -1528,7 +1528,7 @@
1816 }
1817 /*else*/ {
1818
1819- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":139
1820+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":139
1821 * return i
1822 * else:
1823 * raise ValueError # leading zeroes are not allowed # <<<<<<<<<<<<<<
1824@@ -1543,7 +1543,7 @@
1825 }
1826 __pyx_L6:;
1827
1828- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":140
1829+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":140
1830 * else:
1831 * raise ValueError # leading zeroes are not allowed
1832 * return i # <<<<<<<<<<<<<<
1833@@ -1566,7 +1566,7 @@
1834 return __pyx_r;
1835 }
1836
1837-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":142
1838+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":142
1839 * return i
1840 *
1841 * cdef object _decode_int(self): # <<<<<<<<<<<<<<
1842@@ -1583,7 +1583,7 @@
1843 __Pyx_RefNannySetupContext("_decode_int");
1844 __pyx_v_ret = Py_None; __Pyx_INCREF(Py_None);
1845
1846- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":144
1847+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":144
1848 * cdef object _decode_int(self):
1849 * cdef int i
1850 * i = self._read_digits(c'e') # <<<<<<<<<<<<<<
1851@@ -1593,7 +1593,7 @@
1852 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_read_digits(__pyx_v_self, 'e'); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
1853 __pyx_v_i = __pyx_t_1;
1854
1855- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":145
1856+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":145
1857 * cdef int i
1858 * i = self._read_digits(c'e')
1859 * self.tail[i] = 0 # <<<<<<<<<<<<<<
1860@@ -1602,7 +1602,7 @@
1861 */
1862 (__pyx_v_self->tail[__pyx_v_i]) = 0;
1863
1864- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":146
1865+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":146
1866 * i = self._read_digits(c'e')
1867 * self.tail[i] = 0
1868 * try: # <<<<<<<<<<<<<<
1869@@ -1611,7 +1611,7 @@
1870 */
1871 /*try:*/ {
1872
1873- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":147
1874+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":147
1875 * self.tail[i] = 0
1876 * try:
1877 * ret = PyInt_FromString(self.tail, NULL, 10) # <<<<<<<<<<<<<<
1878@@ -1625,7 +1625,7 @@
1879 __pyx_t_2 = 0;
1880 }
1881
1882- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":149
1883+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":149
1884 * ret = PyInt_FromString(self.tail, NULL, 10)
1885 * finally:
1886 * self.tail[i] = c'e' # <<<<<<<<<<<<<<
1887@@ -1659,7 +1659,7 @@
1888 }
1889 }
1890
1891- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":150
1892+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":150
1893 * finally:
1894 * self.tail[i] = c'e'
1895 * D_UPDATE_TAIL(self, i+1) # <<<<<<<<<<<<<<
1896@@ -1668,7 +1668,7 @@
1897 */
1898 D_UPDATE_TAIL(__pyx_v_self, (__pyx_v_i + 1));
1899
1900- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":151
1901+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":151
1902 * self.tail[i] = c'e'
1903 * D_UPDATE_TAIL(self, i+1)
1904 * return ret # <<<<<<<<<<<<<<
1905@@ -1693,7 +1693,7 @@
1906 return __pyx_r;
1907 }
1908
1909-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":153
1910+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":153
1911 * return ret
1912 *
1913 * cdef object _decode_string(self): # <<<<<<<<<<<<<<
1914@@ -1715,7 +1715,7 @@
1915 __Pyx_RefNannySetupContext("_decode_string");
1916 __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
1917
1918- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":160
1919+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":160
1920 * # or they wouldn't have called _decode_string
1921 * # strtol will stop at trailing whitespace, etc
1922 * n = strtol(self.tail, &next_tail, 10) # <<<<<<<<<<<<<<
1923@@ -1724,7 +1724,7 @@
1924 */
1925 __pyx_v_n = strtol(__pyx_v_self->tail, (&__pyx_v_next_tail), 10);
1926
1927- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":161
1928+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":161
1929 * # strtol will stop at trailing whitespace, etc
1930 * n = strtol(self.tail, &next_tail, 10)
1931 * if next_tail == NULL or next_tail[0] != c':': # <<<<<<<<<<<<<<
1932@@ -1740,7 +1740,7 @@
1933 }
1934 if (__pyx_t_3) {
1935
1936- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":162
1937+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":162
1938 * n = strtol(self.tail, &next_tail, 10)
1939 * if next_tail == NULL or next_tail[0] != c':':
1940 * raise ValueError('string len not terminated by ":"') # <<<<<<<<<<<<<<
1941@@ -1762,7 +1762,7 @@
1942 }
1943 __pyx_L3:;
1944
1945- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":164
1946+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":164
1947 * raise ValueError('string len not terminated by ":"')
1948 * # strtol allows leading zeros, so validate that we don't have that
1949 * if (self.tail[0] == c'0' # <<<<<<<<<<<<<<
1950@@ -1772,7 +1772,7 @@
1951 __pyx_t_3 = ((__pyx_v_self->tail[0]) == '0');
1952 if (__pyx_t_3) {
1953
1954- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":165
1955+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":165
1956 * # strtol allows leading zeros, so validate that we don't have that
1957 * if (self.tail[0] == c'0'
1958 * and (n != 0 or (next_tail - self.tail != 1))): # <<<<<<<<<<<<<<
1959@@ -1792,7 +1792,7 @@
1960 }
1961 if (__pyx_t_1) {
1962
1963- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":166
1964+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":166
1965 * if (self.tail[0] == c'0'
1966 * and (n != 0 or (next_tail - self.tail != 1))):
1967 * raise ValueError('leading zeros are not allowed') # <<<<<<<<<<<<<<
1968@@ -1814,7 +1814,7 @@
1969 }
1970 __pyx_L4:;
1971
1972- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":167
1973+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":167
1974 * and (n != 0 or (next_tail - self.tail != 1))):
1975 * raise ValueError('leading zeros are not allowed')
1976 * D_UPDATE_TAIL(self, next_tail - self.tail + 1) # <<<<<<<<<<<<<<
1977@@ -1823,7 +1823,7 @@
1978 */
1979 D_UPDATE_TAIL(__pyx_v_self, ((__pyx_v_next_tail - __pyx_v_self->tail) + 1));
1980
1981- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":168
1982+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":168
1983 * raise ValueError('leading zeros are not allowed')
1984 * D_UPDATE_TAIL(self, next_tail - self.tail + 1)
1985 * if n == 0: # <<<<<<<<<<<<<<
1986@@ -1833,7 +1833,7 @@
1987 __pyx_t_1 = (__pyx_v_n == 0);
1988 if (__pyx_t_1) {
1989
1990- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":169
1991+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":169
1992 * D_UPDATE_TAIL(self, next_tail - self.tail + 1)
1993 * if n == 0:
1994 * return '' # <<<<<<<<<<<<<<
1995@@ -1848,7 +1848,7 @@
1996 }
1997 __pyx_L5:;
1998
1999- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":170
2000+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":170
2001 * if n == 0:
2002 * return ''
2003 * if n > self.size: # <<<<<<<<<<<<<<
2004@@ -1858,7 +1858,7 @@
2005 __pyx_t_1 = (__pyx_v_n > __pyx_v_self->size);
2006 if (__pyx_t_1) {
2007
2008- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":171
2009+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":171
2010 * return ''
2011 * if n > self.size:
2012 * raise ValueError('stream underflow') # <<<<<<<<<<<<<<
2013@@ -1880,7 +1880,7 @@
2014 }
2015 __pyx_L6:;
2016
2017- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":172
2018+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":172
2019 * if n > self.size:
2020 * raise ValueError('stream underflow')
2021 * if n < 0: # <<<<<<<<<<<<<<
2022@@ -1890,7 +1890,7 @@
2023 __pyx_t_1 = (__pyx_v_n < 0);
2024 if (__pyx_t_1) {
2025
2026- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":173
2027+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":173
2028 * raise ValueError('stream underflow')
2029 * if n < 0:
2030 * raise ValueError('string size below zero: %d' % n) # <<<<<<<<<<<<<<
2031@@ -1917,7 +1917,7 @@
2032 }
2033 __pyx_L7:;
2034
2035- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":175
2036+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":175
2037 * raise ValueError('string size below zero: %d' % n)
2038 *
2039 * result = PyString_FromStringAndSize(self.tail, n) # <<<<<<<<<<<<<<
2040@@ -1930,7 +1930,7 @@
2041 __pyx_v_result = __pyx_t_4;
2042 __pyx_t_4 = 0;
2043
2044- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":176
2045+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":176
2046 *
2047 * result = PyString_FromStringAndSize(self.tail, n)
2048 * D_UPDATE_TAIL(self, n) # <<<<<<<<<<<<<<
2049@@ -1939,7 +1939,7 @@
2050 */
2051 D_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
2052
2053- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":177
2054+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":177
2055 * result = PyString_FromStringAndSize(self.tail, n)
2056 * D_UPDATE_TAIL(self, n)
2057 * return result # <<<<<<<<<<<<<<
2058@@ -1965,7 +1965,7 @@
2059 return __pyx_r;
2060 }
2061
2062-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":179
2063+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":179
2064 * return result
2065 *
2066 * cdef object _decode_list(self): # <<<<<<<<<<<<<<
2067@@ -1983,7 +1983,7 @@
2068 __Pyx_RefNannySetupContext("_decode_list");
2069 __pyx_v_result = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
2070
2071- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":180
2072+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":180
2073 *
2074 * cdef object _decode_list(self):
2075 * result = [] # <<<<<<<<<<<<<<
2076@@ -1996,7 +1996,7 @@
2077 __pyx_v_result = __pyx_t_1;
2078 __pyx_t_1 = 0;
2079
2080- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":182
2081+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":182
2082 * result = []
2083 *
2084 * while self.size > 0: # <<<<<<<<<<<<<<
2085@@ -2007,7 +2007,7 @@
2086 __pyx_t_2 = (__pyx_v_self->size > 0);
2087 if (!__pyx_t_2) break;
2088
2089- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":183
2090+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":183
2091 *
2092 * while self.size > 0:
2093 * if self.tail[0] == c'e': # <<<<<<<<<<<<<<
2094@@ -2017,7 +2017,7 @@
2095 __pyx_t_2 = ((__pyx_v_self->tail[0]) == 'e');
2096 if (__pyx_t_2) {
2097
2098- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":184
2099+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":184
2100 * while self.size > 0:
2101 * if self.tail[0] == c'e':
2102 * D_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
2103@@ -2026,7 +2026,7 @@
2104 */
2105 D_UPDATE_TAIL(__pyx_v_self, 1);
2106
2107- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":185
2108+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":185
2109 * if self.tail[0] == c'e':
2110 * D_UPDATE_TAIL(self, 1)
2111 * if self._yield_tuples: # <<<<<<<<<<<<<<
2112@@ -2035,7 +2035,7 @@
2113 */
2114 if (__pyx_v_self->_yield_tuples) {
2115
2116- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":186
2117+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":186
2118 * D_UPDATE_TAIL(self, 1)
2119 * if self._yield_tuples:
2120 * return tuple(result) # <<<<<<<<<<<<<<
2121@@ -2055,7 +2055,7 @@
2122 }
2123 /*else*/ {
2124
2125- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":188
2126+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":188
2127 * return tuple(result)
2128 * else:
2129 * return result # <<<<<<<<<<<<<<
2130@@ -2072,7 +2072,7 @@
2131 }
2132 /*else*/ {
2133
2134- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":193
2135+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":193
2136 * # string, since we know that won't be creating recursion
2137 * # if self.tail[0] >= c'0' and self.tail[0] <= c'9':
2138 * PyList_Append(result, self._decode_object()) # <<<<<<<<<<<<<<
2139@@ -2087,7 +2087,7 @@
2140 __pyx_L5:;
2141 }
2142
2143- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":195
2144+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":195
2145 * PyList_Append(result, self._decode_object())
2146 *
2147 * raise ValueError('malformed list') # <<<<<<<<<<<<<<
2148@@ -2120,7 +2120,7 @@
2149 return __pyx_r;
2150 }
2151
2152-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":197
2153+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":197
2154 * raise ValueError('malformed list')
2155 *
2156 * cdef object _decode_dict(self): # <<<<<<<<<<<<<<
2157@@ -2146,7 +2146,7 @@
2158 __pyx_v_key = Py_None; __Pyx_INCREF(Py_None);
2159 __pyx_v_value = Py_None; __Pyx_INCREF(Py_None);
2160
2161- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":200
2162+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":200
2163 * cdef char ch
2164 *
2165 * result = {} # <<<<<<<<<<<<<<
2166@@ -2159,7 +2159,7 @@
2167 __pyx_v_result = __pyx_t_1;
2168 __pyx_t_1 = 0;
2169
2170- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":201
2171+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":201
2172 *
2173 * result = {}
2174 * lastkey = None # <<<<<<<<<<<<<<
2175@@ -2170,7 +2170,7 @@
2176 __Pyx_DECREF(__pyx_v_lastkey);
2177 __pyx_v_lastkey = Py_None;
2178
2179- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":203
2180+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":203
2181 * lastkey = None
2182 *
2183 * while self.size > 0: # <<<<<<<<<<<<<<
2184@@ -2181,7 +2181,7 @@
2185 __pyx_t_2 = (__pyx_v_self->size > 0);
2186 if (!__pyx_t_2) break;
2187
2188- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":204
2189+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":204
2190 *
2191 * while self.size > 0:
2192 * ch = self.tail[0] # <<<<<<<<<<<<<<
2193@@ -2190,7 +2190,7 @@
2194 */
2195 __pyx_v_ch = (__pyx_v_self->tail[0]);
2196
2197- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":205
2198+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":205
2199 * while self.size > 0:
2200 * ch = self.tail[0]
2201 * if ch == c'e': # <<<<<<<<<<<<<<
2202@@ -2200,7 +2200,7 @@
2203 __pyx_t_2 = (__pyx_v_ch == 'e');
2204 if (__pyx_t_2) {
2205
2206- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":206
2207+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":206
2208 * ch = self.tail[0]
2209 * if ch == c'e':
2210 * D_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
2211@@ -2209,7 +2209,7 @@
2212 */
2213 D_UPDATE_TAIL(__pyx_v_self, 1);
2214
2215- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":207
2216+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":207
2217 * if ch == c'e':
2218 * D_UPDATE_TAIL(self, 1)
2219 * return result # <<<<<<<<<<<<<<
2220@@ -2224,7 +2224,7 @@
2221 }
2222 /*else*/ {
2223
2224- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":210
2225+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":210
2226 * else:
2227 * # keys should be strings only
2228 * if self.tail[0] < c'0' or self.tail[0] > c'9': # <<<<<<<<<<<<<<
2229@@ -2240,7 +2240,7 @@
2230 }
2231 if (__pyx_t_4) {
2232
2233- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":211
2234+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":211
2235 * # keys should be strings only
2236 * if self.tail[0] < c'0' or self.tail[0] > c'9':
2237 * raise ValueError('key was not a simple string.') # <<<<<<<<<<<<<<
2238@@ -2262,7 +2262,7 @@
2239 }
2240 __pyx_L6:;
2241
2242- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":212
2243+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":212
2244 * if self.tail[0] < c'0' or self.tail[0] > c'9':
2245 * raise ValueError('key was not a simple string.')
2246 * key = self._decode_string() # <<<<<<<<<<<<<<
2247@@ -2275,7 +2275,7 @@
2248 __pyx_v_key = __pyx_t_5;
2249 __pyx_t_5 = 0;
2250
2251- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":213
2252+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":213
2253 * raise ValueError('key was not a simple string.')
2254 * key = self._decode_string()
2255 * if lastkey >= key: # <<<<<<<<<<<<<<
2256@@ -2288,7 +2288,7 @@
2257 __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
2258 if (__pyx_t_4) {
2259
2260- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":214
2261+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":214
2262 * key = self._decode_string()
2263 * if lastkey >= key:
2264 * raise ValueError('dict keys disordered') # <<<<<<<<<<<<<<
2265@@ -2310,7 +2310,7 @@
2266 }
2267 /*else*/ {
2268
2269- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":216
2270+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":216
2271 * raise ValueError('dict keys disordered')
2272 * else:
2273 * lastkey = key # <<<<<<<<<<<<<<
2274@@ -2323,7 +2323,7 @@
2275 }
2276 __pyx_L7:;
2277
2278- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":217
2279+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":217
2280 * else:
2281 * lastkey = key
2282 * value = self._decode_object() # <<<<<<<<<<<<<<
2283@@ -2336,7 +2336,7 @@
2284 __pyx_v_value = __pyx_t_1;
2285 __pyx_t_1 = 0;
2286
2287- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":218
2288+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":218
2289 * lastkey = key
2290 * value = self._decode_object()
2291 * result[key] = value # <<<<<<<<<<<<<<
2292@@ -2348,7 +2348,7 @@
2293 __pyx_L5:;
2294 }
2295
2296- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":220
2297+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":220
2298 * result[key] = value
2299 *
2300 * raise ValueError('malformed dict') # <<<<<<<<<<<<<<
2301@@ -2384,7 +2384,7 @@
2302 return __pyx_r;
2303 }
2304
2305-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":223
2306+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":223
2307 *
2308 *
2309 * def bdecode(object s): # <<<<<<<<<<<<<<
2310@@ -2401,7 +2401,7 @@
2311 __Pyx_RefNannySetupContext("bdecode");
2312 __pyx_self = __pyx_self;
2313
2314- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":225
2315+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":225
2316 * def bdecode(object s):
2317 * """Decode string x to Python object"""
2318 * return Decoder(s).decode() # <<<<<<<<<<<<<<
2319@@ -2440,7 +2440,7 @@
2320 return __pyx_r;
2321 }
2322
2323-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":228
2324+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":228
2325 *
2326 *
2327 * def bdecode_as_tuple(object s): # <<<<<<<<<<<<<<
2328@@ -2457,7 +2457,7 @@
2329 __Pyx_RefNannySetupContext("bdecode_as_tuple");
2330 __pyx_self = __pyx_self;
2331
2332- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":230
2333+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":230
2334 * def bdecode_as_tuple(object s):
2335 * """Decode string x to Python object, using tuples rather than lists."""
2336 * return Decoder(s, True).decode() # <<<<<<<<<<<<<<
2337@@ -2501,7 +2501,7 @@
2338 return __pyx_r;
2339 }
2340
2341-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":236
2342+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":236
2343 * __slots__ = ['bencoded']
2344 *
2345 * def __init__(self, s): # <<<<<<<<<<<<<<
2346@@ -2559,7 +2559,7 @@
2347 return NULL;
2348 __pyx_L4_argument_unpacking_done:;
2349
2350- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":237
2351+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":237
2352 *
2353 * def __init__(self, s):
2354 * self.bencoded = s # <<<<<<<<<<<<<<
2355@@ -2579,7 +2579,7 @@
2356 return __pyx_r;
2357 }
2358
2359-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":248
2360+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":248
2361 * """Bencode encoder"""
2362 *
2363 * cdef readonly char *tail # <<<<<<<<<<<<<<
2364@@ -2611,7 +2611,7 @@
2365 return __pyx_r;
2366 }
2367
2368-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":249
2369+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":249
2370 *
2371 * cdef readonly char *tail
2372 * cdef readonly int size # <<<<<<<<<<<<<<
2373@@ -2643,7 +2643,7 @@
2374 return __pyx_r;
2375 }
2376
2377-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":250
2378+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":250
2379 * cdef readonly char *tail
2380 * cdef readonly int size
2381 * cdef readonly char *buffer # <<<<<<<<<<<<<<
2382@@ -2675,7 +2675,7 @@
2383 return __pyx_r;
2384 }
2385
2386-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":251
2387+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":251
2388 * cdef readonly int size
2389 * cdef readonly char *buffer
2390 * cdef readonly int maxsize # <<<<<<<<<<<<<<
2391@@ -2707,7 +2707,7 @@
2392 return __pyx_r;
2393 }
2394
2395-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":253
2396+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":253
2397 * cdef readonly int maxsize
2398 *
2399 * def __init__(self, int maxsize=INITSIZE): # <<<<<<<<<<<<<<
2400@@ -2767,7 +2767,7 @@
2401 return -1;
2402 __pyx_L4_argument_unpacking_done:;
2403
2404- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":259
2405+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":259
2406 * cdef char *p
2407 *
2408 * self.maxsize = 0 # <<<<<<<<<<<<<<
2409@@ -2776,7 +2776,7 @@
2410 */
2411 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
2412
2413- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":260
2414+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":260
2415 *
2416 * self.maxsize = 0
2417 * self.size = 0 # <<<<<<<<<<<<<<
2418@@ -2785,7 +2785,7 @@
2419 */
2420 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->size = 0;
2421
2422- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":261
2423+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":261
2424 * self.maxsize = 0
2425 * self.size = 0
2426 * self.tail = NULL # <<<<<<<<<<<<<<
2427@@ -2794,7 +2794,7 @@
2428 */
2429 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = NULL;
2430
2431- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":263
2432+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":263
2433 * self.tail = NULL
2434 *
2435 * p = <char*>malloc(maxsize) # <<<<<<<<<<<<<<
2436@@ -2803,7 +2803,7 @@
2437 */
2438 __pyx_v_p = ((char *)malloc(__pyx_v_maxsize));
2439
2440- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":264
2441+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":264
2442 *
2443 * p = <char*>malloc(maxsize)
2444 * if p == NULL: # <<<<<<<<<<<<<<
2445@@ -2813,7 +2813,7 @@
2446 __pyx_t_1 = (__pyx_v_p == NULL);
2447 if (__pyx_t_1) {
2448
2449- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":265
2450+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":265
2451 * p = <char*>malloc(maxsize)
2452 * if p == NULL:
2453 * raise MemoryError('Not enough memory to allocate buffer ' # <<<<<<<<<<<<<<
2454@@ -2835,7 +2835,7 @@
2455 }
2456 __pyx_L6:;
2457
2458- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":267
2459+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":267
2460 * raise MemoryError('Not enough memory to allocate buffer '
2461 * 'for encoder')
2462 * self.buffer = p # <<<<<<<<<<<<<<
2463@@ -2844,7 +2844,7 @@
2464 */
2465 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = __pyx_v_p;
2466
2467- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":268
2468+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":268
2469 * 'for encoder')
2470 * self.buffer = p
2471 * self.maxsize = maxsize # <<<<<<<<<<<<<<
2472@@ -2853,7 +2853,7 @@
2473 */
2474 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = __pyx_v_maxsize;
2475
2476- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":269
2477+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":269
2478 * self.buffer = p
2479 * self.maxsize = maxsize
2480 * self.tail = p # <<<<<<<<<<<<<<
2481@@ -2874,7 +2874,7 @@
2482 return __pyx_r;
2483 }
2484
2485-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":271
2486+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":271
2487 * self.tail = p
2488 *
2489 * def __dealloc__(self): # <<<<<<<<<<<<<<
2490@@ -2886,7 +2886,7 @@
2491 static void __pyx_pf_6bzrlib_12_bencode_pyx_7Encoder___dealloc__(PyObject *__pyx_v_self) {
2492 __Pyx_RefNannySetupContext("__dealloc__");
2493
2494- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":272
2495+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":272
2496 *
2497 * def __dealloc__(self):
2498 * free(self.buffer) # <<<<<<<<<<<<<<
2499@@ -2895,7 +2895,7 @@
2500 */
2501 free(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer);
2502
2503- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":273
2504+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":273
2505 * def __dealloc__(self):
2506 * free(self.buffer)
2507 * self.buffer = NULL # <<<<<<<<<<<<<<
2508@@ -2904,7 +2904,7 @@
2509 */
2510 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = NULL;
2511
2512- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":274
2513+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":274
2514 * free(self.buffer)
2515 * self.buffer = NULL
2516 * self.maxsize = 0 # <<<<<<<<<<<<<<
2517@@ -2916,7 +2916,7 @@
2518 __Pyx_RefNannyFinishContext();
2519 }
2520
2521-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":276
2522+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":276
2523 * self.maxsize = 0
2524 *
2525 * def __str__(self): # <<<<<<<<<<<<<<
2526@@ -2933,7 +2933,7 @@
2527 PyObject *__pyx_t_4 = NULL;
2528 __Pyx_RefNannySetupContext("__str__");
2529
2530- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":277
2531+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":277
2532 *
2533 * def __str__(self):
2534 * if self.buffer != NULL and self.size != 0: # <<<<<<<<<<<<<<
2535@@ -2949,7 +2949,7 @@
2536 }
2537 if (__pyx_t_3) {
2538
2539- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":278
2540+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":278
2541 * def __str__(self):
2542 * if self.buffer != NULL and self.size != 0:
2543 * return PyString_FromStringAndSize(self.buffer, self.size) # <<<<<<<<<<<<<<
2544@@ -2966,7 +2966,7 @@
2545 }
2546 /*else*/ {
2547
2548- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":280
2549+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":280
2550 * return PyString_FromStringAndSize(self.buffer, self.size)
2551 * else:
2552 * return '' # <<<<<<<<<<<<<<
2553@@ -2992,7 +2992,7 @@
2554 return __pyx_r;
2555 }
2556
2557-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":282
2558+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":282
2559 * return ''
2560 *
2561 * cdef int _ensure_buffer(self, int required) except 0: # <<<<<<<<<<<<<<
2562@@ -3009,7 +3009,7 @@
2563 PyObject *__pyx_t_3 = NULL;
2564 __Pyx_RefNannySetupContext("_ensure_buffer");
2565
2566- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":290
2567+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":290
2568 * cdef int new_size
2569 *
2570 * if self.size + required < self.maxsize: # <<<<<<<<<<<<<<
2571@@ -3019,7 +3019,7 @@
2572 __pyx_t_1 = ((__pyx_v_self->size + __pyx_v_required) < __pyx_v_self->maxsize);
2573 if (__pyx_t_1) {
2574
2575- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":291
2576+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":291
2577 *
2578 * if self.size + required < self.maxsize:
2579 * return 1 # <<<<<<<<<<<<<<
2580@@ -3032,7 +3032,7 @@
2581 }
2582 __pyx_L3:;
2583
2584- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":293
2585+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":293
2586 * return 1
2587 *
2588 * new_size = self.maxsize # <<<<<<<<<<<<<<
2589@@ -3041,7 +3041,7 @@
2590 */
2591 __pyx_v_new_size = __pyx_v_self->maxsize;
2592
2593- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":294
2594+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":294
2595 *
2596 * new_size = self.maxsize
2597 * while new_size < self.size + required: # <<<<<<<<<<<<<<
2598@@ -3052,7 +3052,7 @@
2599 __pyx_t_1 = (__pyx_v_new_size < (__pyx_v_self->size + __pyx_v_required));
2600 if (!__pyx_t_1) break;
2601
2602- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":295
2603+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":295
2604 * new_size = self.maxsize
2605 * while new_size < self.size + required:
2606 * new_size = new_size * 2 # <<<<<<<<<<<<<<
2607@@ -3062,7 +3062,7 @@
2608 __pyx_v_new_size = (__pyx_v_new_size * 2);
2609 }
2610
2611- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":296
2612+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":296
2613 * while new_size < self.size + required:
2614 * new_size = new_size * 2
2615 * new_buffer = <char*>realloc(self.buffer, <size_t>new_size) # <<<<<<<<<<<<<<
2616@@ -3071,7 +3071,7 @@
2617 */
2618 __pyx_v_new_buffer = ((char *)realloc(__pyx_v_self->buffer, ((size_t)__pyx_v_new_size)));
2619
2620- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":297
2621+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":297
2622 * new_size = new_size * 2
2623 * new_buffer = <char*>realloc(self.buffer, <size_t>new_size)
2624 * if new_buffer == NULL: # <<<<<<<<<<<<<<
2625@@ -3081,7 +3081,7 @@
2626 __pyx_t_1 = (__pyx_v_new_buffer == NULL);
2627 if (__pyx_t_1) {
2628
2629- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":298
2630+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":298
2631 * new_buffer = <char*>realloc(self.buffer, <size_t>new_size)
2632 * if new_buffer == NULL:
2633 * raise MemoryError('Cannot realloc buffer for encoder') # <<<<<<<<<<<<<<
2634@@ -3103,7 +3103,7 @@
2635 }
2636 __pyx_L6:;
2637
2638- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":300
2639+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":300
2640 * raise MemoryError('Cannot realloc buffer for encoder')
2641 *
2642 * self.buffer = new_buffer # <<<<<<<<<<<<<<
2643@@ -3112,7 +3112,7 @@
2644 */
2645 __pyx_v_self->buffer = __pyx_v_new_buffer;
2646
2647- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":301
2648+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":301
2649 *
2650 * self.buffer = new_buffer
2651 * self.maxsize = new_size # <<<<<<<<<<<<<<
2652@@ -3121,7 +3121,7 @@
2653 */
2654 __pyx_v_self->maxsize = __pyx_v_new_size;
2655
2656- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":302
2657+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":302
2658 * self.buffer = new_buffer
2659 * self.maxsize = new_size
2660 * self.tail = &new_buffer[self.size] # <<<<<<<<<<<<<<
2661@@ -3130,7 +3130,7 @@
2662 */
2663 __pyx_v_self->tail = (&(__pyx_v_new_buffer[__pyx_v_self->size]));
2664
2665- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":303
2666+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":303
2667 * self.maxsize = new_size
2668 * self.tail = &new_buffer[self.size]
2669 * return 1 # <<<<<<<<<<<<<<
2670@@ -3152,7 +3152,7 @@
2671 return __pyx_r;
2672 }
2673
2674-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":305
2675+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":305
2676 * return 1
2677 *
2678 * cdef int _encode_int(self, int x) except 0: # <<<<<<<<<<<<<<
2679@@ -3169,7 +3169,7 @@
2680 PyObject *__pyx_t_4 = NULL;
2681 __Pyx_RefNannySetupContext("_encode_int");
2682
2683- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":310
2684+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":310
2685 * """
2686 * cdef int n
2687 * self._ensure_buffer(INT_BUF_SIZE) # <<<<<<<<<<<<<<
2688@@ -3178,7 +3178,7 @@
2689 */
2690 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2691
2692- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":311
2693+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":311
2694 * cdef int n
2695 * self._ensure_buffer(INT_BUF_SIZE)
2696 * n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x) # <<<<<<<<<<<<<<
2697@@ -3187,7 +3187,7 @@
2698 */
2699 __pyx_v_n = snprintf(__pyx_v_self->tail, __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE, __pyx_k_18, __pyx_v_x);
2700
2701- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":312
2702+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":312
2703 * self._ensure_buffer(INT_BUF_SIZE)
2704 * n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x)
2705 * if n < 0: # <<<<<<<<<<<<<<
2706@@ -3197,7 +3197,7 @@
2707 __pyx_t_2 = (__pyx_v_n < 0);
2708 if (__pyx_t_2) {
2709
2710- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":313
2711+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":313
2712 * n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x)
2713 * if n < 0:
2714 * raise MemoryError('int %d too big to encode' % x) # <<<<<<<<<<<<<<
2715@@ -3224,7 +3224,7 @@
2716 }
2717 __pyx_L3:;
2718
2719- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":314
2720+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":314
2721 * if n < 0:
2722 * raise MemoryError('int %d too big to encode' % x)
2723 * E_UPDATE_TAIL(self, n) # <<<<<<<<<<<<<<
2724@@ -3233,7 +3233,7 @@
2725 */
2726 E_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
2727
2728- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":315
2729+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":315
2730 * raise MemoryError('int %d too big to encode' % x)
2731 * E_UPDATE_TAIL(self, n)
2732 * return 1 # <<<<<<<<<<<<<<
2733@@ -3255,7 +3255,7 @@
2734 return __pyx_r;
2735 }
2736
2737-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":317
2738+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":317
2739 * return 1
2740 *
2741 * cdef int _encode_long(self, x) except 0: # <<<<<<<<<<<<<<
2742@@ -3271,7 +3271,7 @@
2743 int __pyx_t_4;
2744 __Pyx_RefNannySetupContext("_encode_long");
2745
2746- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":318
2747+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":318
2748 *
2749 * cdef int _encode_long(self, x) except 0:
2750 * return self._append_string(''.join(('i', str(x), 'e'))) # <<<<<<<<<<<<<<
2751@@ -3326,7 +3326,7 @@
2752 return __pyx_r;
2753 }
2754
2755-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":320
2756+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":320
2757 * return self._append_string(''.join(('i', str(x), 'e')))
2758 *
2759 * cdef int _append_string(self, s) except 0: # <<<<<<<<<<<<<<
2760@@ -3342,7 +3342,7 @@
2761 char *__pyx_t_3;
2762 __Pyx_RefNannySetupContext("_append_string");
2763
2764- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":322
2765+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":322
2766 * cdef int _append_string(self, s) except 0:
2767 * cdef Py_ssize_t n
2768 * n = PyString_GET_SIZE(s) # <<<<<<<<<<<<<<
2769@@ -3352,7 +3352,7 @@
2770 __pyx_t_1 = PyString_GET_SIZE(__pyx_v_s); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2771 __pyx_v_n = __pyx_t_1;
2772
2773- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":323
2774+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":323
2775 * cdef Py_ssize_t n
2776 * n = PyString_GET_SIZE(s)
2777 * self._ensure_buffer(n) # <<<<<<<<<<<<<<
2778@@ -3361,7 +3361,7 @@
2779 */
2780 __pyx_t_2 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, __pyx_v_n); if (unlikely(__pyx_t_2 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2781
2782- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":324
2783+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":324
2784 * n = PyString_GET_SIZE(s)
2785 * self._ensure_buffer(n)
2786 * memcpy(self.tail, PyString_AS_STRING(s), n) # <<<<<<<<<<<<<<
2787@@ -3371,7 +3371,7 @@
2788 __pyx_t_3 = PyString_AS_STRING(__pyx_v_s); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2789 memcpy(__pyx_v_self->tail, __pyx_t_3, __pyx_v_n);
2790
2791- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":325
2792+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":325
2793 * self._ensure_buffer(n)
2794 * memcpy(self.tail, PyString_AS_STRING(s), n)
2795 * E_UPDATE_TAIL(self, n) # <<<<<<<<<<<<<<
2796@@ -3380,7 +3380,7 @@
2797 */
2798 E_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
2799
2800- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":326
2801+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":326
2802 * memcpy(self.tail, PyString_AS_STRING(s), n)
2803 * E_UPDATE_TAIL(self, n)
2804 * return 1 # <<<<<<<<<<<<<<
2805@@ -3400,7 +3400,7 @@
2806 return __pyx_r;
2807 }
2808
2809-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":328
2810+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":328
2811 * return 1
2812 *
2813 * cdef int _encode_string(self, x) except 0: # <<<<<<<<<<<<<<
2814@@ -3420,7 +3420,7 @@
2815 char *__pyx_t_6;
2816 __Pyx_RefNannySetupContext("_encode_string");
2817
2818- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":331
2819+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":331
2820 * cdef int n
2821 * cdef Py_ssize_t x_len
2822 * x_len = PyString_GET_SIZE(x) # <<<<<<<<<<<<<<
2823@@ -3430,7 +3430,7 @@
2824 __pyx_t_1 = PyString_GET_SIZE(__pyx_v_x); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2825 __pyx_v_x_len = __pyx_t_1;
2826
2827- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":332
2828+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":332
2829 * cdef Py_ssize_t x_len
2830 * x_len = PyString_GET_SIZE(x)
2831 * self._ensure_buffer(x_len + INT_BUF_SIZE) # <<<<<<<<<<<<<<
2832@@ -3439,7 +3439,7 @@
2833 */
2834 __pyx_t_2 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, (__pyx_v_x_len + __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE)); if (unlikely(__pyx_t_2 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2835
2836- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":333
2837+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":333
2838 * x_len = PyString_GET_SIZE(x)
2839 * self._ensure_buffer(x_len + INT_BUF_SIZE)
2840 * n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len) # <<<<<<<<<<<<<<
2841@@ -3448,7 +3448,7 @@
2842 */
2843 __pyx_v_n = snprintf(__pyx_v_self->tail, __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE, __pyx_k_20, __pyx_v_x_len);
2844
2845- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":334
2846+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":334
2847 * self._ensure_buffer(x_len + INT_BUF_SIZE)
2848 * n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len)
2849 * if n < 0: # <<<<<<<<<<<<<<
2850@@ -3458,7 +3458,7 @@
2851 __pyx_t_3 = (__pyx_v_n < 0);
2852 if (__pyx_t_3) {
2853
2854- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":335
2855+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":335
2856 * n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len)
2857 * if n < 0:
2858 * raise MemoryError('string %s too big to encode' % x) # <<<<<<<<<<<<<<
2859@@ -3482,7 +3482,7 @@
2860 }
2861 __pyx_L3:;
2862
2863- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":336
2864+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":336
2865 * if n < 0:
2866 * raise MemoryError('string %s too big to encode' % x)
2867 * memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len) # <<<<<<<<<<<<<<
2868@@ -3492,7 +3492,7 @@
2869 __pyx_t_6 = PyString_AS_STRING(__pyx_v_x); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2870 memcpy(((void *)(__pyx_v_self->tail + __pyx_v_n)), __pyx_t_6, __pyx_v_x_len);
2871
2872- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":337
2873+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":337
2874 * raise MemoryError('string %s too big to encode' % x)
2875 * memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len)
2876 * E_UPDATE_TAIL(self, n + x_len) # <<<<<<<<<<<<<<
2877@@ -3501,7 +3501,7 @@
2878 */
2879 E_UPDATE_TAIL(__pyx_v_self, (__pyx_v_n + __pyx_v_x_len));
2880
2881- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":338
2882+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":338
2883 * memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len)
2884 * E_UPDATE_TAIL(self, n + x_len)
2885 * return 1 # <<<<<<<<<<<<<<
2886@@ -3523,7 +3523,7 @@
2887 return __pyx_r;
2888 }
2889
2890-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":340
2891+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":340
2892 * return 1
2893 *
2894 * cdef int _encode_list(self, x) except 0: # <<<<<<<<<<<<<<
2895@@ -3543,7 +3543,7 @@
2896 __Pyx_RefNannySetupContext("_encode_list");
2897 __pyx_v_i = Py_None; __Pyx_INCREF(Py_None);
2898
2899- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":341
2900+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":341
2901 *
2902 * cdef int _encode_list(self, x) except 0:
2903 * self._ensure_buffer(1) # <<<<<<<<<<<<<<
2904@@ -3552,7 +3552,7 @@
2905 */
2906 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, 1); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2907
2908- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":342
2909+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":342
2910 * cdef int _encode_list(self, x) except 0:
2911 * self._ensure_buffer(1)
2912 * self.tail[0] = c'l' # <<<<<<<<<<<<<<
2913@@ -3561,7 +3561,7 @@
2914 */
2915 (__pyx_v_self->tail[0]) = 'l';
2916
2917- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":343
2918+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":343
2919 * self._ensure_buffer(1)
2920 * self.tail[0] = c'l'
2921 * E_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
2922@@ -3570,7 +3570,7 @@
2923 */
2924 E_UPDATE_TAIL(__pyx_v_self, 1);
2925
2926- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":345
2927+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":345
2928 * E_UPDATE_TAIL(self, 1)
2929 *
2930 * for i in x: # <<<<<<<<<<<<<<
2931@@ -3602,7 +3602,7 @@
2932 __pyx_v_i = __pyx_t_4;
2933 __pyx_t_4 = 0;
2934
2935- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":346
2936+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":346
2937 *
2938 * for i in x:
2939 * self.process(i) # <<<<<<<<<<<<<<
2940@@ -3624,7 +3624,7 @@
2941 }
2942 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
2943
2944- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":348
2945+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":348
2946 * self.process(i)
2947 *
2948 * self._ensure_buffer(1) # <<<<<<<<<<<<<<
2949@@ -3633,7 +3633,7 @@
2950 */
2951 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, 1); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 348; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2952
2953- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":349
2954+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":349
2955 *
2956 * self._ensure_buffer(1)
2957 * self.tail[0] = c'e' # <<<<<<<<<<<<<<
2958@@ -3642,7 +3642,7 @@
2959 */
2960 (__pyx_v_self->tail[0]) = 'e';
2961
2962- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":350
2963+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":350
2964 * self._ensure_buffer(1)
2965 * self.tail[0] = c'e'
2966 * E_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
2967@@ -3651,7 +3651,7 @@
2968 */
2969 E_UPDATE_TAIL(__pyx_v_self, 1);
2970
2971- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":351
2972+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":351
2973 * self.tail[0] = c'e'
2974 * E_UPDATE_TAIL(self, 1)
2975 * return 1 # <<<<<<<<<<<<<<
2976@@ -3676,7 +3676,7 @@
2977 return __pyx_r;
2978 }
2979
2980-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":353
2981+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":353
2982 * return 1
2983 *
2984 * cdef int _encode_dict(self, x) except 0: # <<<<<<<<<<<<<<
2985@@ -3699,7 +3699,7 @@
2986 __pyx_v_keys = Py_None; __Pyx_INCREF(Py_None);
2987 __pyx_v_k = Py_None; __Pyx_INCREF(Py_None);
2988
2989- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":354
2990+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":354
2991 *
2992 * cdef int _encode_dict(self, x) except 0:
2993 * self._ensure_buffer(1) # <<<<<<<<<<<<<<
2994@@ -3708,7 +3708,7 @@
2995 */
2996 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, 1); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
2997
2998- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":355
2999+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":355
3000 * cdef int _encode_dict(self, x) except 0:
3001 * self._ensure_buffer(1)
3002 * self.tail[0] = c'd' # <<<<<<<<<<<<<<
3003@@ -3717,7 +3717,7 @@
3004 */
3005 (__pyx_v_self->tail[0]) = 'd';
3006
3007- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":356
3008+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":356
3009 * self._ensure_buffer(1)
3010 * self.tail[0] = c'd'
3011 * E_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
3012@@ -3726,7 +3726,7 @@
3013 */
3014 E_UPDATE_TAIL(__pyx_v_self, 1);
3015
3016- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":358
3017+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":358
3018 * E_UPDATE_TAIL(self, 1)
3019 *
3020 * keys = x.keys() # <<<<<<<<<<<<<<
3021@@ -3742,7 +3742,7 @@
3022 __pyx_v_keys = __pyx_t_3;
3023 __pyx_t_3 = 0;
3024
3025- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":359
3026+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":359
3027 *
3028 * keys = x.keys()
3029 * keys.sort() # <<<<<<<<<<<<<<
3030@@ -3756,7 +3756,7 @@
3031 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
3032 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
3033
3034- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":360
3035+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":360
3036 * keys = x.keys()
3037 * keys.sort()
3038 * for k in keys: # <<<<<<<<<<<<<<
3039@@ -3788,7 +3788,7 @@
3040 __pyx_v_k = __pyx_t_3;
3041 __pyx_t_3 = 0;
3042
3043- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":361
3044+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":361
3045 * keys.sort()
3046 * for k in keys:
3047 * if not PyString_CheckExact(k): # <<<<<<<<<<<<<<
3048@@ -3798,7 +3798,7 @@
3049 __pyx_t_5 = (!PyString_CheckExact(__pyx_v_k));
3050 if (__pyx_t_5) {
3051
3052- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":362
3053+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":362
3054 * for k in keys:
3055 * if not PyString_CheckExact(k):
3056 * raise TypeError('key in dict should be string') # <<<<<<<<<<<<<<
3057@@ -3820,7 +3820,7 @@
3058 }
3059 __pyx_L5:;
3060
3061- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":363
3062+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":363
3063 * if not PyString_CheckExact(k):
3064 * raise TypeError('key in dict should be string')
3065 * self._encode_string(k) # <<<<<<<<<<<<<<
3066@@ -3829,7 +3829,7 @@
3067 */
3068 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_encode_string(__pyx_v_self, __pyx_v_k); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 363; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3069
3070- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":364
3071+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":364
3072 * raise TypeError('key in dict should be string')
3073 * self._encode_string(k)
3074 * self.process(x[k]) # <<<<<<<<<<<<<<
3075@@ -3853,7 +3853,7 @@
3076 }
3077 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
3078
3079- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":366
3080+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":366
3081 * self.process(x[k])
3082 *
3083 * self._ensure_buffer(1) # <<<<<<<<<<<<<<
3084@@ -3862,7 +3862,7 @@
3085 */
3086 __pyx_t_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self, 1); if (unlikely(__pyx_t_1 == 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 366; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3087
3088- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":367
3089+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":367
3090 *
3091 * self._ensure_buffer(1)
3092 * self.tail[0] = c'e' # <<<<<<<<<<<<<<
3093@@ -3871,7 +3871,7 @@
3094 */
3095 (__pyx_v_self->tail[0]) = 'e';
3096
3097- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":368
3098+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":368
3099 * self._ensure_buffer(1)
3100 * self.tail[0] = c'e'
3101 * E_UPDATE_TAIL(self, 1) # <<<<<<<<<<<<<<
3102@@ -3880,7 +3880,7 @@
3103 */
3104 E_UPDATE_TAIL(__pyx_v_self, 1);
3105
3106- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":369
3107+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":369
3108 * self.tail[0] = c'e'
3109 * E_UPDATE_TAIL(self, 1)
3110 * return 1 # <<<<<<<<<<<<<<
3111@@ -3906,7 +3906,7 @@
3112 return __pyx_r;
3113 }
3114
3115-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":371
3116+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":371
3117 * return 1
3118 *
3119 * def process(self, object x): # <<<<<<<<<<<<<<
3120@@ -3926,7 +3926,7 @@
3121 int __pyx_t_7;
3122 __Pyx_RefNannySetupContext("process");
3123
3124- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":372
3125+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":372
3126 *
3127 * def process(self, object x):
3128 * if Py_EnterRecursiveCall("encode"): # <<<<<<<<<<<<<<
3129@@ -3936,7 +3936,7 @@
3130 __pyx_t_1 = Py_EnterRecursiveCall(__pyx_k__encode);
3131 if (__pyx_t_1) {
3132
3133- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":373
3134+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":373
3135 * def process(self, object x):
3136 * if Py_EnterRecursiveCall("encode"):
3137 * raise RuntimeError("too deeply nested") # <<<<<<<<<<<<<<
3138@@ -3958,7 +3958,7 @@
3139 }
3140 __pyx_L5:;
3141
3142- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":374
3143+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":374
3144 * if Py_EnterRecursiveCall("encode"):
3145 * raise RuntimeError("too deeply nested")
3146 * try: # <<<<<<<<<<<<<<
3147@@ -3967,7 +3967,7 @@
3148 */
3149 /*try:*/ {
3150
3151- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":375
3152+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":375
3153 * raise RuntimeError("too deeply nested")
3154 * try:
3155 * if PyString_CheckExact(x): # <<<<<<<<<<<<<<
3156@@ -3977,7 +3977,7 @@
3157 __pyx_t_1 = PyString_CheckExact(__pyx_v_x);
3158 if (__pyx_t_1) {
3159
3160- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":376
3161+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":376
3162 * try:
3163 * if PyString_CheckExact(x):
3164 * self._encode_string(x) # <<<<<<<<<<<<<<
3165@@ -3988,7 +3988,7 @@
3166 goto __pyx_L9;
3167 }
3168
3169- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":377
3170+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":377
3171 * if PyString_CheckExact(x):
3172 * self._encode_string(x)
3173 * elif PyInt_CheckExact(x): # <<<<<<<<<<<<<<
3174@@ -3998,7 +3998,7 @@
3175 __pyx_t_1 = PyInt_CheckExact(__pyx_v_x);
3176 if (__pyx_t_1) {
3177
3178- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":378
3179+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":378
3180 * self._encode_string(x)
3181 * elif PyInt_CheckExact(x):
3182 * self._encode_int(x) # <<<<<<<<<<<<<<
3183@@ -4010,7 +4010,7 @@
3184 goto __pyx_L9;
3185 }
3186
3187- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":379
3188+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":379
3189 * elif PyInt_CheckExact(x):
3190 * self._encode_int(x)
3191 * elif PyLong_CheckExact(x): # <<<<<<<<<<<<<<
3192@@ -4020,7 +4020,7 @@
3193 __pyx_t_4 = PyLong_CheckExact(__pyx_v_x);
3194 if (__pyx_t_4) {
3195
3196- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":380
3197+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":380
3198 * self._encode_int(x)
3199 * elif PyLong_CheckExact(x):
3200 * self._encode_long(x) # <<<<<<<<<<<<<<
3201@@ -4031,7 +4031,7 @@
3202 goto __pyx_L9;
3203 }
3204
3205- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":381
3206+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":381
3207 * elif PyLong_CheckExact(x):
3208 * self._encode_long(x)
3209 * elif (PyList_CheckExact(x) or PyTuple_CheckExact(x) # <<<<<<<<<<<<<<
3210@@ -4041,7 +4041,7 @@
3211 __pyx_t_4 = PyList_CheckExact(__pyx_v_x);
3212 if (!__pyx_t_4) {
3213
3214- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":382
3215+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":382
3216 * self._encode_long(x)
3217 * elif (PyList_CheckExact(x) or PyTuple_CheckExact(x)
3218 * or StaticTuple_CheckExact(x)): # <<<<<<<<<<<<<<
3219@@ -4061,7 +4061,7 @@
3220 }
3221 if (__pyx_t_7) {
3222
3223- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":383
3224+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":383
3225 * elif (PyList_CheckExact(x) or PyTuple_CheckExact(x)
3226 * or StaticTuple_CheckExact(x)):
3227 * self._encode_list(x) # <<<<<<<<<<<<<<
3228@@ -4072,7 +4072,7 @@
3229 goto __pyx_L9;
3230 }
3231
3232- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":384
3233+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":384
3234 * or StaticTuple_CheckExact(x)):
3235 * self._encode_list(x)
3236 * elif PyDict_CheckExact(x): # <<<<<<<<<<<<<<
3237@@ -4082,7 +4082,7 @@
3238 __pyx_t_4 = PyDict_CheckExact(__pyx_v_x);
3239 if (__pyx_t_4) {
3240
3241- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":385
3242+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":385
3243 * self._encode_list(x)
3244 * elif PyDict_CheckExact(x):
3245 * self._encode_dict(x) # <<<<<<<<<<<<<<
3246@@ -4093,7 +4093,7 @@
3247 goto __pyx_L9;
3248 }
3249
3250- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":386
3251+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":386
3252 * elif PyDict_CheckExact(x):
3253 * self._encode_dict(x)
3254 * elif PyBool_Check(x): # <<<<<<<<<<<<<<
3255@@ -4103,7 +4103,7 @@
3256 __pyx_t_4 = PyBool_Check(__pyx_v_x);
3257 if (__pyx_t_4) {
3258
3259- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":387
3260+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":387
3261 * self._encode_dict(x)
3262 * elif PyBool_Check(x):
3263 * self._encode_int(int(x)) # <<<<<<<<<<<<<<
3264@@ -4124,7 +4124,7 @@
3265 goto __pyx_L9;
3266 }
3267
3268- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":388
3269+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":388
3270 * elif PyBool_Check(x):
3271 * self._encode_int(int(x))
3272 * elif isinstance(x, Bencached): # <<<<<<<<<<<<<<
3273@@ -4137,7 +4137,7 @@
3274 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
3275 if (__pyx_t_7) {
3276
3277- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":389
3278+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":389
3279 * self._encode_int(int(x))
3280 * elif isinstance(x, Bencached):
3281 * self._append_string(x.bencoded) # <<<<<<<<<<<<<<
3282@@ -4152,7 +4152,7 @@
3283 }
3284 /*else*/ {
3285
3286- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":391
3287+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":391
3288 * self._append_string(x.bencoded)
3289 * else:
3290 * raise TypeError('unsupported type %r' % x) # <<<<<<<<<<<<<<
3291@@ -4176,7 +4176,7 @@
3292 __pyx_L9:;
3293 }
3294
3295- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":393
3296+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":393
3297 * raise TypeError('unsupported type %r' % x)
3298 * finally:
3299 * Py_LeaveRecursiveCall() # <<<<<<<<<<<<<<
3300@@ -4224,7 +4224,7 @@
3301 return __pyx_r;
3302 }
3303
3304-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":396
3305+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":396
3306 *
3307 *
3308 * def bencode(x): # <<<<<<<<<<<<<<
3309@@ -4244,7 +4244,7 @@
3310 __pyx_self = __pyx_self;
3311 __pyx_v_encoder = ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)Py_None); __Pyx_INCREF(Py_None);
3312
3313- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":398
3314+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":398
3315 * def bencode(x):
3316 * """Encode Python object x to string"""
3317 * encoder = Encoder() # <<<<<<<<<<<<<<
3318@@ -4257,7 +4257,7 @@
3319 __pyx_v_encoder = ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_t_1);
3320 __pyx_t_1 = 0;
3321
3322- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":399
3323+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":399
3324 * """Encode Python object x to string"""
3325 * encoder = Encoder()
3326 * encoder.process(x) # <<<<<<<<<<<<<<
3327@@ -4276,7 +4276,7 @@
3328 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
3329 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
3330
3331- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":400
3332+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":400
3333 * encoder = Encoder()
3334 * encoder.process(x)
3335 * return str(encoder) # <<<<<<<<<<<<<<
3336@@ -4964,7 +4964,7 @@
3337 /*--- Function import code ---*/
3338 /*--- Execution code ---*/
3339
3340- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":66
3341+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":66
3342 * import_static_tuple_c
3343 *
3344 * import_static_tuple_c() # <<<<<<<<<<<<<<
3345@@ -4973,7 +4973,7 @@
3346 */
3347 __pyx_t_1 = import_static_tuple_c(); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3348
3349- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":233
3350+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":233
3351 *
3352 *
3353 * class Bencached(object): # <<<<<<<<<<<<<<
3354@@ -4991,7 +4991,7 @@
3355 __Pyx_GOTREF(__pyx_t_4);
3356 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
3357
3358- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":234
3359+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":234
3360 *
3361 * class Bencached(object):
3362 * __slots__ = ['bencoded'] # <<<<<<<<<<<<<<
3363@@ -5006,7 +5006,7 @@
3364 if (PyObject_SetAttr(__pyx_t_4, __pyx_n_s____slots__, ((PyObject *)__pyx_t_3)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3365 __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
3366
3367- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":236
3368+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":236
3369 * __slots__ = ['bencoded']
3370 *
3371 * def __init__(self, s): # <<<<<<<<<<<<<<
3372@@ -5024,7 +5024,7 @@
3373 __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
3374 __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
3375
3376- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":253
3377+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":253
3378 * cdef readonly int maxsize
3379 *
3380 * def __init__(self, int maxsize=INITSIZE): # <<<<<<<<<<<<<<
3381@@ -5033,7 +5033,7 @@
3382 */
3383 __pyx_k_15 = __pyx_e_6bzrlib_12_bencode_pyx_INITSIZE;
3384
3385- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":1
3386+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":1
3387 * # Copyright (C) 2007, 2009, 2010 Canonical Ltd # <<<<<<<<<<<<<<
3388 * #
3389 * # This program is free software; you can redistribute it and/or modify
3390
3391=== modified file 'bzrlib/_btree_serializer_pyx.c'
3392--- bzrlib/_btree_serializer_pyx.c 2011-08-31 15:04:43 +0000
3393+++ bzrlib/_btree_serializer_pyx.c 2011-11-03 14:37:19 +0000
3394@@ -1,4 +1,4 @@
3395-/* Generated by Cython 0.13 on Thu Aug 11 09:45:32 2011 */
3396+/* Generated by Cython 0.13 on Mon Sep 19 20:18:57 2011 */
3397
3398 #define PY_SSIZE_T_CLEAN
3399 #include "Python.h"
3400@@ -279,7 +279,7 @@
3401
3402 /* Type declarations */
3403
3404-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":337
3405+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":337
3406 * # One slightly ugly option would be to cache block offsets in a global.
3407 * # However, that leads to thread-safety issues, etc.
3408 * ctypedef struct gc_chk_sha1_record: # <<<<<<<<<<<<<<
3409@@ -295,7 +295,7 @@
3410 char sha1[20];
3411 } __pyx_t_6bzrlib_21_btree_serializer_pyx_gc_chk_sha1_record;
3412
3413-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":123
3414+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":123
3415 *
3416 *
3417 * cdef class BTreeLeafParser: # <<<<<<<<<<<<<<
3418@@ -316,7 +316,7 @@
3419 int _header_found;
3420 };
3421
3422-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":518
3423+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":518
3424 *
3425 *
3426 * cdef class GCCHKSHA1LeafNode: # <<<<<<<<<<<<<<
3427@@ -349,7 +349,7 @@
3428 static struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_GCCHKSHA1LeafNode *__pyx_vtabptr_6bzrlib_21_btree_serializer_pyx_GCCHKSHA1LeafNode;
3429
3430
3431-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":123
3432+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":123
3433 *
3434 *
3435 * cdef class BTreeLeafParser: # <<<<<<<<<<<<<<
3436@@ -749,7 +749,7 @@
3437 static PyObject *__pyx_int_0;
3438 static PyObject *__pyx_int_1;
3439
3440-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":81
3441+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":81
3442 *
3443 * # TODO: Find some way to import this from _dirstate_helpers
3444 * cdef void* _my_memrchr(void *s, int c, size_t n): # cannot_raise # <<<<<<<<<<<<<<
3445@@ -764,7 +764,7 @@
3446 int __pyx_t_1;
3447 __Pyx_RefNannySetupContext("_my_memrchr");
3448
3449- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":87
3450+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":87
3451 * cdef char *start
3452 *
3453 * start = <char*>s # <<<<<<<<<<<<<<
3454@@ -773,7 +773,7 @@
3455 */
3456 __pyx_v_start = ((char *)__pyx_v_s);
3457
3458- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":88
3459+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":88
3460 *
3461 * start = <char*>s
3462 * pos = start + n - 1 # <<<<<<<<<<<<<<
3463@@ -782,7 +782,7 @@
3464 */
3465 __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
3466
3467- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":89
3468+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":89
3469 * start = <char*>s
3470 * pos = start + n - 1
3471 * while pos >= start: # <<<<<<<<<<<<<<
3472@@ -793,7 +793,7 @@
3473 __pyx_t_1 = (__pyx_v_pos >= __pyx_v_start);
3474 if (!__pyx_t_1) break;
3475
3476- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":90
3477+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":90
3478 * pos = start + n - 1
3479 * while pos >= start:
3480 * if pos[0] == c: # <<<<<<<<<<<<<<
3481@@ -803,7 +803,7 @@
3482 __pyx_t_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
3483 if (__pyx_t_1) {
3484
3485- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":91
3486+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":91
3487 * while pos >= start:
3488 * if pos[0] == c:
3489 * return <void*>pos # <<<<<<<<<<<<<<
3490@@ -816,7 +816,7 @@
3491 }
3492 __pyx_L5:;
3493
3494- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":92
3495+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":92
3496 * if pos[0] == c:
3497 * return <void*>pos
3498 * pos = pos - 1 # <<<<<<<<<<<<<<
3499@@ -826,7 +826,7 @@
3500 __pyx_v_pos = (__pyx_v_pos - 1);
3501 }
3502
3503- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":93
3504+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":93
3505 * return <void*>pos
3506 * pos = pos - 1
3507 * return NULL # <<<<<<<<<<<<<<
3508@@ -842,7 +842,7 @@
3509 return __pyx_r;
3510 }
3511
3512-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":97
3513+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":97
3514 *
3515 * # TODO: Import this from _dirstate_helpers when it is merged
3516 * cdef object safe_string_from_size(char *s, Py_ssize_t size): # <<<<<<<<<<<<<<
3517@@ -858,7 +858,7 @@
3518 PyObject *__pyx_t_4 = NULL;
3519 __Pyx_RefNannySetupContext("safe_string_from_size");
3520
3521- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":98
3522+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":98
3523 * # TODO: Import this from _dirstate_helpers when it is merged
3524 * cdef object safe_string_from_size(char *s, Py_ssize_t size):
3525 * if size < 0: # <<<<<<<<<<<<<<
3526@@ -868,7 +868,7 @@
3527 __pyx_t_1 = (__pyx_v_size < 0);
3528 if (__pyx_t_1) {
3529
3530- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":101
3531+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":101
3532 * raise AssertionError(
3533 * 'tried to create a string with an invalid size: %d @0x%x'
3534 * % (size, <int>s)) # <<<<<<<<<<<<<<
3535@@ -905,7 +905,7 @@
3536 }
3537 __pyx_L3:;
3538
3539- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":102
3540+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":102
3541 * 'tried to create a string with an invalid size: %d @0x%x'
3542 * % (size, <int>s))
3543 * return PyString_FromStringAndSize(s, size) # <<<<<<<<<<<<<<
3544@@ -933,7 +933,7 @@
3545 return __pyx_r;
3546 }
3547
3548-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":105
3549+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":105
3550 *
3551 *
3552 * cdef object safe_interned_string_from_size(char *s, Py_ssize_t size): # <<<<<<<<<<<<<<
3553@@ -952,7 +952,7 @@
3554 __Pyx_RefNannySetupContext("safe_interned_string_from_size");
3555 __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
3556
3557- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":107
3558+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":107
3559 * cdef object safe_interned_string_from_size(char *s, Py_ssize_t size):
3560 * cdef PyObject *py_str
3561 * if size < 0: # <<<<<<<<<<<<<<
3562@@ -962,7 +962,7 @@
3563 __pyx_t_1 = (__pyx_v_size < 0);
3564 if (__pyx_t_1) {
3565
3566- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":110
3567+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":110
3568 * raise AssertionError(
3569 * 'tried to create a string with an invalid size: %d @0x%x'
3570 * % (size, <int>s)) # <<<<<<<<<<<<<<
3571@@ -999,7 +999,7 @@
3572 }
3573 __pyx_L3:;
3574
3575- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":111
3576+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":111
3577 * 'tried to create a string with an invalid size: %d @0x%x'
3578 * % (size, <int>s))
3579 * py_str = PyString_FromStringAndSize_ptr(s, size) # <<<<<<<<<<<<<<
3580@@ -1008,7 +1008,7 @@
3581 */
3582 __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s, __pyx_v_size);
3583
3584- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":112
3585+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":112
3586 * % (size, <int>s))
3587 * py_str = PyString_FromStringAndSize_ptr(s, size)
3588 * PyString_InternInPlace(&py_str) # <<<<<<<<<<<<<<
3589@@ -1017,7 +1017,7 @@
3590 */
3591 PyString_InternInPlace((&__pyx_v_py_str));
3592
3593- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":113
3594+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":113
3595 * py_str = PyString_FromStringAndSize_ptr(s, size)
3596 * PyString_InternInPlace(&py_str)
3597 * result = <object>py_str # <<<<<<<<<<<<<<
3598@@ -1028,7 +1028,7 @@
3599 __Pyx_DECREF(__pyx_v_result);
3600 __pyx_v_result = ((PyObject *)__pyx_v_py_str);
3601
3602- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":116
3603+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":116
3604 * # Casting a PyObject* to an <object> triggers an INCREF from Pyrex, so we
3605 * # DECREF it to avoid geting immortal strings
3606 * Py_DECREF_ptr(py_str) # <<<<<<<<<<<<<<
3607@@ -1037,7 +1037,7 @@
3608 */
3609 Py_DECREF(__pyx_v_py_str);
3610
3611- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":117
3612+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":117
3613 * # DECREF it to avoid geting immortal strings
3614 * Py_DECREF_ptr(py_str)
3615 * return result # <<<<<<<<<<<<<<
3616@@ -1064,7 +1064,7 @@
3617 return __pyx_r;
3618 }
3619
3620-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":153
3621+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":153
3622 * cdef int _header_found
3623 *
3624 * def __init__(self, bytes, key_length, ref_list_length): # <<<<<<<<<<<<<<
3625@@ -1132,7 +1132,7 @@
3626 return -1;
3627 __pyx_L4_argument_unpacking_done:;
3628
3629- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":154
3630+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":154
3631 *
3632 * def __init__(self, bytes, key_length, ref_list_length):
3633 * self.bytes = bytes # <<<<<<<<<<<<<<
3634@@ -1145,7 +1145,7 @@
3635 __Pyx_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
3636 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes = __pyx_v_bytes;
3637
3638- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":155
3639+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":155
3640 * def __init__(self, bytes, key_length, ref_list_length):
3641 * self.bytes = bytes
3642 * self.key_length = key_length # <<<<<<<<<<<<<<
3643@@ -1155,7 +1155,7 @@
3644 __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_v_key_length); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3645 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->key_length = __pyx_t_1;
3646
3647- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":156
3648+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":156
3649 * self.bytes = bytes
3650 * self.key_length = key_length
3651 * self.ref_list_length = ref_list_length # <<<<<<<<<<<<<<
3652@@ -1165,7 +1165,7 @@
3653 __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_v_ref_list_length); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
3654 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->ref_list_length = __pyx_t_1;
3655
3656- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":157
3657+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":157
3658 * self.key_length = key_length
3659 * self.ref_list_length = ref_list_length
3660 * self.keys = [] # <<<<<<<<<<<<<<
3661@@ -1180,7 +1180,7 @@
3662 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys = ((PyObject *)__pyx_t_2);
3663 __pyx_t_2 = 0;
3664
3665- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":158
3666+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":158
3667 * self.ref_list_length = ref_list_length
3668 * self.keys = []
3669 * self._cur_str = NULL # <<<<<<<<<<<<<<
3670@@ -1189,7 +1189,7 @@
3671 */
3672 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = NULL;
3673
3674- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":159
3675+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":159
3676 * self.keys = []
3677 * self._cur_str = NULL
3678 * self._end_str = NULL # <<<<<<<<<<<<<<
3679@@ -1198,7 +1198,7 @@
3680 */
3681 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = NULL;
3682
3683- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":160
3684+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":160
3685 * self._cur_str = NULL
3686 * self._end_str = NULL
3687 * self._header_found = 0 # <<<<<<<<<<<<<<
3688@@ -1218,7 +1218,7 @@
3689 return __pyx_r;
3690 }
3691
3692-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":163
3693+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":163
3694 * # keys are tuples
3695 *
3696 * cdef extract_key(self, char * last): # <<<<<<<<<<<<<<
3697@@ -1245,7 +1245,7 @@
3698 __pyx_v_failure_string = Py_None; __Pyx_INCREF(Py_None);
3699 __pyx_v_key_element = Py_None; __Pyx_INCREF(Py_None);
3700
3701- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":173
3702+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":173
3703 * cdef StaticTuple key
3704 *
3705 * key = StaticTuple_New(self.key_length) # <<<<<<<<<<<<<<
3706@@ -1258,7 +1258,7 @@
3707 __pyx_v_key = ((StaticTuple *)__pyx_t_1);
3708 __pyx_t_1 = 0;
3709
3710- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":174
3711+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":174
3712 *
3713 * key = StaticTuple_New(self.key_length)
3714 * for loop_counter from 0 <= loop_counter < self.key_length: # <<<<<<<<<<<<<<
3715@@ -1268,7 +1268,7 @@
3716 __pyx_t_2 = __pyx_v_self->key_length;
3717 for (__pyx_v_loop_counter = 0; __pyx_v_loop_counter < __pyx_t_2; __pyx_v_loop_counter++) {
3718
3719- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":176
3720+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":176
3721 * for loop_counter from 0 <= loop_counter < self.key_length:
3722 * # grab a key segment
3723 * temp_ptr = <char*>memchr(self._start, c'\0', last - self._start) # <<<<<<<<<<<<<<
3724@@ -1277,7 +1277,7 @@
3725 */
3726 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\x00', (__pyx_v_last - __pyx_v_self->_start)));
3727
3728- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":177
3729+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":177
3730 * # grab a key segment
3731 * temp_ptr = <char*>memchr(self._start, c'\0', last - self._start)
3732 * if temp_ptr == NULL: # <<<<<<<<<<<<<<
3733@@ -1287,7 +1287,7 @@
3734 __pyx_t_3 = (__pyx_v_temp_ptr == NULL);
3735 if (__pyx_t_3) {
3736
3737- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":178
3738+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":178
3739 * temp_ptr = <char*>memchr(self._start, c'\0', last - self._start)
3740 * if temp_ptr == NULL:
3741 * if loop_counter + 1 == self.key_length: # <<<<<<<<<<<<<<
3742@@ -1297,7 +1297,7 @@
3743 __pyx_t_3 = ((__pyx_v_loop_counter + 1) == __pyx_v_self->key_length);
3744 if (__pyx_t_3) {
3745
3746- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":180
3747+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":180
3748 * if loop_counter + 1 == self.key_length:
3749 * # capture to last
3750 * temp_ptr = last # <<<<<<<<<<<<<<
3751@@ -1309,7 +1309,7 @@
3752 }
3753 /*else*/ {
3754
3755- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":185
3756+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":185
3757 * failure_string = ("invalid key, wanted segment from " +
3758 * repr(safe_string_from_size(self._start,
3759 * last - self._start))) # <<<<<<<<<<<<<<
3760@@ -1328,7 +1328,7 @@
3761 __pyx_v_failure_string = __pyx_t_1;
3762 __pyx_t_1 = 0;
3763
3764- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":186
3765+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":186
3766 * repr(safe_string_from_size(self._start,
3767 * last - self._start)))
3768 * raise AssertionError(failure_string) # <<<<<<<<<<<<<<
3769@@ -1352,7 +1352,7 @@
3770 }
3771 __pyx_L5:;
3772
3773- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":188
3774+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":188
3775 * raise AssertionError(failure_string)
3776 * # capture the key string
3777 * if (self.key_length == 1 # <<<<<<<<<<<<<<
3778@@ -1362,7 +1362,7 @@
3779 __pyx_t_3 = (__pyx_v_self->key_length == 1);
3780 if (__pyx_t_3) {
3781
3782- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":189
3783+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":189
3784 * # capture the key string
3785 * if (self.key_length == 1
3786 * and (temp_ptr - self._start) == 45 # <<<<<<<<<<<<<<
3787@@ -1372,7 +1372,7 @@
3788 __pyx_t_5 = ((__pyx_v_temp_ptr - __pyx_v_self->_start) == 45);
3789 if (__pyx_t_5) {
3790
3791- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":190
3792+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":190
3793 * if (self.key_length == 1
3794 * and (temp_ptr - self._start) == 45
3795 * and strncmp(self._start, 'sha1:', 5) == 0): # <<<<<<<<<<<<<<
3796@@ -1390,7 +1390,7 @@
3797 }
3798 if (__pyx_t_5) {
3799
3800- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":192
3801+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":192
3802 * and strncmp(self._start, 'sha1:', 5) == 0):
3803 * key_element = safe_string_from_size(self._start,
3804 * temp_ptr - self._start) # <<<<<<<<<<<<<<
3805@@ -1406,7 +1406,7 @@
3806 }
3807 /*else*/ {
3808
3809- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":195
3810+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":195
3811 * else:
3812 * key_element = safe_interned_string_from_size(self._start,
3813 * temp_ptr - self._start) # <<<<<<<<<<<<<<
3814@@ -1421,7 +1421,7 @@
3815 }
3816 __pyx_L7:;
3817
3818- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":197
3819+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":197
3820 * temp_ptr - self._start)
3821 * # advance our pointer
3822 * self._start = temp_ptr + 1 # <<<<<<<<<<<<<<
3823@@ -1430,7 +1430,7 @@
3824 */
3825 __pyx_v_self->_start = (__pyx_v_temp_ptr + 1);
3826
3827- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":198
3828+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":198
3829 * # advance our pointer
3830 * self._start = temp_ptr + 1
3831 * Py_INCREF(key_element) # <<<<<<<<<<<<<<
3832@@ -1439,7 +1439,7 @@
3833 */
3834 Py_INCREF(__pyx_v_key_element);
3835
3836- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":199
3837+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":199
3838 * self._start = temp_ptr + 1
3839 * Py_INCREF(key_element)
3840 * StaticTuple_SET_ITEM(key, loop_counter, key_element) # <<<<<<<<<<<<<<
3841@@ -1449,7 +1449,7 @@
3842 StaticTuple_SET_ITEM(__pyx_v_key, __pyx_v_loop_counter, __pyx_v_key_element);
3843 }
3844
3845- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":200
3846+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":200
3847 * Py_INCREF(key_element)
3848 * StaticTuple_SET_ITEM(key, loop_counter, key_element)
3849 * key = StaticTuple_Intern(key) # <<<<<<<<<<<<<<
3850@@ -1462,7 +1462,7 @@
3851 __pyx_v_key = ((StaticTuple *)__pyx_t_4);
3852 __pyx_t_4 = 0;
3853
3854- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":201
3855+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":201
3856 * StaticTuple_SET_ITEM(key, loop_counter, key_element)
3857 * key = StaticTuple_Intern(key)
3858 * return key # <<<<<<<<<<<<<<
3859@@ -1490,7 +1490,7 @@
3860 return __pyx_r;
3861 }
3862
3863-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":203
3864+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":203
3865 * return key
3866 *
3867 * cdef int process_line(self) except -1: # <<<<<<<<<<<<<<
3868@@ -1524,7 +1524,7 @@
3869 __pyx_v_ref_list = Py_None; __Pyx_INCREF(Py_None);
3870 __pyx_v_node_value = ((StaticTuple *)Py_None); __Pyx_INCREF(Py_None);
3871
3872- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":212
3873+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":212
3874 * cdef Py_ssize_t str_len
3875 *
3876 * self._start = self._cur_str # <<<<<<<<<<<<<<
3877@@ -1533,7 +1533,7 @@
3878 */
3879 __pyx_v_self->_start = __pyx_v_self->_cur_str;
3880
3881- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":214
3882+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":214
3883 * self._start = self._cur_str
3884 * # Find the next newline
3885 * last = <char*>memchr(self._start, c'\n', self._end_str - self._start) # <<<<<<<<<<<<<<
3886@@ -1542,7 +1542,7 @@
3887 */
3888 __pyx_v_last = ((char *)memchr(__pyx_v_self->_start, '\n', (__pyx_v_self->_end_str - __pyx_v_self->_start)));
3889
3890- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":215
3891+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":215
3892 * # Find the next newline
3893 * last = <char*>memchr(self._start, c'\n', self._end_str - self._start)
3894 * if last == NULL: # <<<<<<<<<<<<<<
3895@@ -1552,7 +1552,7 @@
3896 __pyx_t_1 = (__pyx_v_last == NULL);
3897 if (__pyx_t_1) {
3898
3899- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":217
3900+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":217
3901 * if last == NULL:
3902 * # Process until the end of the file
3903 * last = self._end_str # <<<<<<<<<<<<<<
3904@@ -1561,7 +1561,7 @@
3905 */
3906 __pyx_v_last = __pyx_v_self->_end_str;
3907
3908- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":218
3909+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":218
3910 * # Process until the end of the file
3911 * last = self._end_str
3912 * self._cur_str = self._end_str # <<<<<<<<<<<<<<
3913@@ -1573,7 +1573,7 @@
3914 }
3915 /*else*/ {
3916
3917- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":221
3918+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":221
3919 * else:
3920 * # And the next string is right after it
3921 * self._cur_str = last + 1 # <<<<<<<<<<<<<<
3922@@ -1584,7 +1584,7 @@
3923 }
3924 __pyx_L3:;
3925
3926- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":224
3927+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":224
3928 * # The last character is right before the '\n'
3929 *
3930 * if last == self._start: # <<<<<<<<<<<<<<
3931@@ -1594,7 +1594,7 @@
3932 __pyx_t_1 = (__pyx_v_last == __pyx_v_self->_start);
3933 if (__pyx_t_1) {
3934
3935- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":226
3936+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":226
3937 * if last == self._start:
3938 * # parsed it all.
3939 * return 0 # <<<<<<<<<<<<<<
3940@@ -1607,7 +1607,7 @@
3941 }
3942 __pyx_L4:;
3943
3944- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":227
3945+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":227
3946 * # parsed it all.
3947 * return 0
3948 * if last < self._start: # <<<<<<<<<<<<<<
3949@@ -1617,7 +1617,7 @@
3950 __pyx_t_1 = (__pyx_v_last < __pyx_v_self->_start);
3951 if (__pyx_t_1) {
3952
3953- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":229
3954+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":229
3955 * if last < self._start:
3956 * # Unexpected error condition - fail
3957 * raise AssertionError("last < self._start") # <<<<<<<<<<<<<<
3958@@ -1639,7 +1639,7 @@
3959 }
3960 __pyx_L5:;
3961
3962- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":230
3963+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":230
3964 * # Unexpected error condition - fail
3965 * raise AssertionError("last < self._start")
3966 * if 0 == self._header_found: # <<<<<<<<<<<<<<
3967@@ -1649,7 +1649,7 @@
3968 __pyx_t_1 = (0 == __pyx_v_self->_header_found);
3969 if (__pyx_t_1) {
3970
3971- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":232
3972+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":232
3973 * if 0 == self._header_found:
3974 * # The first line in a leaf node is the header "type=leaf\n"
3975 * if strncmp("type=leaf", self._start, last - self._start) == 0: # <<<<<<<<<<<<<<
3976@@ -1659,7 +1659,7 @@
3977 __pyx_t_1 = (strncmp(__pyx_k_5, __pyx_v_self->_start, (__pyx_v_last - __pyx_v_self->_start)) == 0);
3978 if (__pyx_t_1) {
3979
3980- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":233
3981+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":233
3982 * # The first line in a leaf node is the header "type=leaf\n"
3983 * if strncmp("type=leaf", self._start, last - self._start) == 0:
3984 * self._header_found = 1 # <<<<<<<<<<<<<<
3985@@ -1668,7 +1668,7 @@
3986 */
3987 __pyx_v_self->_header_found = 1;
3988
3989- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":234
3990+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":234
3991 * if strncmp("type=leaf", self._start, last - self._start) == 0:
3992 * self._header_found = 1
3993 * return 0 # <<<<<<<<<<<<<<
3994@@ -1681,7 +1681,7 @@
3995 }
3996 /*else*/ {
3997
3998- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":237
3999+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":237
4000 * else:
4001 * raise AssertionError('Node did not start with "type=leaf": %r'
4002 * % (safe_string_from_size(self._start, last - self._start))) # <<<<<<<<<<<<<<
4003@@ -1710,7 +1710,7 @@
4004 }
4005 __pyx_L6:;
4006
4007- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":239
4008+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":239
4009 * % (safe_string_from_size(self._start, last - self._start)))
4010 *
4011 * key = self.extract_key(last) # <<<<<<<<<<<<<<
4012@@ -1723,7 +1723,7 @@
4013 __pyx_v_key = __pyx_t_2;
4014 __pyx_t_2 = 0;
4015
4016- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":241
4017+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":241
4018 * key = self.extract_key(last)
4019 * # find the value area
4020 * temp_ptr = <char*>_my_memrchr(self._start, c'\0', last - self._start) # <<<<<<<<<<<<<<
4021@@ -1732,7 +1732,7 @@
4022 */
4023 __pyx_v_temp_ptr = ((char *)__pyx_f_6bzrlib_21_btree_serializer_pyx__my_memrchr(__pyx_v_self->_start, '\x00', (__pyx_v_last - __pyx_v_self->_start)));
4024
4025- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":242
4026+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":242
4027 * # find the value area
4028 * temp_ptr = <char*>_my_memrchr(self._start, c'\0', last - self._start)
4029 * if temp_ptr == NULL: # <<<<<<<<<<<<<<
4030@@ -1742,7 +1742,7 @@
4031 __pyx_t_1 = (__pyx_v_temp_ptr == NULL);
4032 if (__pyx_t_1) {
4033
4034- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":244
4035+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":244
4036 * if temp_ptr == NULL:
4037 * # Invalid line
4038 * raise AssertionError("Failed to find the value area") # <<<<<<<<<<<<<<
4039@@ -1764,7 +1764,7 @@
4040 }
4041 /*else*/ {
4042
4043- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":252
4044+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":252
4045 * # something like '12607215 328306 0 0', which ends up consuming 1MB
4046 * # of memory, just for those strings.
4047 * str_len = last - temp_ptr - 1 # <<<<<<<<<<<<<<
4048@@ -1773,7 +1773,7 @@
4049 */
4050 __pyx_v_str_len = ((__pyx_v_last - __pyx_v_temp_ptr) - 1);
4051
4052- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":253
4053+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":253
4054 * # of memory, just for those strings.
4055 * str_len = last - temp_ptr - 1
4056 * if (str_len > 4 # <<<<<<<<<<<<<<
4057@@ -1783,7 +1783,7 @@
4058 __pyx_t_1 = (__pyx_v_str_len > 4);
4059 if (__pyx_t_1) {
4060
4061- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":254
4062+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":254
4063 * str_len = last - temp_ptr - 1
4064 * if (str_len > 4
4065 * and strncmp(" 0 0", last - 4, 4) == 0): # <<<<<<<<<<<<<<
4066@@ -1797,7 +1797,7 @@
4067 }
4068 if (__pyx_t_5) {
4069
4070- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":257
4071+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":257
4072 * # This drops peak mem for bzr.dev from 87.4MB => 86.2MB
4073 * # For Launchpad 236MB => 232MB
4074 * value = safe_interned_string_from_size(temp_ptr + 1, str_len) # <<<<<<<<<<<<<<
4075@@ -1813,7 +1813,7 @@
4076 }
4077 /*else*/ {
4078
4079- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":259
4080+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":259
4081 * value = safe_interned_string_from_size(temp_ptr + 1, str_len)
4082 * else:
4083 * value = safe_string_from_size(temp_ptr + 1, str_len) # <<<<<<<<<<<<<<
4084@@ -1828,7 +1828,7 @@
4085 }
4086 __pyx_L9:;
4087
4088- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":261
4089+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":261
4090 * value = safe_string_from_size(temp_ptr + 1, str_len)
4091 * # shrink the references end point
4092 * last = temp_ptr # <<<<<<<<<<<<<<
4093@@ -1839,7 +1839,7 @@
4094 }
4095 __pyx_L8:;
4096
4097- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":263
4098+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":263
4099 * last = temp_ptr
4100 *
4101 * if self.ref_list_length: # <<<<<<<<<<<<<<
4102@@ -1848,7 +1848,7 @@
4103 */
4104 if (__pyx_v_self->ref_list_length) {
4105
4106- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":264
4107+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":264
4108 *
4109 * if self.ref_list_length:
4110 * ref_lists = StaticTuple_New(self.ref_list_length) # <<<<<<<<<<<<<<
4111@@ -1861,7 +1861,7 @@
4112 __pyx_v_ref_lists = ((StaticTuple *)__pyx_t_3);
4113 __pyx_t_3 = 0;
4114
4115- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":265
4116+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":265
4117 * if self.ref_list_length:
4118 * ref_lists = StaticTuple_New(self.ref_list_length)
4119 * loop_counter = 0 # <<<<<<<<<<<<<<
4120@@ -1870,7 +1870,7 @@
4121 */
4122 __pyx_v_loop_counter = 0;
4123
4124- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":266
4125+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":266
4126 * ref_lists = StaticTuple_New(self.ref_list_length)
4127 * loop_counter = 0
4128 * while loop_counter < self.ref_list_length: # <<<<<<<<<<<<<<
4129@@ -1881,7 +1881,7 @@
4130 __pyx_t_5 = (__pyx_v_loop_counter < __pyx_v_self->ref_list_length);
4131 if (!__pyx_t_5) break;
4132
4133- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":267
4134+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":267
4135 * loop_counter = 0
4136 * while loop_counter < self.ref_list_length:
4137 * ref_list = [] # <<<<<<<<<<<<<<
4138@@ -1894,7 +1894,7 @@
4139 __pyx_v_ref_list = ((PyObject *)__pyx_t_3);
4140 __pyx_t_3 = 0;
4141
4142- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":269
4143+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":269
4144 * ref_list = []
4145 * # extract a reference list
4146 * loop_counter = loop_counter + 1 # <<<<<<<<<<<<<<
4147@@ -1903,7 +1903,7 @@
4148 */
4149 __pyx_v_loop_counter = (__pyx_v_loop_counter + 1);
4150
4151- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":270
4152+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":270
4153 * # extract a reference list
4154 * loop_counter = loop_counter + 1
4155 * if last < self._start: # <<<<<<<<<<<<<<
4156@@ -1913,7 +1913,7 @@
4157 __pyx_t_5 = (__pyx_v_last < __pyx_v_self->_start);
4158 if (__pyx_t_5) {
4159
4160- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":271
4161+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":271
4162 * loop_counter = loop_counter + 1
4163 * if last < self._start:
4164 * raise AssertionError("last < self._start") # <<<<<<<<<<<<<<
4165@@ -1935,7 +1935,7 @@
4166 }
4167 __pyx_L13:;
4168
4169- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":273
4170+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":273
4171 * raise AssertionError("last < self._start")
4172 * # find the next reference list end point:
4173 * temp_ptr = <char*>memchr(self._start, c'\t', last - self._start) # <<<<<<<<<<<<<<
4174@@ -1944,7 +1944,7 @@
4175 */
4176 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\t', (__pyx_v_last - __pyx_v_self->_start)));
4177
4178- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":274
4179+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":274
4180 * # find the next reference list end point:
4181 * temp_ptr = <char*>memchr(self._start, c'\t', last - self._start)
4182 * if temp_ptr == NULL: # <<<<<<<<<<<<<<
4183@@ -1954,7 +1954,7 @@
4184 __pyx_t_5 = (__pyx_v_temp_ptr == NULL);
4185 if (__pyx_t_5) {
4186
4187- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":276
4188+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":276
4189 * if temp_ptr == NULL:
4190 * # Only valid for the last list
4191 * if loop_counter != self.ref_list_length: # <<<<<<<<<<<<<<
4192@@ -1964,7 +1964,7 @@
4193 __pyx_t_5 = (__pyx_v_loop_counter != __pyx_v_self->ref_list_length);
4194 if (__pyx_t_5) {
4195
4196- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":278
4197+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":278
4198 * if loop_counter != self.ref_list_length:
4199 * # Invalid line
4200 * raise AssertionError( # <<<<<<<<<<<<<<
4201@@ -1986,7 +1986,7 @@
4202 }
4203 /*else*/ {
4204
4205- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":282
4206+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":282
4207 * else:
4208 * # scan to the end of the ref list area
4209 * ref_ptr = last # <<<<<<<<<<<<<<
4210@@ -1995,7 +1995,7 @@
4211 */
4212 __pyx_v_ref_ptr = __pyx_v_last;
4213
4214- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":283
4215+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":283
4216 * # scan to the end of the ref list area
4217 * ref_ptr = last
4218 * next_start = last # <<<<<<<<<<<<<<
4219@@ -2009,7 +2009,7 @@
4220 }
4221 /*else*/ {
4222
4223- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":286
4224+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":286
4225 * else:
4226 * # scan to the end of this ref list
4227 * ref_ptr = temp_ptr # <<<<<<<<<<<<<<
4228@@ -2018,7 +2018,7 @@
4229 */
4230 __pyx_v_ref_ptr = __pyx_v_temp_ptr;
4231
4232- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":287
4233+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":287
4234 * # scan to the end of this ref list
4235 * ref_ptr = temp_ptr
4236 * next_start = temp_ptr + 1 # <<<<<<<<<<<<<<
4237@@ -2029,7 +2029,7 @@
4238 }
4239 __pyx_L14:;
4240
4241- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":289
4242+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":289
4243 * next_start = temp_ptr + 1
4244 * # Now, there may be multiple keys in the ref list.
4245 * while self._start < ref_ptr: # <<<<<<<<<<<<<<
4246@@ -2040,7 +2040,7 @@
4247 __pyx_t_5 = (__pyx_v_self->_start < __pyx_v_ref_ptr);
4248 if (!__pyx_t_5) break;
4249
4250- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":292
4251+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":292
4252 * # loop finding keys and extracting them
4253 * temp_ptr = <char*>memchr(self._start, c'\r',
4254 * ref_ptr - self._start) # <<<<<<<<<<<<<<
4255@@ -2049,7 +2049,7 @@
4256 */
4257 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\r', (__pyx_v_ref_ptr - __pyx_v_self->_start)));
4258
4259- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":293
4260+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":293
4261 * temp_ptr = <char*>memchr(self._start, c'\r',
4262 * ref_ptr - self._start)
4263 * if temp_ptr == NULL: # <<<<<<<<<<<<<<
4264@@ -2059,7 +2059,7 @@
4265 __pyx_t_5 = (__pyx_v_temp_ptr == NULL);
4266 if (__pyx_t_5) {
4267
4268- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":295
4269+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":295
4270 * if temp_ptr == NULL:
4271 * # key runs to the end
4272 * temp_ptr = ref_ptr # <<<<<<<<<<<<<<
4273@@ -2071,7 +2071,7 @@
4274 }
4275 __pyx_L18:;
4276
4277- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":297
4278+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":297
4279 * temp_ptr = ref_ptr
4280 *
4281 * PyList_Append(ref_list, self.extract_key(temp_ptr)) # <<<<<<<<<<<<<<
4282@@ -2084,7 +2084,7 @@
4283 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
4284 }
4285
4286- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":298
4287+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":298
4288 *
4289 * PyList_Append(ref_list, self.extract_key(temp_ptr))
4290 * ref_list = StaticTuple_Intern(StaticTuple(*ref_list)) # <<<<<<<<<<<<<<
4291@@ -2103,7 +2103,7 @@
4292 __pyx_v_ref_list = __pyx_t_3;
4293 __pyx_t_3 = 0;
4294
4295- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":299
4296+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":299
4297 * PyList_Append(ref_list, self.extract_key(temp_ptr))
4298 * ref_list = StaticTuple_Intern(StaticTuple(*ref_list))
4299 * Py_INCREF(ref_list) # <<<<<<<<<<<<<<
4300@@ -2112,7 +2112,7 @@
4301 */
4302 Py_INCREF(__pyx_v_ref_list);
4303
4304- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":300
4305+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":300
4306 * ref_list = StaticTuple_Intern(StaticTuple(*ref_list))
4307 * Py_INCREF(ref_list)
4308 * StaticTuple_SET_ITEM(ref_lists, loop_counter - 1, ref_list) # <<<<<<<<<<<<<<
4309@@ -2121,7 +2121,7 @@
4310 */
4311 StaticTuple_SET_ITEM(__pyx_v_ref_lists, (__pyx_v_loop_counter - 1), __pyx_v_ref_list);
4312
4313- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":302
4314+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":302
4315 * StaticTuple_SET_ITEM(ref_lists, loop_counter - 1, ref_list)
4316 * # prepare for the next reference list
4317 * self._start = next_start # <<<<<<<<<<<<<<
4318@@ -2131,7 +2131,7 @@
4319 __pyx_v_self->_start = __pyx_v_next_start;
4320 }
4321
4322- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":303
4323+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":303
4324 * # prepare for the next reference list
4325 * self._start = next_start
4326 * node_value = StaticTuple(value, ref_lists) # <<<<<<<<<<<<<<
4327@@ -2156,7 +2156,7 @@
4328 }
4329 /*else*/ {
4330
4331- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":305
4332+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":305
4333 * node_value = StaticTuple(value, ref_lists)
4334 * else:
4335 * if last != self._start: # <<<<<<<<<<<<<<
4336@@ -2166,7 +2166,7 @@
4337 __pyx_t_5 = (__pyx_v_last != __pyx_v_self->_start);
4338 if (__pyx_t_5) {
4339
4340- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":307
4341+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":307
4342 * if last != self._start:
4343 * # unexpected reference data present
4344 * raise AssertionError("unexpected reference data present") # <<<<<<<<<<<<<<
4345@@ -2188,7 +2188,7 @@
4346 }
4347 __pyx_L19:;
4348
4349- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":308
4350+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":308
4351 * # unexpected reference data present
4352 * raise AssertionError("unexpected reference data present")
4353 * node_value = StaticTuple(value, StaticTuple()) # <<<<<<<<<<<<<<
4354@@ -2214,7 +2214,7 @@
4355 }
4356 __pyx_L10:;
4357
4358- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":309
4359+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":309
4360 * raise AssertionError("unexpected reference data present")
4361 * node_value = StaticTuple(value, StaticTuple())
4362 * PyList_Append(self.keys, StaticTuple(key, node_value)) # <<<<<<<<<<<<<<
4363@@ -2235,7 +2235,7 @@
4364 __pyx_t_6 = PyList_Append(__pyx_v_self->keys, __pyx_t_2); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
4365 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
4366
4367- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":310
4368+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":310
4369 * node_value = StaticTuple(value, StaticTuple())
4370 * PyList_Append(self.keys, StaticTuple(key, node_value))
4371 * return 0 # <<<<<<<<<<<<<<
4372@@ -2262,7 +2262,7 @@
4373 return __pyx_r;
4374 }
4375
4376-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":312
4377+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":312
4378 * return 0
4379 *
4380 * def parse(self): # <<<<<<<<<<<<<<
4381@@ -2281,7 +2281,7 @@
4382 int __pyx_t_5;
4383 __Pyx_RefNannySetupContext("parse");
4384
4385- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":314
4386+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":314
4387 * def parse(self):
4388 * cdef Py_ssize_t byte_count
4389 * if not PyString_CheckExact(self.bytes): # <<<<<<<<<<<<<<
4390@@ -2291,7 +2291,7 @@
4391 __pyx_t_1 = (!PyString_CheckExact(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes));
4392 if (__pyx_t_1) {
4393
4394- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":315
4395+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":315
4396 * cdef Py_ssize_t byte_count
4397 * if not PyString_CheckExact(self.bytes):
4398 * raise AssertionError('self.bytes is not a string.') # <<<<<<<<<<<<<<
4399@@ -2313,7 +2313,7 @@
4400 }
4401 __pyx_L5:;
4402
4403- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":316
4404+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":316
4405 * if not PyString_CheckExact(self.bytes):
4406 * raise AssertionError('self.bytes is not a string.')
4407 * byte_count = PyString_Size(self.bytes) # <<<<<<<<<<<<<<
4408@@ -2322,7 +2322,7 @@
4409 */
4410 __pyx_v_byte_count = PyString_Size(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
4411
4412- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":317
4413+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":317
4414 * raise AssertionError('self.bytes is not a string.')
4415 * byte_count = PyString_Size(self.bytes)
4416 * self._cur_str = PyString_AsString(self.bytes) # <<<<<<<<<<<<<<
4417@@ -2332,7 +2332,7 @@
4418 __pyx_t_4 = PyString_AsString(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
4419 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = __pyx_t_4;
4420
4421- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":319
4422+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":319
4423 * self._cur_str = PyString_AsString(self.bytes)
4424 * # This points to the last character in the string
4425 * self._end_str = self._cur_str + byte_count # <<<<<<<<<<<<<<
4426@@ -2341,7 +2341,7 @@
4427 */
4428 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = (((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str + __pyx_v_byte_count);
4429
4430- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":320
4431+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":320
4432 * # This points to the last character in the string
4433 * self._end_str = self._cur_str + byte_count
4434 * while self._cur_str < self._end_str: # <<<<<<<<<<<<<<
4435@@ -2352,7 +2352,7 @@
4436 __pyx_t_1 = (((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str < ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str);
4437 if (!__pyx_t_1) break;
4438
4439- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":321
4440+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":321
4441 * self._end_str = self._cur_str + byte_count
4442 * while self._cur_str < self._end_str:
4443 * self.process_line() # <<<<<<<<<<<<<<
4444@@ -2362,7 +2362,7 @@
4445 __pyx_t_5 = ((struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->__pyx_vtab)->process_line(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
4446 }
4447
4448- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":322
4449+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":322
4450 * while self._cur_str < self._end_str:
4451 * self.process_line()
4452 * return self.keys # <<<<<<<<<<<<<<
4453@@ -2387,7 +2387,7 @@
4454 return __pyx_r;
4455 }
4456
4457-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":325
4458+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":325
4459 *
4460 *
4461 * def _parse_leaf_lines(bytes, key_length, ref_list_length): # <<<<<<<<<<<<<<
4462@@ -2458,7 +2458,7 @@
4463 __pyx_L4_argument_unpacking_done:;
4464 __pyx_v_parser = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)Py_None); __Pyx_INCREF(Py_None);
4465
4466- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":326
4467+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":326
4468 *
4469 * def _parse_leaf_lines(bytes, key_length, ref_list_length):
4470 * parser = BTreeLeafParser(bytes, key_length, ref_list_length) # <<<<<<<<<<<<<<
4471@@ -2483,7 +2483,7 @@
4472 __pyx_v_parser = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_t_2);
4473 __pyx_t_2 = 0;
4474
4475- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":327
4476+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":327
4477 * def _parse_leaf_lines(bytes, key_length, ref_list_length):
4478 * parser = BTreeLeafParser(bytes, key_length, ref_list_length)
4479 * return parser.parse() # <<<<<<<<<<<<<<
4480@@ -2514,7 +2514,7 @@
4481 return __pyx_r;
4482 }
4483
4484-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":349
4485+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":349
4486 * _hexbuf = '0123456789abcdef'
4487 *
4488 * cdef _populate_unhexbuf(): # <<<<<<<<<<<<<<
4489@@ -2527,7 +2527,7 @@
4490 PyObject *__pyx_r = NULL;
4491 __Pyx_RefNannySetupContext("_populate_unhexbuf");
4492
4493- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":351
4494+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":351
4495 * cdef _populate_unhexbuf():
4496 * cdef int i
4497 * for i from 0 <= i < 256: # <<<<<<<<<<<<<<
4498@@ -2536,7 +2536,7 @@
4499 */
4500 for (__pyx_v_i = 0; __pyx_v_i < 256; __pyx_v_i++) {
4501
4502- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":352
4503+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":352
4504 * cdef int i
4505 * for i from 0 <= i < 256:
4506 * _unhexbuf[i] = -1 # <<<<<<<<<<<<<<
4507@@ -2546,7 +2546,7 @@
4508 (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[__pyx_v_i]) = -1;
4509 }
4510
4511- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":353
4512+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":353
4513 * for i from 0 <= i < 256:
4514 * _unhexbuf[i] = -1
4515 * for i from 0 <= i < 10: # 0123456789 => map to the raw number # <<<<<<<<<<<<<<
4516@@ -2555,7 +2555,7 @@
4517 */
4518 for (__pyx_v_i = 0; __pyx_v_i < 10; __pyx_v_i++) {
4519
4520- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":354
4521+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":354
4522 * _unhexbuf[i] = -1
4523 * for i from 0 <= i < 10: # 0123456789 => map to the raw number
4524 * _unhexbuf[(i + c'0')] = i # <<<<<<<<<<<<<<
4525@@ -2565,7 +2565,7 @@
4526 (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[(__pyx_v_i + '0')]) = __pyx_v_i;
4527 }
4528
4529- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":355
4530+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":355
4531 * for i from 0 <= i < 10: # 0123456789 => map to the raw number
4532 * _unhexbuf[(i + c'0')] = i
4533 * for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16 # <<<<<<<<<<<<<<
4534@@ -2574,7 +2574,7 @@
4535 */
4536 for (__pyx_v_i = 10; __pyx_v_i < 16; __pyx_v_i++) {
4537
4538- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":356
4539+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":356
4540 * _unhexbuf[(i + c'0')] = i
4541 * for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16
4542 * _unhexbuf[(i - 10 + c'a')] = i # <<<<<<<<<<<<<<
4543@@ -2584,7 +2584,7 @@
4544 (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((__pyx_v_i - 10) + 'a')]) = __pyx_v_i;
4545 }
4546
4547- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":357
4548+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":357
4549 * for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16
4550 * _unhexbuf[(i - 10 + c'a')] = i
4551 * for i from 10 <= i < 16: # ABCDEF => 10, 11, 12, 13, 14, 15, 16 # <<<<<<<<<<<<<<
4552@@ -2593,7 +2593,7 @@
4553 */
4554 for (__pyx_v_i = 10; __pyx_v_i < 16; __pyx_v_i++) {
4555
4556- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":358
4557+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":358
4558 * _unhexbuf[(i - 10 + c'a')] = i
4559 * for i from 10 <= i < 16: # ABCDEF => 10, 11, 12, 13, 14, 15, 16
4560 * _unhexbuf[(i - 10 + c'A')] = i # <<<<<<<<<<<<<<
4561@@ -2609,7 +2609,7 @@
4562 return __pyx_r;
4563 }
4564
4565-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":362
4566+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":362
4567 *
4568 *
4569 * cdef int _unhexlify_sha1(char *as_hex, char *as_bin): # cannot_raise # <<<<<<<<<<<<<<
4570@@ -2628,7 +2628,7 @@
4571 int __pyx_t_3;
4572 __Pyx_RefNannySetupContext("_unhexlify_sha1");
4573
4574- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":374
4575+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":374
4576 * # binascii does this using isupper() and tolower() and ?: syntax. I'm
4577 * # guessing a simple lookup array should be faster.
4578 * j = 0 # <<<<<<<<<<<<<<
4579@@ -2637,7 +2637,7 @@
4580 */
4581 __pyx_v_j = 0;
4582
4583- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":375
4584+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":375
4585 * # guessing a simple lookup array should be faster.
4586 * j = 0
4587 * for i from 0 <= i < 20: # <<<<<<<<<<<<<<
4588@@ -2646,7 +2646,7 @@
4589 */
4590 for (__pyx_v_i = 0; __pyx_v_i < 20; __pyx_v_i++) {
4591
4592- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":376
4593+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":376
4594 * j = 0
4595 * for i from 0 <= i < 20:
4596 * top = _unhexbuf[<unsigned char>(as_hex[j])] # <<<<<<<<<<<<<<
4597@@ -2655,7 +2655,7 @@
4598 */
4599 __pyx_v_top = (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((unsigned char)(__pyx_v_as_hex[__pyx_v_j]))]);
4600
4601- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":377
4602+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":377
4603 * for i from 0 <= i < 20:
4604 * top = _unhexbuf[<unsigned char>(as_hex[j])]
4605 * j = j + 1 # <<<<<<<<<<<<<<
4606@@ -2664,7 +2664,7 @@
4607 */
4608 __pyx_v_j = (__pyx_v_j + 1);
4609
4610- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":378
4611+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":378
4612 * top = _unhexbuf[<unsigned char>(as_hex[j])]
4613 * j = j + 1
4614 * bot = _unhexbuf[<unsigned char>(as_hex[j])] # <<<<<<<<<<<<<<
4615@@ -2673,7 +2673,7 @@
4616 */
4617 __pyx_v_bot = (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((unsigned char)(__pyx_v_as_hex[__pyx_v_j]))]);
4618
4619- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":379
4620+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":379
4621 * j = j + 1
4622 * bot = _unhexbuf[<unsigned char>(as_hex[j])]
4623 * j = j + 1 # <<<<<<<<<<<<<<
4624@@ -2682,7 +2682,7 @@
4625 */
4626 __pyx_v_j = (__pyx_v_j + 1);
4627
4628- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":380
4629+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":380
4630 * bot = _unhexbuf[<unsigned char>(as_hex[j])]
4631 * j = j + 1
4632 * if top == -1 or bot == -1: # <<<<<<<<<<<<<<
4633@@ -2698,7 +2698,7 @@
4634 }
4635 if (__pyx_t_3) {
4636
4637- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":381
4638+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":381
4639 * j = j + 1
4640 * if top == -1 or bot == -1:
4641 * return 0 # <<<<<<<<<<<<<<
4642@@ -2711,7 +2711,7 @@
4643 }
4644 __pyx_L5:;
4645
4646- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":382
4647+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":382
4648 * if top == -1 or bot == -1:
4649 * return 0
4650 * as_bin[i] = <unsigned char>((top << 4) + bot); # <<<<<<<<<<<<<<
4651@@ -2721,7 +2721,7 @@
4652 (__pyx_v_as_bin[__pyx_v_i]) = ((unsigned char)((__pyx_v_top << 4) + __pyx_v_bot));
4653 }
4654
4655- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":383
4656+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":383
4657 * return 0
4658 * as_bin[i] = <unsigned char>((top << 4) + bot);
4659 * return 1 # <<<<<<<<<<<<<<
4660@@ -2737,7 +2737,7 @@
4661 return __pyx_r;
4662 }
4663
4664-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":386
4665+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":386
4666 *
4667 *
4668 * def _py_unhexlify(as_hex): # <<<<<<<<<<<<<<
4669@@ -2761,7 +2761,7 @@
4670 __pyx_self = __pyx_self;
4671 __pyx_v_as_bin = Py_None; __Pyx_INCREF(Py_None);
4672
4673- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":388
4674+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":388
4675 * def _py_unhexlify(as_hex):
4676 * """For the test infrastructure, just thunks to _unhexlify_sha1"""
4677 * if len(as_hex) != 40 or not PyString_CheckExact(as_hex): # <<<<<<<<<<<<<<
4678@@ -2778,7 +2778,7 @@
4679 }
4680 if (__pyx_t_4) {
4681
4682- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":389
4683+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":389
4684 * """For the test infrastructure, just thunks to _unhexlify_sha1"""
4685 * if len(as_hex) != 40 or not PyString_CheckExact(as_hex):
4686 * raise ValueError('not a 40-byte hex digest') # <<<<<<<<<<<<<<
4687@@ -2800,7 +2800,7 @@
4688 }
4689 __pyx_L5:;
4690
4691- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":390
4692+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":390
4693 * if len(as_hex) != 40 or not PyString_CheckExact(as_hex):
4694 * raise ValueError('not a 40-byte hex digest')
4695 * as_bin = PyString_FromStringAndSize(NULL, 20) # <<<<<<<<<<<<<<
4696@@ -2813,7 +2813,7 @@
4697 __pyx_v_as_bin = __pyx_t_6;
4698 __pyx_t_6 = 0;
4699
4700- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":391
4701+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":391
4702 * raise ValueError('not a 40-byte hex digest')
4703 * as_bin = PyString_FromStringAndSize(NULL, 20)
4704 * if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)): # <<<<<<<<<<<<<<
4705@@ -2823,7 +2823,7 @@
4706 __pyx_t_7 = __pyx_f_6bzrlib_21_btree_serializer_pyx__unhexlify_sha1(PyString_AS_STRING(__pyx_v_as_hex), PyString_AS_STRING(__pyx_v_as_bin));
4707 if (__pyx_t_7) {
4708
4709- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":392
4710+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":392
4711 * as_bin = PyString_FromStringAndSize(NULL, 20)
4712 * if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)):
4713 * return as_bin # <<<<<<<<<<<<<<
4714@@ -2838,7 +2838,7 @@
4715 }
4716 __pyx_L6:;
4717
4718- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":393
4719+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":393
4720 * if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)):
4721 * return as_bin
4722 * return None # <<<<<<<<<<<<<<
4723@@ -2864,7 +2864,7 @@
4724 return __pyx_r;
4725 }
4726
4727-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":396
4728+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":396
4729 *
4730 *
4731 * cdef void _hexlify_sha1(char *as_bin, char *as_hex): # cannot_raise # <<<<<<<<<<<<<<
4732@@ -2878,7 +2878,7 @@
4733 char __pyx_v_c;
4734 __Pyx_RefNannySetupContext("_hexlify_sha1");
4735
4736- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":400
4737+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":400
4738 * cdef char c
4739 *
4740 * j = 0 # <<<<<<<<<<<<<<
4741@@ -2887,7 +2887,7 @@
4742 */
4743 __pyx_v_j = 0;
4744
4745- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":401
4746+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":401
4747 *
4748 * j = 0
4749 * for i from 0 <= i < 20: # <<<<<<<<<<<<<<
4750@@ -2896,7 +2896,7 @@
4751 */
4752 for (__pyx_v_i = 0; __pyx_v_i < 20; __pyx_v_i++) {
4753
4754- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":402
4755+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":402
4756 * j = 0
4757 * for i from 0 <= i < 20:
4758 * c = as_bin[i] # <<<<<<<<<<<<<<
4759@@ -2905,7 +2905,7 @@
4760 */
4761 __pyx_v_c = (__pyx_v_as_bin[__pyx_v_i]);
4762
4763- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":403
4764+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":403
4765 * for i from 0 <= i < 20:
4766 * c = as_bin[i]
4767 * as_hex[j] = _hexbuf[(c>>4)&0xf] # <<<<<<<<<<<<<<
4768@@ -2914,7 +2914,7 @@
4769 */
4770 (__pyx_v_as_hex[__pyx_v_j]) = (__pyx_v_6bzrlib_21_btree_serializer_pyx__hexbuf[((__pyx_v_c >> 4) & 0xf)]);
4771
4772- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":404
4773+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":404
4774 * c = as_bin[i]
4775 * as_hex[j] = _hexbuf[(c>>4)&0xf]
4776 * j = j + 1 # <<<<<<<<<<<<<<
4777@@ -2923,7 +2923,7 @@
4778 */
4779 __pyx_v_j = (__pyx_v_j + 1);
4780
4781- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":405
4782+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":405
4783 * as_hex[j] = _hexbuf[(c>>4)&0xf]
4784 * j = j + 1
4785 * as_hex[j] = _hexbuf[(c)&0xf] # <<<<<<<<<<<<<<
4786@@ -2932,7 +2932,7 @@
4787 */
4788 (__pyx_v_as_hex[__pyx_v_j]) = (__pyx_v_6bzrlib_21_btree_serializer_pyx__hexbuf[(__pyx_v_c & 0xf)]);
4789
4790- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":406
4791+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":406
4792 * j = j + 1
4793 * as_hex[j] = _hexbuf[(c)&0xf]
4794 * j = j + 1 # <<<<<<<<<<<<<<
4795@@ -2945,7 +2945,7 @@
4796 __Pyx_RefNannyFinishContext();
4797 }
4798
4799-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":409
4800+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":409
4801 *
4802 *
4803 * def _py_hexlify(as_bin): # <<<<<<<<<<<<<<
4804@@ -2968,7 +2968,7 @@
4805 __pyx_self = __pyx_self;
4806 __pyx_v_as_hex = Py_None; __Pyx_INCREF(Py_None);
4807
4808- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":411
4809+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":411
4810 * def _py_hexlify(as_bin):
4811 * """For test infrastructure, thunk to _hexlify_sha1"""
4812 * if len(as_bin) != 20 or not PyString_CheckExact(as_bin): # <<<<<<<<<<<<<<
4813@@ -2985,7 +2985,7 @@
4814 }
4815 if (__pyx_t_4) {
4816
4817- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":412
4818+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":412
4819 * """For test infrastructure, thunk to _hexlify_sha1"""
4820 * if len(as_bin) != 20 or not PyString_CheckExact(as_bin):
4821 * raise ValueError('not a 20-byte binary digest') # <<<<<<<<<<<<<<
4822@@ -3007,7 +3007,7 @@
4823 }
4824 __pyx_L5:;
4825
4826- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":413
4827+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":413
4828 * if len(as_bin) != 20 or not PyString_CheckExact(as_bin):
4829 * raise ValueError('not a 20-byte binary digest')
4830 * as_hex = PyString_FromStringAndSize(NULL, 40) # <<<<<<<<<<<<<<
4831@@ -3020,7 +3020,7 @@
4832 __pyx_v_as_hex = __pyx_t_6;
4833 __pyx_t_6 = 0;
4834
4835- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":414
4836+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":414
4837 * raise ValueError('not a 20-byte binary digest')
4838 * as_hex = PyString_FromStringAndSize(NULL, 40)
4839 * _hexlify_sha1(PyString_AS_STRING(as_bin), PyString_AS_STRING(as_hex)) # <<<<<<<<<<<<<<
4840@@ -3029,7 +3029,7 @@
4841 */
4842 __pyx_f_6bzrlib_21_btree_serializer_pyx__hexlify_sha1(PyString_AS_STRING(__pyx_v_as_bin), PyString_AS_STRING(__pyx_v_as_hex));
4843
4844- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":415
4845+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":415
4846 * as_hex = PyString_FromStringAndSize(NULL, 40)
4847 * _hexlify_sha1(PyString_AS_STRING(as_bin), PyString_AS_STRING(as_hex))
4848 * return as_hex # <<<<<<<<<<<<<<
4849@@ -3055,7 +3055,7 @@
4850 return __pyx_r;
4851 }
4852
4853-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":418
4854+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":418
4855 *
4856 *
4857 * cdef int _key_to_sha1(key, char *sha1): # cannot_raise # <<<<<<<<<<<<<<
4858@@ -3071,7 +3071,7 @@
4859 int __pyx_t_2;
4860 __Pyx_RefNannySetupContext("_key_to_sha1");
4861
4862- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":428
4863+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":428
4864 * cdef PyObject *p_val
4865 *
4866 * if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1: # <<<<<<<<<<<<<<
4867@@ -3087,7 +3087,7 @@
4868 }
4869 if (__pyx_t_2) {
4870
4871- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":429
4872+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":429
4873 *
4874 * if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1:
4875 * p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0) # <<<<<<<<<<<<<<
4876@@ -3099,7 +3099,7 @@
4877 goto __pyx_L3;
4878 }
4879
4880- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":430
4881+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":430
4882 * if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1:
4883 * p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0)
4884 * elif (PyTuple_CheckExact(key) and PyTuple_GET_SIZE(key) == 1): # <<<<<<<<<<<<<<
4885@@ -3114,7 +3114,7 @@
4886 }
4887 if (__pyx_t_1) {
4888
4889- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":431
4890+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":431
4891 * p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0)
4892 * elif (PyTuple_CheckExact(key) and PyTuple_GET_SIZE(key) == 1):
4893 * p_val = PyTuple_GET_ITEM_ptr_object(key, 0) # <<<<<<<<<<<<<<
4894@@ -3126,7 +3126,7 @@
4895 }
4896 /*else*/ {
4897
4898- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":434
4899+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":434
4900 * else:
4901 * # Not a tuple or a StaticTuple
4902 * return 0 # <<<<<<<<<<<<<<
4903@@ -3138,7 +3138,7 @@
4904 }
4905 __pyx_L3:;
4906
4907- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":435
4908+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":435
4909 * # Not a tuple or a StaticTuple
4910 * return 0
4911 * if (PyString_CheckExact_ptr(p_val) and PyString_GET_SIZE_ptr(p_val) == 45): # <<<<<<<<<<<<<<
4912@@ -3153,7 +3153,7 @@
4913 }
4914 if (__pyx_t_2) {
4915
4916- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":436
4917+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":436
4918 * return 0
4919 * if (PyString_CheckExact_ptr(p_val) and PyString_GET_SIZE_ptr(p_val) == 45):
4920 * c_val = PyString_AS_STRING_ptr(p_val) # <<<<<<<<<<<<<<
4921@@ -3165,7 +3165,7 @@
4922 }
4923 /*else*/ {
4924
4925- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":438
4926+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":438
4927 * c_val = PyString_AS_STRING_ptr(p_val)
4928 * else:
4929 * return 0 # <<<<<<<<<<<<<<
4930@@ -3177,7 +3177,7 @@
4931 }
4932 __pyx_L4:;
4933
4934- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":439
4935+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":439
4936 * else:
4937 * return 0
4938 * if strncmp(c_val, 'sha1:', 5) != 0: # <<<<<<<<<<<<<<
4939@@ -3187,7 +3187,7 @@
4940 __pyx_t_2 = (strncmp(__pyx_v_c_val, __pyx_k_3, 5) != 0);
4941 if (__pyx_t_2) {
4942
4943- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":440
4944+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":440
4945 * return 0
4946 * if strncmp(c_val, 'sha1:', 5) != 0:
4947 * return 0 # <<<<<<<<<<<<<<
4948@@ -3200,7 +3200,7 @@
4949 }
4950 __pyx_L5:;
4951
4952- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":441
4953+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":441
4954 * if strncmp(c_val, 'sha1:', 5) != 0:
4955 * return 0
4956 * if not _unhexlify_sha1(c_val + 5, sha1): # <<<<<<<<<<<<<<
4957@@ -3210,7 +3210,7 @@
4958 __pyx_t_2 = (!__pyx_f_6bzrlib_21_btree_serializer_pyx__unhexlify_sha1((__pyx_v_c_val + 5), __pyx_v_sha1));
4959 if (__pyx_t_2) {
4960
4961- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":442
4962+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":442
4963 * return 0
4964 * if not _unhexlify_sha1(c_val + 5, sha1):
4965 * return 0 # <<<<<<<<<<<<<<
4966@@ -3223,7 +3223,7 @@
4967 }
4968 __pyx_L6:;
4969
4970- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":443
4971+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":443
4972 * if not _unhexlify_sha1(c_val + 5, sha1):
4973 * return 0
4974 * return 1 # <<<<<<<<<<<<<<
4975@@ -3243,7 +3243,7 @@
4976 return __pyx_r;
4977 }
4978
4979-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":446
4980+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":446
4981 *
4982 *
4983 * def _py_key_to_sha1(key): # <<<<<<<<<<<<<<
4984@@ -3262,7 +3262,7 @@
4985 __pyx_self = __pyx_self;
4986 __pyx_v_as_bin_sha = Py_None; __Pyx_INCREF(Py_None);
4987
4988- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":451
4989+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":451
4990 * This is a testing thunk to the C function.
4991 * """
4992 * as_bin_sha = PyString_FromStringAndSize(NULL, 20) # <<<<<<<<<<<<<<
4993@@ -3275,7 +3275,7 @@
4994 __pyx_v_as_bin_sha = __pyx_t_1;
4995 __pyx_t_1 = 0;
4996
4997- /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":452
4998+ /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":452
4999 * """
5000 * as_bin_sha = PyString_FromStringAndSize(NULL, 20)
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: