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

[Jelmer Vernooij]

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)

[Martin Pool (mbp)]

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

[lp:~bzr-core/ubuntu/oneiric/bzr/sru-2.4.2]

3951. By Jelmer Vernooij on 2011-11-03

releasing version 2.4.2-0ubuntu1

[Colin Watson (cjwatson)]

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.

=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	2011-08-31 16:04:52 +0000
+++ .bzr-builddeb/default.conf	2011-11-03 14:37:19 +0000
@@ -1,3 +1,4 @@
 [BUILDDEB]
 upstream-branch = lp:bzr/2.4
+export-upstream-revision = tag:bzr-$UPSTREAM_VERSION
 #upstream-branch = lp:bzr
 
=== modified file 'Makefile'
--- Makefile	2011-05-21 17:34:06 +0000
+++ Makefile	2011-11-03 14:37:19 +0000
@@ -42,7 +42,9 @@
 	set -e
 	# Generate a stream for PQM to watch.
 	-$(RM) -f selftest.log
+	echo `date` ": selftest starts" 1>&2
 	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	echo `date` ": selftest ends" 1>&2
 	# An empty log file should catch errors in the $(PYTHON)
 	# command above (the '|' swallow any errors since 'make'
 	# sees the 'tee' exit code for the whole line
 
=== modified file 'bzr'
--- bzr	2011-08-31 16:04:52 +0000
+++ bzr	2011-11-03 14:37:19 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 4, 0)
+_script_version = (2, 4, 2)
 
 try:
     version_info = sys.version_info
 
=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2011-08-31 16:04:52 +0000
+++ bzrlib/__init__.py	2011-11-03 14:37:19 +0000
@@ -52,7 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 4, 0, 'final', 0)
+version_info = (2, 4, 2, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)
 
=== modified file 'bzrlib/_annotator_pyx.c'
--- bzrlib/_annotator_pyx.c	2011-08-31 15:04:43 +0000
+++ bzrlib/_annotator_pyx.c	2011-11-03 14:37:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.13 on Thu Aug 11 09:45:13 2011 */
+/* Generated by Cython 0.13 on Mon Sep 19 20:18:37 2011 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -538,7 +538,7 @@
 static PyObject *__pyx_n_s__self;
 static PyObject *__pyx_n_s__this_annotation;
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":61
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":61
  * 
  * 
  * cdef int _check_annotations_are_lists(annotations,             # <<<<<<<<<<<<<<
@@ -553,7 +553,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("_check_annotations_are_lists");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":63
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":63
  * cdef int _check_annotations_are_lists(annotations,
  *                                       parent_annotations) except -1:
  *     if not PyList_CheckExact(annotations):             # <<<<<<<<<<<<<<
@@ -563,7 +563,7 @@
   __pyx_t_1 = (!PyList_CheckExact(__pyx_v_annotations));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":64
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":64
  *                                       parent_annotations) except -1:
  *     if not PyList_CheckExact(annotations):
  *         raise TypeError('annotations must be a list')             # <<<<<<<<<<<<<<
@@ -585,7 +585,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":65
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":65
  *     if not PyList_CheckExact(annotations):
  *         raise TypeError('annotations must be a list')
  *     if not PyList_CheckExact(parent_annotations):             # <<<<<<<<<<<<<<
@@ -595,7 +595,7 @@
   __pyx_t_1 = (!PyList_CheckExact(__pyx_v_parent_annotations));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":66
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":66
  *         raise TypeError('annotations must be a list')
  *     if not PyList_CheckExact(parent_annotations):
  *         raise TypeError('parent_annotations must be a list')             # <<<<<<<<<<<<<<
@@ -617,7 +617,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":67
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":67
  *     if not PyList_CheckExact(parent_annotations):
  *         raise TypeError('parent_annotations must be a list')
  *     return 0             # <<<<<<<<<<<<<<
@@ -639,7 +639,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":70
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":70
  * 
  * 
  * cdef int _check_match_ranges(parent_annotations, annotations,             # <<<<<<<<<<<<<<
@@ -655,7 +655,7 @@
   PyObject *__pyx_t_4 = NULL;
   __Pyx_RefNannySetupContext("_check_match_ranges");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":73
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":73
  *                              Py_ssize_t parent_idx, Py_ssize_t lines_idx,
  *                              Py_ssize_t match_len) except -1:
  *     if parent_idx + match_len > PyList_GET_SIZE(parent_annotations):             # <<<<<<<<<<<<<<
@@ -665,7 +665,7 @@
   __pyx_t_1 = ((__pyx_v_parent_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_parent_annotations));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":76
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":76
  *         raise ValueError('Match length exceeds len of'
  *                          ' parent_annotations %s > %s'
  *                          % (parent_idx + match_len,             # <<<<<<<<<<<<<<
@@ -675,7 +675,7 @@
     __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;}
     __Pyx_GOTREF(__pyx_t_2);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":77
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":77
  *                          ' parent_annotations %s > %s'
  *                          % (parent_idx + match_len,
  *                             PyList_GET_SIZE(parent_annotations)))             # <<<<<<<<<<<<<<
@@ -710,7 +710,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":78
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":78
  *                          % (parent_idx + match_len,
  *                             PyList_GET_SIZE(parent_annotations)))
  *     if lines_idx + match_len > PyList_GET_SIZE(annotations):             # <<<<<<<<<<<<<<
@@ -720,7 +720,7 @@
   __pyx_t_1 = ((__pyx_v_lines_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_annotations));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":81
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":81
  *         raise ValueError('Match length exceeds len of'
  *                          ' annotations %s > %s'
  *                          % (lines_idx + match_len,             # <<<<<<<<<<<<<<
@@ -730,7 +730,7 @@
     __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;}
     __Pyx_GOTREF(__pyx_t_3);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":82
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":82
  *                          ' annotations %s > %s'
  *                          % (lines_idx + match_len,
  *                             PyList_GET_SIZE(annotations)))             # <<<<<<<<<<<<<<
@@ -765,7 +765,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":83
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":83
  *                          % (lines_idx + match_len,
  *                             PyList_GET_SIZE(annotations)))
  *     return 0             # <<<<<<<<<<<<<<
@@ -788,7 +788,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":86
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":86
  * 
  * 
  * cdef PyObject *_next_tuple_entry(object tpl, Py_ssize_t *pos): # cannot_raise             # <<<<<<<<<<<<<<
@@ -801,7 +801,7 @@
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("_next_tuple_entry");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":94
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":94
  *     This cannot raise an exception, as it does no error checking.
  *     """
  *     pos[0] = pos[0] + 1             # <<<<<<<<<<<<<<
@@ -810,7 +810,7 @@
  */
   (__pyx_v_pos[0]) = ((__pyx_v_pos[0]) + 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":95
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":95
  *     """
  *     pos[0] = pos[0] + 1
  *     if pos[0] >= PyTuple_GET_SIZE(tpl):             # <<<<<<<<<<<<<<
@@ -820,7 +820,7 @@
   __pyx_t_1 = ((__pyx_v_pos[0]) >= PyTuple_GET_SIZE(__pyx_v_tpl));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":96
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":96
  *     pos[0] = pos[0] + 1
  *     if pos[0] >= PyTuple_GET_SIZE(tpl):
  *         return NULL             # <<<<<<<<<<<<<<
@@ -833,7 +833,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":97
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":97
  *     if pos[0] >= PyTuple_GET_SIZE(tpl):
  *         return NULL
  *     return PyTuple_GET_ITEM(tpl, pos[0])             # <<<<<<<<<<<<<<
@@ -849,7 +849,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":100
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":100
  * 
  * 
  * cdef object _combine_annotations(ann_one, ann_two, cache):             # <<<<<<<<<<<<<<
@@ -877,7 +877,7 @@
   __pyx_v_cache_key = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_new_ann = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":106
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":106
  *     cdef PyObject *temp, *left, *right
  * 
  *     if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)):             # <<<<<<<<<<<<<<
@@ -887,7 +887,7 @@
   __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;}
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":107
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":107
  * 
  *     if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)):
  *         cache_key = (ann_one, ann_two)             # <<<<<<<<<<<<<<
@@ -910,7 +910,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":109
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":109
  *         cache_key = (ann_one, ann_two)
  *     else:
  *         cache_key = (ann_two, ann_one)             # <<<<<<<<<<<<<<
@@ -932,7 +932,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":110
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":110
  *     else:
  *         cache_key = (ann_two, ann_one)
  *     temp = PyDict_GetItem(cache, cache_key)             # <<<<<<<<<<<<<<
@@ -941,7 +941,7 @@
  */
   __pyx_v_temp = PyDict_GetItem(__pyx_v_cache, ((PyObject *)__pyx_v_cache_key));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":111
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":111
  *         cache_key = (ann_two, ann_one)
  *     temp = PyDict_GetItem(cache, cache_key)
  *     if temp != NULL:             # <<<<<<<<<<<<<<
@@ -951,7 +951,7 @@
   __pyx_t_3 = (__pyx_v_temp != NULL);
   if (__pyx_t_3) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":112
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":112
  *     temp = PyDict_GetItem(cache, cache_key)
  *     if temp != NULL:
  *         return <object>temp             # <<<<<<<<<<<<<<
@@ -966,7 +966,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":114
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":114
  *         return <object>temp
  * 
  *     if not PyTuple_CheckExact(ann_one) or not PyTuple_CheckExact(ann_two):             # <<<<<<<<<<<<<<
@@ -982,7 +982,7 @@
   }
   if (__pyx_t_5) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":115
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":115
  * 
  *     if not PyTuple_CheckExact(ann_one) or not PyTuple_CheckExact(ann_two):
  *         raise TypeError('annotations must be tuples')             # <<<<<<<<<<<<<<
@@ -1004,7 +1004,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":118
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":118
  *     # We know that annotations are tuples, and that both sides are already
  *     # sorted, so we can just walk and update a new list.
  *     pos_one = -1             # <<<<<<<<<<<<<<
@@ -1013,7 +1013,7 @@
  */
   __pyx_v_pos_one = -1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":119
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":119
  *     # sorted, so we can just walk and update a new list.
  *     pos_one = -1
  *     pos_two = -1             # <<<<<<<<<<<<<<
@@ -1022,7 +1022,7 @@
  */
   __pyx_v_pos_two = -1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":120
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":120
  *     pos_one = -1
  *     pos_two = -1
  *     out_pos = 0             # <<<<<<<<<<<<<<
@@ -1031,7 +1031,7 @@
  */
   __pyx_v_out_pos = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":121
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":121
  *     pos_two = -1
  *     out_pos = 0
  *     left = _next_tuple_entry(ann_one, &pos_one)             # <<<<<<<<<<<<<<
@@ -1040,7 +1040,7 @@
  */
   __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":122
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":122
  *     out_pos = 0
  *     left = _next_tuple_entry(ann_one, &pos_one)
  *     right = _next_tuple_entry(ann_two, &pos_two)             # <<<<<<<<<<<<<<
@@ -1049,7 +1049,7 @@
  */
   __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":124
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":124
  *     right = _next_tuple_entry(ann_two, &pos_two)
  *     new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
  *                           + PyTuple_GET_SIZE(ann_two))             # <<<<<<<<<<<<<<
@@ -1062,7 +1062,7 @@
   __pyx_v_new_ann = __pyx_t_6;
   __pyx_t_6 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":125
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":125
  *     new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
  *                           + PyTuple_GET_SIZE(ann_two))
  *     while left != NULL and right != NULL:             # <<<<<<<<<<<<<<
@@ -1079,7 +1079,7 @@
     }
     if (!__pyx_t_4) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":130
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":130
  *         # annotate NEWS' from 7.25s to 7.16s, so it *is* a visible impact.
  *         if (left == right
  *             or PyObject_RichCompareBool_ptr(left, right, Py_EQ)):             # <<<<<<<<<<<<<<
@@ -1094,7 +1094,7 @@
     }
     if (__pyx_t_5) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":132
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":132
  *             or PyObject_RichCompareBool_ptr(left, right, Py_EQ)):
  *             # Identical values, step both
  *             Py_INCREF_ptr(left)             # <<<<<<<<<<<<<<
@@ -1103,7 +1103,7 @@
  */
       Py_INCREF(__pyx_v_left);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":133
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":133
  *             # Identical values, step both
  *             Py_INCREF_ptr(left)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)             # <<<<<<<<<<<<<<
@@ -1112,7 +1112,7 @@
  */
       PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":134
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":134
  *             Py_INCREF_ptr(left)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
  *             left = _next_tuple_entry(ann_one, &pos_one)             # <<<<<<<<<<<<<<
@@ -1121,7 +1121,7 @@
  */
       __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":135
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":135
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
  *             left = _next_tuple_entry(ann_one, &pos_one)
  *             right = _next_tuple_entry(ann_two, &pos_two)             # <<<<<<<<<<<<<<
@@ -1132,7 +1132,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":136
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":136
  *             left = _next_tuple_entry(ann_one, &pos_one)
  *             right = _next_tuple_entry(ann_two, &pos_two)
  *         elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)):             # <<<<<<<<<<<<<<
@@ -1142,7 +1142,7 @@
     __pyx_t_1 = PyObject_RichCompareBool(__pyx_v_left, __pyx_v_right, Py_LT);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":138
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":138
  *         elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)):
  *             # left < right or right == NULL
  *             Py_INCREF_ptr(left)             # <<<<<<<<<<<<<<
@@ -1151,7 +1151,7 @@
  */
       Py_INCREF(__pyx_v_left);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":139
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":139
  *             # left < right or right == NULL
  *             Py_INCREF_ptr(left)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)             # <<<<<<<<<<<<<<
@@ -1160,7 +1160,7 @@
  */
       PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":140
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":140
  *             Py_INCREF_ptr(left)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
  *             left = _next_tuple_entry(ann_one, &pos_one)             # <<<<<<<<<<<<<<
@@ -1172,7 +1172,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":142
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":142
  *             left = _next_tuple_entry(ann_one, &pos_one)
  *         else: # right < left or left == NULL
  *             Py_INCREF_ptr(right)             # <<<<<<<<<<<<<<
@@ -1181,7 +1181,7 @@
  */
       Py_INCREF(__pyx_v_right);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":143
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":143
  *         else: # right < left or left == NULL
  *             Py_INCREF_ptr(right)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)             # <<<<<<<<<<<<<<
@@ -1190,7 +1190,7 @@
  */
       PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":144
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":144
  *             Py_INCREF_ptr(right)
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
  *             right = _next_tuple_entry(ann_two, &pos_two)             # <<<<<<<<<<<<<<
@@ -1201,7 +1201,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":145
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":145
  *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
  *             right = _next_tuple_entry(ann_two, &pos_two)
  *         out_pos = out_pos + 1             # <<<<<<<<<<<<<<
@@ -1211,7 +1211,7 @@
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":146
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":146
  *             right = _next_tuple_entry(ann_two, &pos_two)
  *         out_pos = out_pos + 1
  *     while left != NULL:             # <<<<<<<<<<<<<<
@@ -1222,7 +1222,7 @@
     __pyx_t_5 = (__pyx_v_left != NULL);
     if (!__pyx_t_5) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":147
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":147
  *         out_pos = out_pos + 1
  *     while left != NULL:
  *         Py_INCREF_ptr(left)             # <<<<<<<<<<<<<<
@@ -1231,7 +1231,7 @@
  */
     Py_INCREF(__pyx_v_left);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":148
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":148
  *     while left != NULL:
  *         Py_INCREF_ptr(left)
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)             # <<<<<<<<<<<<<<
@@ -1240,7 +1240,7 @@
  */
     PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":149
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":149
  *         Py_INCREF_ptr(left)
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
  *         left = _next_tuple_entry(ann_one, &pos_one)             # <<<<<<<<<<<<<<
@@ -1249,7 +1249,7 @@
  */
     __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":150
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":150
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
  *         left = _next_tuple_entry(ann_one, &pos_one)
  *         out_pos = out_pos + 1             # <<<<<<<<<<<<<<
@@ -1259,7 +1259,7 @@
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":151
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":151
  *         left = _next_tuple_entry(ann_one, &pos_one)
  *         out_pos = out_pos + 1
  *     while right != NULL:             # <<<<<<<<<<<<<<
@@ -1270,7 +1270,7 @@
     __pyx_t_5 = (__pyx_v_right != NULL);
     if (!__pyx_t_5) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":152
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":152
  *         out_pos = out_pos + 1
  *     while right != NULL:
  *         Py_INCREF_ptr(right)             # <<<<<<<<<<<<<<
@@ -1279,7 +1279,7 @@
  */
     Py_INCREF(__pyx_v_right);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":153
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":153
  *     while right != NULL:
  *         Py_INCREF_ptr(right)
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)             # <<<<<<<<<<<<<<
@@ -1288,7 +1288,7 @@
  */
     PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":154
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":154
  *         Py_INCREF_ptr(right)
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
  *         right = _next_tuple_entry(ann_two, &pos_two)             # <<<<<<<<<<<<<<
@@ -1297,7 +1297,7 @@
  */
     __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":155
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":155
  *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
  *         right = _next_tuple_entry(ann_two, &pos_two)
  *         out_pos = out_pos + 1             # <<<<<<<<<<<<<<
@@ -1307,7 +1307,7 @@
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":156
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":156
  *         right = _next_tuple_entry(ann_two, &pos_two)
  *         out_pos = out_pos + 1
  *     if out_pos != PyTuple_GET_SIZE(new_ann):             # <<<<<<<<<<<<<<
@@ -1317,7 +1317,7 @@
   __pyx_t_5 = (__pyx_v_out_pos != PyTuple_GET_SIZE(__pyx_v_new_ann));
   if (__pyx_t_5) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":159
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":159
  *         # Timing _PyTuple_Resize was not significantly faster that slicing
  *         # PyTuple_Resize((<PyObject **>new_ann), out_pos)
  *         new_ann = new_ann[0:out_pos]             # <<<<<<<<<<<<<<
@@ -1333,7 +1333,7 @@
   }
   __pyx_L13:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":160
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":160
  *         # PyTuple_Resize((<PyObject **>new_ann), out_pos)
  *         new_ann = new_ann[0:out_pos]
  *     PyDict_SetItem(cache, cache_key, new_ann)             # <<<<<<<<<<<<<<
@@ -1342,7 +1342,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":161
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":161
  *         new_ann = new_ann[0:out_pos]
  *     PyDict_SetItem(cache, cache_key, new_ann)
  *     return new_ann             # <<<<<<<<<<<<<<
@@ -1369,7 +1369,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":164
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":164
  * 
  * 
  * cdef int _apply_parent_annotations(annotations, parent_annotations,             # <<<<<<<<<<<<<<
@@ -1400,7 +1400,7 @@
   PyObject *__pyx_t_11 = NULL;
   __Pyx_RefNannySetupContext("_apply_parent_annotations");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":174
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":174
  *     cdef PyObject **par_temp, **ann_temp
  * 
  *     _check_annotations_are_lists(annotations, parent_annotations)             # <<<<<<<<<<<<<<
@@ -1409,7 +1409,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":175
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":175
  * 
  *     _check_annotations_are_lists(annotations, parent_annotations)
  *     par_list = <PyListObject *>parent_annotations             # <<<<<<<<<<<<<<
@@ -1418,7 +1418,7 @@
  */
   __pyx_v_par_list = ((PyListObject *)__pyx_v_parent_annotations);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":176
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":176
  *     _check_annotations_are_lists(annotations, parent_annotations)
  *     par_list = <PyListObject *>parent_annotations
  *     ann_list = <PyListObject *>annotations             # <<<<<<<<<<<<<<
@@ -1427,7 +1427,7 @@
  */
   __pyx_v_ann_list = ((PyListObject *)__pyx_v_annotations);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":181
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":181
  *     # that. Would be interesting if we could use memcpy() but we have to incref
  *     # and decref
  *     for parent_idx, lines_idx, match_len in matching_blocks:             # <<<<<<<<<<<<<<
@@ -1493,7 +1493,7 @@
       __pyx_v_match_len = __pyx_t_8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":183
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":183
  *     for parent_idx, lines_idx, match_len in matching_blocks:
  *         _check_match_ranges(parent_annotations, annotations,
  *                             parent_idx, lines_idx, match_len)             # <<<<<<<<<<<<<<
@@ -1502,7 +1502,7 @@
  */
     __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;}
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":184
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":184
  *         _check_match_ranges(parent_annotations, annotations,
  *                             parent_idx, lines_idx, match_len)
  *         par_temp = par_list.ob_item + parent_idx             # <<<<<<<<<<<<<<
@@ -1511,7 +1511,7 @@
  */
     __pyx_v_par_temp = (__pyx_v_par_list->ob_item + __pyx_v_parent_idx);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":185
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":185
  *                             parent_idx, lines_idx, match_len)
  *         par_temp = par_list.ob_item + parent_idx
  *         ann_temp = ann_list.ob_item + lines_idx             # <<<<<<<<<<<<<<
@@ -1520,7 +1520,7 @@
  */
     __pyx_v_ann_temp = (__pyx_v_ann_list->ob_item + __pyx_v_lines_idx);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":186
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":186
  *         par_temp = par_list.ob_item + parent_idx
  *         ann_temp = ann_list.ob_item + lines_idx
  *         for idx from 0 <= idx < match_len:             # <<<<<<<<<<<<<<
@@ -1530,7 +1530,7 @@
     __pyx_t_8 = __pyx_v_match_len;
     for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_t_8; __pyx_v_idx++) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":187
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":187
  *         ann_temp = ann_list.ob_item + lines_idx
  *         for idx from 0 <= idx < match_len:
  *             Py_INCREF_ptr(par_temp[idx])             # <<<<<<<<<<<<<<
@@ -1539,7 +1539,7 @@
  */
       Py_INCREF((__pyx_v_par_temp[__pyx_v_idx]));
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":188
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":188
  *         for idx from 0 <= idx < match_len:
  *             Py_INCREF_ptr(par_temp[idx])
  *             Py_DECREF_ptr(ann_temp[idx])             # <<<<<<<<<<<<<<
@@ -1548,7 +1548,7 @@
  */
       Py_DECREF((__pyx_v_ann_temp[__pyx_v_idx]));
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":189
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":189
  *             Py_INCREF_ptr(par_temp[idx])
  *             Py_DECREF_ptr(ann_temp[idx])
  *             ann_temp[idx] = par_temp[idx]             # <<<<<<<<<<<<<<
@@ -1560,7 +1560,7 @@
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":190
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":190
  *             Py_DECREF_ptr(ann_temp[idx])
  *             ann_temp[idx] = par_temp[idx]
  *     return 0             # <<<<<<<<<<<<<<
@@ -1586,7 +1586,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":193
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":193
  * 
  * 
  * cdef int _merge_annotations(this_annotation, annotations, parent_annotations,             # <<<<<<<<<<<<<<
@@ -1631,7 +1631,7 @@
   __pyx_v_ann = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_new_ann = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":199
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":199
  *     cdef PyObject *ann_temp, *par_temp
  * 
  *     _check_annotations_are_lists(annotations, parent_annotations)             # <<<<<<<<<<<<<<
@@ -1640,7 +1640,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":200
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":200
  * 
  *     _check_annotations_are_lists(annotations, parent_annotations)
  *     last_ann = None             # <<<<<<<<<<<<<<
@@ -1651,7 +1651,7 @@
   __Pyx_DECREF(__pyx_v_last_ann);
   __pyx_v_last_ann = Py_None;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":201
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":201
  *     _check_annotations_are_lists(annotations, parent_annotations)
  *     last_ann = None
  *     last_parent = None             # <<<<<<<<<<<<<<
@@ -1662,7 +1662,7 @@
   __Pyx_DECREF(__pyx_v_last_parent);
   __pyx_v_last_parent = Py_None;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":202
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":202
  *     last_ann = None
  *     last_parent = None
  *     last_res = None             # <<<<<<<<<<<<<<
@@ -1673,7 +1673,7 @@
   __Pyx_DECREF(__pyx_v_last_res);
   __pyx_v_last_res = Py_None;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":203
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":203
  *     last_parent = None
  *     last_res = None
  *     for parent_idx, lines_idx, match_len in matching_blocks:             # <<<<<<<<<<<<<<
@@ -1739,7 +1739,7 @@
       __pyx_v_match_len = __pyx_t_8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":205
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":205
  *     for parent_idx, lines_idx, match_len in matching_blocks:
  *         _check_match_ranges(parent_annotations, annotations,
  *                             parent_idx, lines_idx, match_len)             # <<<<<<<<<<<<<<
@@ -1748,7 +1748,7 @@
  */
     __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;}
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":208
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":208
  *         # For lines which match this parent, we will now resolve whether
  *         # this parent wins over the current annotation
  *         for idx from 0 <= idx < match_len:             # <<<<<<<<<<<<<<
@@ -1758,7 +1758,7 @@
     __pyx_t_8 = __pyx_v_match_len;
     for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_t_8; __pyx_v_idx++) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":209
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":209
  *         # this parent wins over the current annotation
  *         for idx from 0 <= idx < match_len:
  *             ann_idx = lines_idx + idx             # <<<<<<<<<<<<<<
@@ -1767,7 +1767,7 @@
  */
       __pyx_v_ann_idx = (__pyx_v_lines_idx + __pyx_v_idx);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":210
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":210
  *         for idx from 0 <= idx < match_len:
  *             ann_idx = lines_idx + idx
  *             ann_temp = PyList_GET_ITEM(annotations, ann_idx)             # <<<<<<<<<<<<<<
@@ -1776,7 +1776,7 @@
  */
       __pyx_v_ann_temp = PyList_GET_ITEM(__pyx_v_annotations, __pyx_v_ann_idx);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":211
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":211
  *             ann_idx = lines_idx + idx
  *             ann_temp = PyList_GET_ITEM(annotations, ann_idx)
  *             par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx)             # <<<<<<<<<<<<<<
@@ -1785,7 +1785,7 @@
  */
       __pyx_v_par_temp = PyList_GET_ITEM(__pyx_v_parent_annotations, (__pyx_v_parent_idx + __pyx_v_idx));
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":212
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":212
  *             ann_temp = PyList_GET_ITEM(annotations, ann_idx)
  *             par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx)
  *             if (ann_temp == par_temp):             # <<<<<<<<<<<<<<
@@ -1795,7 +1795,7 @@
       __pyx_t_12 = (__pyx_v_ann_temp == __pyx_v_par_temp);
       if (__pyx_t_12) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":220
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":220
  *                 # PyObject_RichCompareBool using pointer comparison drops
  *                 # timing from 215ms => 125ms
  *                 continue             # <<<<<<<<<<<<<<
@@ -1807,7 +1807,7 @@
       }
       __pyx_L7:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":221
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":221
  *                 # timing from 215ms => 125ms
  *                 continue
  *             par_ann = <object>par_temp             # <<<<<<<<<<<<<<
@@ -1818,7 +1818,7 @@
       __Pyx_DECREF(__pyx_v_par_ann);
       __pyx_v_par_ann = ((PyObject *)__pyx_v_par_temp);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":222
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":222
  *                 continue
  *             par_ann = <object>par_temp
  *             ann = <object>ann_temp             # <<<<<<<<<<<<<<
@@ -1829,7 +1829,7 @@
       __Pyx_DECREF(__pyx_v_ann);
       __pyx_v_ann = ((PyObject *)__pyx_v_ann_temp);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":223
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":223
  *             par_ann = <object>par_temp
  *             ann = <object>ann_temp
  *             if (ann is this_annotation):             # <<<<<<<<<<<<<<
@@ -1839,7 +1839,7 @@
       __pyx_t_12 = (__pyx_v_ann == __pyx_v_this_annotation);
       if (__pyx_t_12) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":226
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":226
  *                 # Originally claimed 'this', but it was really in this
  *                 # parent
  *                 Py_INCREF(par_ann)             # <<<<<<<<<<<<<<
@@ -1848,7 +1848,7 @@
  */
         Py_INCREF(__pyx_v_par_ann);
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":227
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":227
  *                 # parent
  *                 Py_INCREF(par_ann)
  *                 PyList_SetItem(annotations, ann_idx, par_ann)             # <<<<<<<<<<<<<<
@@ -1857,7 +1857,7 @@
  */
         __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;}
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":228
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":228
  *                 Py_INCREF(par_ann)
  *                 PyList_SetItem(annotations, ann_idx, par_ann)
  *                 continue             # <<<<<<<<<<<<<<
@@ -1869,7 +1869,7 @@
       }
       __pyx_L8:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":231
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":231
  *             # Resolve the fact that both sides have a different value for
  *             # last modified
  *             if (ann is last_ann and par_ann is last_parent):             # <<<<<<<<<<<<<<
@@ -1885,7 +1885,7 @@
       }
       if (__pyx_t_14) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":232
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":232
  *             # last modified
  *             if (ann is last_ann and par_ann is last_parent):
  *                 Py_INCREF(last_res)             # <<<<<<<<<<<<<<
@@ -1894,7 +1894,7 @@
  */
         Py_INCREF(__pyx_v_last_res);
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":233
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":233
  *             if (ann is last_ann and par_ann is last_parent):
  *                 Py_INCREF(last_res)
  *                 PyList_SetItem(annotations, ann_idx, last_res)             # <<<<<<<<<<<<<<
@@ -1906,7 +1906,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":235
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":235
  *                 PyList_SetItem(annotations, ann_idx, last_res)
  *             else:
  *                 new_ann = _combine_annotations(ann, par_ann, ann_cache)             # <<<<<<<<<<<<<<
@@ -1919,7 +1919,7 @@
         __pyx_v_new_ann = __pyx_t_4;
         __pyx_t_4 = 0;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":236
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":236
  *             else:
  *                 new_ann = _combine_annotations(ann, par_ann, ann_cache)
  *                 Py_INCREF(new_ann)             # <<<<<<<<<<<<<<
@@ -1928,7 +1928,7 @@
  */
         Py_INCREF(__pyx_v_new_ann);
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":237
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":237
  *                 new_ann = _combine_annotations(ann, par_ann, ann_cache)
  *                 Py_INCREF(new_ann)
  *                 PyList_SetItem(annotations, ann_idx, new_ann)             # <<<<<<<<<<<<<<
@@ -1937,7 +1937,7 @@
  */
         __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;}
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":238
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":238
  *                 Py_INCREF(new_ann)
  *                 PyList_SetItem(annotations, ann_idx, new_ann)
  *                 last_ann = ann             # <<<<<<<<<<<<<<
@@ -1948,7 +1948,7 @@
         __Pyx_DECREF(__pyx_v_last_ann);
         __pyx_v_last_ann = __pyx_v_ann;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":239
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":239
  *                 PyList_SetItem(annotations, ann_idx, new_ann)
  *                 last_ann = ann
  *                 last_parent = par_ann             # <<<<<<<<<<<<<<
@@ -1959,7 +1959,7 @@
         __Pyx_DECREF(__pyx_v_last_parent);
         __pyx_v_last_parent = __pyx_v_par_ann;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":240
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":240
  *                 last_ann = ann
  *                 last_parent = par_ann
  *                 last_res = new_ann             # <<<<<<<<<<<<<<
@@ -1976,7 +1976,7 @@
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":241
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":241
  *                 last_parent = par_ann
  *                 last_res = new_ann
  *     return 0             # <<<<<<<<<<<<<<
@@ -2008,7 +2008,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":247
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":247
  *     """Class that drives performing annotations."""
  * 
  *     def _update_from_first_parent(self, key, annotations, lines, parent_key):             # <<<<<<<<<<<<<<
@@ -2106,7 +2106,7 @@
   __pyx_v_parent_annotations = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_matching_blocks = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":250
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":250
  *         """Reannotate this text relative to its first parent."""
  *         (parent_annotations,
  *          matching_blocks) = self._get_parent_annotations_and_matches(             # <<<<<<<<<<<<<<
@@ -2116,7 +2116,7 @@
   __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;}
   __Pyx_GOTREF(__pyx_t_1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":251
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":251
  *         (parent_annotations,
  *          matching_blocks) = self._get_parent_annotations_and_matches(
  *                                 key, lines, parent_key)             # <<<<<<<<<<<<<<
@@ -2143,7 +2143,7 @@
     __pyx_t_2 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_2);
     __pyx_t_1 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":249
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":249
  *     def _update_from_first_parent(self, key, annotations, lines, parent_key):
  *         """Reannotate this text relative to its first parent."""
  *         (parent_annotations,             # <<<<<<<<<<<<<<
@@ -2175,7 +2175,7 @@
     __pyx_t_1 = 0;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":254
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":254
  * 
  *         _apply_parent_annotations(annotations, parent_annotations,
  *                                   matching_blocks)             # <<<<<<<<<<<<<<
@@ -2201,7 +2201,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":256
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":256
  *                                   matching_blocks)
  * 
  *     def _update_from_other_parents(self, key, annotations, lines,             # <<<<<<<<<<<<<<
@@ -2309,7 +2309,7 @@
   __pyx_v_parent_annotations = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_matching_blocks = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":260
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":260
  *         """Reannotate this text relative to a second (or more) parent."""
  *         (parent_annotations,
  *          matching_blocks) = self._get_parent_annotations_and_matches(             # <<<<<<<<<<<<<<
@@ -2319,7 +2319,7 @@
   __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;}
   __Pyx_GOTREF(__pyx_t_1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":261
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":261
  *         (parent_annotations,
  *          matching_blocks) = self._get_parent_annotations_and_matches(
  *                                 key, lines, parent_key)             # <<<<<<<<<<<<<<
@@ -2346,7 +2346,7 @@
     __pyx_t_2 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_2);
     __pyx_t_1 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":259
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":259
  *                                    this_annotation, parent_key):
  *         """Reannotate this text relative to a second (or more) parent."""
  *         (parent_annotations,             # <<<<<<<<<<<<<<
@@ -2378,7 +2378,7 @@
     __pyx_t_1 = 0;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":263
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":263
  *                                 key, lines, parent_key)
  *         _merge_annotations(this_annotation, annotations, parent_annotations,
  *                            matching_blocks, self._ann_tuple_cache)             # <<<<<<<<<<<<<<
@@ -2407,7 +2407,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":265
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":265
  *                            matching_blocks, self._ann_tuple_cache)
  * 
  *     def annotate_flat(self, key):             # <<<<<<<<<<<<<<
@@ -2496,7 +2496,7 @@
   __pyx_v_head = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_the_heads = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":272
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":272
  *         cdef Py_ssize_t pos, num_lines
  * 
  *         from bzrlib import annotate             # <<<<<<<<<<<<<<
@@ -2519,7 +2519,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":274
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":274
  *         from bzrlib import annotate
  * 
  *         custom_tiebreaker = annotate._break_annotation_tie             # <<<<<<<<<<<<<<
@@ -2532,7 +2532,7 @@
   __pyx_v_custom_tiebreaker = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":275
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":275
  * 
  *         custom_tiebreaker = annotate._break_annotation_tie
  *         annotations, lines = self.annotate(key)             # <<<<<<<<<<<<<<
@@ -2579,7 +2579,7 @@
     __pyx_t_2 = 0;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":276
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":276
  *         custom_tiebreaker = annotate._break_annotation_tie
  *         annotations, lines = self.annotate(key)
  *         num_lines = len(lines)             # <<<<<<<<<<<<<<
@@ -2589,7 +2589,7 @@
   __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;}
   __pyx_v_num_lines = __pyx_t_5;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":277
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":277
  *         annotations, lines = self.annotate(key)
  *         num_lines = len(lines)
  *         out = []             # <<<<<<<<<<<<<<
@@ -2602,7 +2602,7 @@
   __pyx_v_out = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":278
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":278
  *         num_lines = len(lines)
  *         out = []
  *         heads = self._get_heads_provider().heads             # <<<<<<<<<<<<<<
@@ -2621,7 +2621,7 @@
   __pyx_v_heads = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":279
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":279
  *         out = []
  *         heads = self._get_heads_provider().heads
  *         for pos from 0 <= pos < num_lines:             # <<<<<<<<<<<<<<
@@ -2631,7 +2631,7 @@
   __pyx_t_5 = __pyx_v_num_lines;
   for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_t_5; __pyx_v_pos++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":280
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":280
  *         heads = self._get_heads_provider().heads
  *         for pos from 0 <= pos < num_lines:
  *             annotation = annotations[pos]             # <<<<<<<<<<<<<<
@@ -2644,7 +2644,7 @@
     __pyx_v_annotation = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":281
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":281
  *         for pos from 0 <= pos < num_lines:
  *             annotation = annotations[pos]
  *             line = lines[pos]             # <<<<<<<<<<<<<<
@@ -2657,7 +2657,7 @@
     __pyx_v_line = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":282
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":282
  *             annotation = annotations[pos]
  *             line = lines[pos]
  *             if len(annotation) == 1:             # <<<<<<<<<<<<<<
@@ -2668,7 +2668,7 @@
     __pyx_t_7 = (__pyx_t_6 == 1);
     if (__pyx_t_7) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":283
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":283
  *             line = lines[pos]
  *             if len(annotation) == 1:
  *                 head = annotation[0]             # <<<<<<<<<<<<<<
@@ -2684,7 +2684,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":285
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":285
  *                 head = annotation[0]
  *             else:
  *                 the_heads = heads(annotation)             # <<<<<<<<<<<<<<
@@ -2703,7 +2703,7 @@
       __pyx_v_the_heads = __pyx_t_2;
       __pyx_t_2 = 0;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":286
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":286
  *             else:
  *                 the_heads = heads(annotation)
  *                 if len(the_heads) == 1:             # <<<<<<<<<<<<<<
@@ -2714,7 +2714,7 @@
       __pyx_t_7 = (__pyx_t_6 == 1);
       if (__pyx_t_7) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":287
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":287
  *                 the_heads = heads(annotation)
  *                 if len(the_heads) == 1:
  *                     for head in the_heads: break # get the item out of the set             # <<<<<<<<<<<<<<
@@ -2753,7 +2753,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":291
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":291
  *                     # We need to resolve the ambiguity, for now just pick the
  *                     # sorted smallest
  *                     head = self._resolve_annotation_tie(the_heads, line,             # <<<<<<<<<<<<<<
@@ -2763,7 +2763,7 @@
         __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;}
         __Pyx_GOTREF(__pyx_t_2);
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":292
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":292
  *                     # sorted smallest
  *                     head = self._resolve_annotation_tie(the_heads, line,
  *                                                         custom_tiebreaker)             # <<<<<<<<<<<<<<
@@ -2793,7 +2793,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":293
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":293
  *                     head = self._resolve_annotation_tie(the_heads, line,
  *                                                         custom_tiebreaker)
  *             PyList_Append(out, (head, line))             # <<<<<<<<<<<<<<
@@ -2811,7 +2811,7 @@
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":294
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":294
  *                                                         custom_tiebreaker)
  *             PyList_Append(out, (head, line))
  *         return out             # <<<<<<<<<<<<<<
@@ -2977,7 +2977,7 @@
   /*--- Function import code ---*/
   /*--- Execution code ---*/
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":58
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":58
  * 
  * 
  * from bzrlib import _annotator_py             # <<<<<<<<<<<<<<
@@ -2998,7 +2998,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":244
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":244
  * 
  * 
  * class Annotator(_annotator_py.Annotator):             # <<<<<<<<<<<<<<
@@ -3022,7 +3022,7 @@
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":247
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":247
  *     """Class that drives performing annotations."""
  * 
  *     def _update_from_first_parent(self, key, annotations, lines, parent_key):             # <<<<<<<<<<<<<<
@@ -3037,7 +3037,7 @@
   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;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":256
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":256
  *                                   matching_blocks)
  * 
  *     def _update_from_other_parents(self, key, annotations, lines,             # <<<<<<<<<<<<<<
@@ -3052,7 +3052,7 @@
   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;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":265
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":265
  *                            matching_blocks, self._ann_tuple_cache)
  * 
  *     def annotate_flat(self, key):             # <<<<<<<<<<<<<<
@@ -3070,7 +3070,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_annotator_pyx.pyx":1
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":1
  * # Copyright (C) 2009, 2010 Canonical Ltd             # <<<<<<<<<<<<<<
  * #
  * # This program is free software; you can redistribute it and/or modify
 
=== modified file 'bzrlib/_bencode_pyx.c'
--- bzrlib/_bencode_pyx.c	2011-08-31 15:04:43 +0000
+++ bzrlib/_bencode_pyx.c	2011-11-03 14:37:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.13 on Thu Aug 11 09:45:14 2011 */
+/* Generated by Cython 0.13 on Mon Sep 19 20:18:38 2011 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -281,7 +281,7 @@
 
 /* Type declarations */
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":240
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":240
  * 
  * 
  * cdef enum:             # <<<<<<<<<<<<<<
@@ -294,7 +294,7 @@
   __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE = 32
 };
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":54
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":54
  *     int snprintf(char* buffer, size_t nsize, char* fmt, ...)
  * 
  * cdef class Decoder             # <<<<<<<<<<<<<<
@@ -311,7 +311,7 @@
   PyObject *text;
 };
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":55
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":55
  * 
  * cdef class Decoder
  * cdef class Encoder             # <<<<<<<<<<<<<<
@@ -329,7 +329,7 @@
 };
 
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":245
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":245
  * 
  * 
  * cdef class Encoder:             # <<<<<<<<<<<<<<
@@ -349,7 +349,7 @@
 static struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *__pyx_vtabptr_6bzrlib_12_bencode_pyx_Encoder;
 
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":69
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":69
  * 
  * 
  * cdef class Decoder:             # <<<<<<<<<<<<<<
@@ -636,7 +636,7 @@
 static PyObject *__pyx_int_0;
 static int __pyx_k_15;
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":72
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":72
  *     """Bencode decoder"""
  * 
  *     cdef readonly char *tail             # <<<<<<<<<<<<<<
@@ -668,7 +668,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":73
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":73
  * 
  *     cdef readonly char *tail
  *     cdef readonly int size             # <<<<<<<<<<<<<<
@@ -700,7 +700,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":74
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":74
  *     cdef readonly char *tail
  *     cdef readonly int size
  *     cdef readonly int _yield_tuples             # <<<<<<<<<<<<<<
@@ -732,7 +732,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":77
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":77
  *     cdef object text
  * 
  *     def __init__(self, s, yield_tuples=0):             # <<<<<<<<<<<<<<
@@ -799,7 +799,7 @@
   return -1;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":81
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":81
  *         @param  s:  Python string.
  *         """
  *         if not PyString_CheckExact(s):             # <<<<<<<<<<<<<<
@@ -809,7 +809,7 @@
   __pyx_t_1 = (!PyString_CheckExact(__pyx_v_s));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":82
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":82
  *         """
  *         if not PyString_CheckExact(s):
  *             raise TypeError("String required")             # <<<<<<<<<<<<<<
@@ -831,7 +831,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":84
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":84
  *             raise TypeError("String required")
  * 
  *         self.text = s             # <<<<<<<<<<<<<<
@@ -844,7 +844,7 @@
   __Pyx_DECREF(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text);
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text = __pyx_v_s;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":85
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":85
  * 
  *         self.text = s
  *         self.tail = PyString_AS_STRING(s)             # <<<<<<<<<<<<<<
@@ -854,7 +854,7 @@
   __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;}
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->tail = __pyx_t_4;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":86
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":86
  *         self.text = s
  *         self.tail = PyString_AS_STRING(s)
  *         self.size = PyString_GET_SIZE(s)             # <<<<<<<<<<<<<<
@@ -864,7 +864,7 @@
   __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;}
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size = __pyx_t_5;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":87
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":87
  *         self.tail = PyString_AS_STRING(s)
  *         self.size = PyString_GET_SIZE(s)
  *         self._yield_tuples = int(yield_tuples)             # <<<<<<<<<<<<<<
@@ -895,7 +895,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":89
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":89
  *         self._yield_tuples = int(yield_tuples)
  * 
  *     def decode(self):             # <<<<<<<<<<<<<<
@@ -913,7 +913,7 @@
   __Pyx_RefNannySetupContext("decode");
   __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":90
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":90
  * 
  *     def decode(self):
  *         result = self._decode_object()             # <<<<<<<<<<<<<<
@@ -926,7 +926,7 @@
   __pyx_v_result = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":91
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":91
  *     def decode(self):
  *         result = self._decode_object()
  *         if self.size != 0:             # <<<<<<<<<<<<<<
@@ -936,7 +936,7 @@
   __pyx_t_2 = (((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size != 0);
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":92
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":92
  *         result = self._decode_object()
  *         if self.size != 0:
  *             raise ValueError('junk in stream')             # <<<<<<<<<<<<<<
@@ -958,7 +958,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":93
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":93
  *         if self.size != 0:
  *             raise ValueError('junk in stream')
  *         return result             # <<<<<<<<<<<<<<
@@ -984,7 +984,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":95
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":95
  *         return result
  * 
  *     def decode_object(self):             # <<<<<<<<<<<<<<
@@ -998,7 +998,7 @@
   PyObject *__pyx_t_1 = NULL;
   __Pyx_RefNannySetupContext("decode_object");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":96
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":96
  * 
  *     def decode_object(self):
  *         return self._decode_object()             # <<<<<<<<<<<<<<
@@ -1024,7 +1024,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":98
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":98
  *         return self._decode_object()
  * 
  *     cdef object _decode_object(self):             # <<<<<<<<<<<<<<
@@ -1041,7 +1041,7 @@
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("_decode_object");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":101
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":101
  *         cdef char ch
  * 
  *         if 0 == self.size:             # <<<<<<<<<<<<<<
@@ -1051,7 +1051,7 @@
   __pyx_t_1 = (0 == __pyx_v_self->size);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":102
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":102
  * 
  *         if 0 == self.size:
  *             raise ValueError('stream underflow')             # <<<<<<<<<<<<<<
@@ -1073,7 +1073,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":104
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":104
  *             raise ValueError('stream underflow')
  * 
  *         if Py_EnterRecursiveCall("_decode_object"):             # <<<<<<<<<<<<<<
@@ -1083,7 +1083,7 @@
   __pyx_t_4 = Py_EnterRecursiveCall(__pyx_k___decode_object);
   if (__pyx_t_4) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":105
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":105
  * 
  *         if Py_EnterRecursiveCall("_decode_object"):
  *             raise RuntimeError("too deeply nested")             # <<<<<<<<<<<<<<
@@ -1105,7 +1105,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":106
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":106
  *         if Py_EnterRecursiveCall("_decode_object"):
  *             raise RuntimeError("too deeply nested")
  *         try:             # <<<<<<<<<<<<<<
@@ -1114,7 +1114,7 @@
  */
   /*try:*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":107
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":107
  *             raise RuntimeError("too deeply nested")
  *         try:
  *             ch = self.tail[0]             # <<<<<<<<<<<<<<
@@ -1123,7 +1123,7 @@
  */
     __pyx_v_ch = (__pyx_v_self->tail[0]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":108
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":108
  *         try:
  *             ch = self.tail[0]
  *             if c'0' <= ch <= c'9':             # <<<<<<<<<<<<<<
@@ -1136,7 +1136,7 @@
     }
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":109
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":109
  *             ch = self.tail[0]
  *             if c'0' <= ch <= c'9':
  *                 return self._decode_string()             # <<<<<<<<<<<<<<
@@ -1152,7 +1152,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":110
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":110
  *             if c'0' <= ch <= c'9':
  *                 return self._decode_string()
  *             elif ch == c'l':             # <<<<<<<<<<<<<<
@@ -1162,7 +1162,7 @@
     __pyx_t_1 = (__pyx_v_ch == 'l');
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":111
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":111
  *                 return self._decode_string()
  *             elif ch == c'l':
  *                 D_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -1171,7 +1171,7 @@
  */
       D_UPDATE_TAIL(__pyx_v_self, 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":112
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":112
  *             elif ch == c'l':
  *                 D_UPDATE_TAIL(self, 1)
  *                 return self._decode_list()             # <<<<<<<<<<<<<<
@@ -1187,7 +1187,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":113
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":113
  *                 D_UPDATE_TAIL(self, 1)
  *                 return self._decode_list()
  *             elif ch == c'i':             # <<<<<<<<<<<<<<
@@ -1197,7 +1197,7 @@
     __pyx_t_1 = (__pyx_v_ch == 'i');
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":114
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":114
  *                 return self._decode_list()
  *             elif ch == c'i':
  *                 D_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -1206,7 +1206,7 @@
  */
       D_UPDATE_TAIL(__pyx_v_self, 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":115
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":115
  *             elif ch == c'i':
  *                 D_UPDATE_TAIL(self, 1)
  *                 return self._decode_int()             # <<<<<<<<<<<<<<
@@ -1222,7 +1222,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":116
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":116
  *                 D_UPDATE_TAIL(self, 1)
  *                 return self._decode_int()
  *             elif ch == c'd':             # <<<<<<<<<<<<<<
@@ -1232,7 +1232,7 @@
     __pyx_t_1 = (__pyx_v_ch == 'd');
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":117
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":117
  *                 return self._decode_int()
  *             elif ch == c'd':
  *                 D_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -1241,7 +1241,7 @@
  */
       D_UPDATE_TAIL(__pyx_v_self, 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":118
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":118
  *             elif ch == c'd':
  *                 D_UPDATE_TAIL(self, 1)
  *                 return self._decode_dict()             # <<<<<<<<<<<<<<
@@ -1258,7 +1258,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":120
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":120
  *                 return self._decode_dict()
  *             else:
  *                 raise ValueError('unknown object type identifier %r' % ch)             # <<<<<<<<<<<<<<
@@ -1285,7 +1285,7 @@
     __pyx_L8:;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":122
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":122
  *                 raise ValueError('unknown object type identifier %r' % ch)
  *         finally:
  *             Py_LeaveRecursiveCall()             # <<<<<<<<<<<<<<
@@ -1336,7 +1336,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":124
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":124
  *             Py_LeaveRecursiveCall()
  * 
  *     cdef int _read_digits(self, char stop_char) except -1:             # <<<<<<<<<<<<<<
@@ -1356,7 +1356,7 @@
   int __pyx_t_7;
   __Pyx_RefNannySetupContext("_read_digits");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":126
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":126
  *     cdef int _read_digits(self, char stop_char) except -1:
  *         cdef int i
  *         i = 0             # <<<<<<<<<<<<<<
@@ -1365,7 +1365,7 @@
  */
   __pyx_v_i = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":127
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":127
  *         cdef int i
  *         i = 0
  *         while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or             # <<<<<<<<<<<<<<
@@ -1374,7 +1374,7 @@
  */
   while (1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":128
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":128
  *         i = 0
  *         while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
  *                self.tail[i] == c'-') and i < self.size:             # <<<<<<<<<<<<<<
@@ -1384,7 +1384,7 @@
     __pyx_t_1 = ((__pyx_v_self->tail[__pyx_v_i]) >= '0');
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":127
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":127
  *         cdef int i
  *         i = 0
  *         while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or             # <<<<<<<<<<<<<<
@@ -1398,7 +1398,7 @@
     }
     if (!__pyx_t_3) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":128
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":128
  *         i = 0
  *         while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
  *                self.tail[i] == c'-') and i < self.size:             # <<<<<<<<<<<<<<
@@ -1418,7 +1418,7 @@
     }
     if (!__pyx_t_1) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":129
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":129
  *         while ((self.tail[i] >= c'0' and self.tail[i] <= c'9') or
  *                self.tail[i] == c'-') and i < self.size:
  *             i = i + 1             # <<<<<<<<<<<<<<
@@ -1428,7 +1428,7 @@
     __pyx_v_i = (__pyx_v_i + 1);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":131
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":131
  *             i = i + 1
  * 
  *         if self.tail[i] != stop_char:             # <<<<<<<<<<<<<<
@@ -1438,7 +1438,7 @@
   __pyx_t_1 = ((__pyx_v_self->tail[__pyx_v_i]) != __pyx_v_stop_char);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":133
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":133
  *         if self.tail[i] != stop_char:
  *             raise ValueError("Stop character %c not found: %c" %
  *                 (stop_char, self.tail[i]))             # <<<<<<<<<<<<<<
@@ -1475,7 +1475,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":134
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":134
  *             raise ValueError("Stop character %c not found: %c" %
  *                 (stop_char, self.tail[i]))
  *         if (self.tail[0] == c'0' or             # <<<<<<<<<<<<<<
@@ -1485,7 +1485,7 @@
   __pyx_t_1 = ((__pyx_v_self->tail[0]) == '0');
   if (!__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":135
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":135
  *                 (stop_char, self.tail[i]))
  *         if (self.tail[0] == c'0' or
  *                 (self.tail[0] == c'-' and self.tail[1] == c'0')):             # <<<<<<<<<<<<<<
@@ -1505,7 +1505,7 @@
   }
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":136
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":136
  *         if (self.tail[0] == c'0' or
  *                 (self.tail[0] == c'-' and self.tail[1] == c'0')):
  *             if i == 1:             # <<<<<<<<<<<<<<
@@ -1515,7 +1515,7 @@
     __pyx_t_2 = (__pyx_v_i == 1);
     if (__pyx_t_2) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":137
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":137
  *                 (self.tail[0] == c'-' and self.tail[1] == c'0')):
  *             if i == 1:
  *                 return i             # <<<<<<<<<<<<<<
@@ -1528,7 +1528,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":139
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":139
  *                 return i
  *             else:
  *                 raise ValueError # leading zeroes are not allowed             # <<<<<<<<<<<<<<
@@ -1543,7 +1543,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":140
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":140
  *             else:
  *                 raise ValueError # leading zeroes are not allowed
  *         return i             # <<<<<<<<<<<<<<
@@ -1566,7 +1566,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":142
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":142
  *         return i
  * 
  *     cdef object _decode_int(self):             # <<<<<<<<<<<<<<
@@ -1583,7 +1583,7 @@
   __Pyx_RefNannySetupContext("_decode_int");
   __pyx_v_ret = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":144
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":144
  *     cdef object _decode_int(self):
  *         cdef int i
  *         i = self._read_digits(c'e')             # <<<<<<<<<<<<<<
@@ -1593,7 +1593,7 @@
   __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;}
   __pyx_v_i = __pyx_t_1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":145
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":145
  *         cdef int i
  *         i = self._read_digits(c'e')
  *         self.tail[i] = 0             # <<<<<<<<<<<<<<
@@ -1602,7 +1602,7 @@
  */
   (__pyx_v_self->tail[__pyx_v_i]) = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":146
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":146
  *         i = self._read_digits(c'e')
  *         self.tail[i] = 0
  *         try:             # <<<<<<<<<<<<<<
@@ -1611,7 +1611,7 @@
  */
   /*try:*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":147
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":147
  *         self.tail[i] = 0
  *         try:
  *             ret = PyInt_FromString(self.tail, NULL, 10)             # <<<<<<<<<<<<<<
@@ -1625,7 +1625,7 @@
     __pyx_t_2 = 0;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":149
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":149
  *             ret = PyInt_FromString(self.tail, NULL, 10)
  *         finally:
  *             self.tail[i] = c'e'             # <<<<<<<<<<<<<<
@@ -1659,7 +1659,7 @@
     }
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":150
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":150
  *         finally:
  *             self.tail[i] = c'e'
  *         D_UPDATE_TAIL(self, i+1)             # <<<<<<<<<<<<<<
@@ -1668,7 +1668,7 @@
  */
   D_UPDATE_TAIL(__pyx_v_self, (__pyx_v_i + 1));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":151
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":151
  *             self.tail[i] = c'e'
  *         D_UPDATE_TAIL(self, i+1)
  *         return ret             # <<<<<<<<<<<<<<
@@ -1693,7 +1693,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":153
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":153
  *         return ret
  * 
  *     cdef object _decode_string(self):             # <<<<<<<<<<<<<<
@@ -1715,7 +1715,7 @@
   __Pyx_RefNannySetupContext("_decode_string");
   __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":160
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":160
  *         # or they wouldn't have called _decode_string
  *         # strtol will stop at trailing whitespace, etc
  *         n = strtol(self.tail, &next_tail, 10)             # <<<<<<<<<<<<<<
@@ -1724,7 +1724,7 @@
  */
   __pyx_v_n = strtol(__pyx_v_self->tail, (&__pyx_v_next_tail), 10);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":161
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":161
  *         # strtol will stop at trailing whitespace, etc
  *         n = strtol(self.tail, &next_tail, 10)
  *         if next_tail == NULL or next_tail[0] != c':':             # <<<<<<<<<<<<<<
@@ -1740,7 +1740,7 @@
   }
   if (__pyx_t_3) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":162
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":162
  *         n = strtol(self.tail, &next_tail, 10)
  *         if next_tail == NULL or next_tail[0] != c':':
  *             raise ValueError('string len not terminated by ":"')             # <<<<<<<<<<<<<<
@@ -1762,7 +1762,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":164
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":164
  *             raise ValueError('string len not terminated by ":"')
  *         # strtol allows leading zeros, so validate that we don't have that
  *         if (self.tail[0] == c'0'             # <<<<<<<<<<<<<<
@@ -1772,7 +1772,7 @@
   __pyx_t_3 = ((__pyx_v_self->tail[0]) == '0');
   if (__pyx_t_3) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":165
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":165
  *         # strtol allows leading zeros, so validate that we don't have that
  *         if (self.tail[0] == c'0'
  *             and (n != 0 or (next_tail - self.tail != 1))):             # <<<<<<<<<<<<<<
@@ -1792,7 +1792,7 @@
   }
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":166
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":166
  *         if (self.tail[0] == c'0'
  *             and (n != 0 or (next_tail - self.tail != 1))):
  *             raise ValueError('leading zeros are not allowed')             # <<<<<<<<<<<<<<
@@ -1814,7 +1814,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":167
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":167
  *             and (n != 0 or (next_tail - self.tail != 1))):
  *             raise ValueError('leading zeros are not allowed')
  *         D_UPDATE_TAIL(self, next_tail - self.tail + 1)             # <<<<<<<<<<<<<<
@@ -1823,7 +1823,7 @@
  */
   D_UPDATE_TAIL(__pyx_v_self, ((__pyx_v_next_tail - __pyx_v_self->tail) + 1));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":168
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":168
  *             raise ValueError('leading zeros are not allowed')
  *         D_UPDATE_TAIL(self, next_tail - self.tail + 1)
  *         if n == 0:             # <<<<<<<<<<<<<<
@@ -1833,7 +1833,7 @@
   __pyx_t_1 = (__pyx_v_n == 0);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":169
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":169
  *         D_UPDATE_TAIL(self, next_tail - self.tail + 1)
  *         if n == 0:
  *             return ''             # <<<<<<<<<<<<<<
@@ -1848,7 +1848,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":170
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":170
  *         if n == 0:
  *             return ''
  *         if n > self.size:             # <<<<<<<<<<<<<<
@@ -1858,7 +1858,7 @@
   __pyx_t_1 = (__pyx_v_n > __pyx_v_self->size);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":171
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":171
  *             return ''
  *         if n > self.size:
  *             raise ValueError('stream underflow')             # <<<<<<<<<<<<<<
@@ -1880,7 +1880,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":172
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":172
  *         if n > self.size:
  *             raise ValueError('stream underflow')
  *         if n < 0:             # <<<<<<<<<<<<<<
@@ -1890,7 +1890,7 @@
   __pyx_t_1 = (__pyx_v_n < 0);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":173
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":173
  *             raise ValueError('stream underflow')
  *         if n < 0:
  *             raise ValueError('string size below zero: %d' % n)             # <<<<<<<<<<<<<<
@@ -1917,7 +1917,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":175
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":175
  *             raise ValueError('string size below zero: %d' % n)
  * 
  *         result = PyString_FromStringAndSize(self.tail, n)             # <<<<<<<<<<<<<<
@@ -1930,7 +1930,7 @@
   __pyx_v_result = __pyx_t_4;
   __pyx_t_4 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":176
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":176
  * 
  *         result = PyString_FromStringAndSize(self.tail, n)
  *         D_UPDATE_TAIL(self, n)             # <<<<<<<<<<<<<<
@@ -1939,7 +1939,7 @@
  */
   D_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":177
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":177
  *         result = PyString_FromStringAndSize(self.tail, n)
  *         D_UPDATE_TAIL(self, n)
  *         return result             # <<<<<<<<<<<<<<
@@ -1965,7 +1965,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":179
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":179
  *         return result
  * 
  *     cdef object _decode_list(self):             # <<<<<<<<<<<<<<
@@ -1983,7 +1983,7 @@
   __Pyx_RefNannySetupContext("_decode_list");
   __pyx_v_result = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":180
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":180
  * 
  *     cdef object _decode_list(self):
  *         result = []             # <<<<<<<<<<<<<<
@@ -1996,7 +1996,7 @@
   __pyx_v_result = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":182
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":182
  *         result = []
  * 
  *         while self.size > 0:             # <<<<<<<<<<<<<<
@@ -2007,7 +2007,7 @@
     __pyx_t_2 = (__pyx_v_self->size > 0);
     if (!__pyx_t_2) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":183
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":183
  * 
  *         while self.size > 0:
  *             if self.tail[0] == c'e':             # <<<<<<<<<<<<<<
@@ -2017,7 +2017,7 @@
     __pyx_t_2 = ((__pyx_v_self->tail[0]) == 'e');
     if (__pyx_t_2) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":184
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":184
  *         while self.size > 0:
  *             if self.tail[0] == c'e':
  *                 D_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -2026,7 +2026,7 @@
  */
       D_UPDATE_TAIL(__pyx_v_self, 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":185
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":185
  *             if self.tail[0] == c'e':
  *                 D_UPDATE_TAIL(self, 1)
  *                 if self._yield_tuples:             # <<<<<<<<<<<<<<
@@ -2035,7 +2035,7 @@
  */
       if (__pyx_v_self->_yield_tuples) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":186
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":186
  *                 D_UPDATE_TAIL(self, 1)
  *                 if self._yield_tuples:
  *                     return tuple(result)             # <<<<<<<<<<<<<<
@@ -2055,7 +2055,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":188
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":188
  *                     return tuple(result)
  *                 else:
  *                     return result             # <<<<<<<<<<<<<<
@@ -2072,7 +2072,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":193
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":193
  *                 # string, since we know that won't be creating recursion
  *                 # if self.tail[0] >= c'0' and self.tail[0] <= c'9':
  *                 PyList_Append(result, self._decode_object())             # <<<<<<<<<<<<<<
@@ -2087,7 +2087,7 @@
     __pyx_L5:;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":195
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":195
  *                 PyList_Append(result, self._decode_object())
  * 
  *         raise ValueError('malformed list')             # <<<<<<<<<<<<<<
@@ -2120,7 +2120,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":197
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":197
  *         raise ValueError('malformed list')
  * 
  *     cdef object _decode_dict(self):             # <<<<<<<<<<<<<<
@@ -2146,7 +2146,7 @@
   __pyx_v_key = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_value = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":200
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":200
  *         cdef char ch
  * 
  *         result = {}             # <<<<<<<<<<<<<<
@@ -2159,7 +2159,7 @@
   __pyx_v_result = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":201
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":201
  * 
  *         result = {}
  *         lastkey = None             # <<<<<<<<<<<<<<
@@ -2170,7 +2170,7 @@
   __Pyx_DECREF(__pyx_v_lastkey);
   __pyx_v_lastkey = Py_None;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":203
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":203
  *         lastkey = None
  * 
  *         while self.size > 0:             # <<<<<<<<<<<<<<
@@ -2181,7 +2181,7 @@
     __pyx_t_2 = (__pyx_v_self->size > 0);
     if (!__pyx_t_2) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":204
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":204
  * 
  *         while self.size > 0:
  *             ch = self.tail[0]             # <<<<<<<<<<<<<<
@@ -2190,7 +2190,7 @@
  */
     __pyx_v_ch = (__pyx_v_self->tail[0]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":205
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":205
  *         while self.size > 0:
  *             ch = self.tail[0]
  *             if ch == c'e':             # <<<<<<<<<<<<<<
@@ -2200,7 +2200,7 @@
     __pyx_t_2 = (__pyx_v_ch == 'e');
     if (__pyx_t_2) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":206
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":206
  *             ch = self.tail[0]
  *             if ch == c'e':
  *                 D_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -2209,7 +2209,7 @@
  */
       D_UPDATE_TAIL(__pyx_v_self, 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":207
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":207
  *             if ch == c'e':
  *                 D_UPDATE_TAIL(self, 1)
  *                 return result             # <<<<<<<<<<<<<<
@@ -2224,7 +2224,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":210
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":210
  *             else:
  *                 # keys should be strings only
  *                 if self.tail[0] < c'0' or self.tail[0] > c'9':             # <<<<<<<<<<<<<<
@@ -2240,7 +2240,7 @@
       }
       if (__pyx_t_4) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":211
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":211
  *                 # keys should be strings only
  *                 if self.tail[0] < c'0' or self.tail[0] > c'9':
  *                     raise ValueError('key was not a simple string.')             # <<<<<<<<<<<<<<
@@ -2262,7 +2262,7 @@
       }
       __pyx_L6:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":212
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":212
  *                 if self.tail[0] < c'0' or self.tail[0] > c'9':
  *                     raise ValueError('key was not a simple string.')
  *                 key = self._decode_string()             # <<<<<<<<<<<<<<
@@ -2275,7 +2275,7 @@
       __pyx_v_key = __pyx_t_5;
       __pyx_t_5 = 0;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":213
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":213
  *                     raise ValueError('key was not a simple string.')
  *                 key = self._decode_string()
  *                 if lastkey >= key:             # <<<<<<<<<<<<<<
@@ -2288,7 +2288,7 @@
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       if (__pyx_t_4) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":214
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":214
  *                 key = self._decode_string()
  *                 if lastkey >= key:
  *                     raise ValueError('dict keys disordered')             # <<<<<<<<<<<<<<
@@ -2310,7 +2310,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":216
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":216
  *                     raise ValueError('dict keys disordered')
  *                 else:
  *                     lastkey = key             # <<<<<<<<<<<<<<
@@ -2323,7 +2323,7 @@
       }
       __pyx_L7:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":217
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":217
  *                 else:
  *                     lastkey = key
  *                 value = self._decode_object()             # <<<<<<<<<<<<<<
@@ -2336,7 +2336,7 @@
       __pyx_v_value = __pyx_t_1;
       __pyx_t_1 = 0;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":218
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":218
  *                     lastkey = key
  *                 value = self._decode_object()
  *                 result[key] = value             # <<<<<<<<<<<<<<
@@ -2348,7 +2348,7 @@
     __pyx_L5:;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":220
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":220
  *                 result[key] = value
  * 
  *         raise ValueError('malformed dict')             # <<<<<<<<<<<<<<
@@ -2384,7 +2384,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":223
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":223
  * 
  * 
  * def bdecode(object s):             # <<<<<<<<<<<<<<
@@ -2401,7 +2401,7 @@
   __Pyx_RefNannySetupContext("bdecode");
   __pyx_self = __pyx_self;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":225
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":225
  * def bdecode(object s):
  *     """Decode string x to Python object"""
  *     return Decoder(s).decode()             # <<<<<<<<<<<<<<
@@ -2440,7 +2440,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":228
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":228
  * 
  * 
  * def bdecode_as_tuple(object s):             # <<<<<<<<<<<<<<
@@ -2457,7 +2457,7 @@
   __Pyx_RefNannySetupContext("bdecode_as_tuple");
   __pyx_self = __pyx_self;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":230
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":230
  * def bdecode_as_tuple(object s):
  *     """Decode string x to Python object, using tuples rather than lists."""
  *     return Decoder(s, True).decode()             # <<<<<<<<<<<<<<
@@ -2501,7 +2501,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":236
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":236
  *     __slots__ = ['bencoded']
  * 
  *     def __init__(self, s):             # <<<<<<<<<<<<<<
@@ -2559,7 +2559,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":237
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":237
  * 
  *     def __init__(self, s):
  *         self.bencoded = s             # <<<<<<<<<<<<<<
@@ -2579,7 +2579,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":248
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":248
  *     """Bencode encoder"""
  * 
  *     cdef readonly char *tail             # <<<<<<<<<<<<<<
@@ -2611,7 +2611,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":249
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":249
  * 
  *     cdef readonly char *tail
  *     cdef readonly int size             # <<<<<<<<<<<<<<
@@ -2643,7 +2643,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":250
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":250
  *     cdef readonly char *tail
  *     cdef readonly int size
  *     cdef readonly char *buffer             # <<<<<<<<<<<<<<
@@ -2675,7 +2675,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":251
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":251
  *     cdef readonly int size
  *     cdef readonly char *buffer
  *     cdef readonly int maxsize             # <<<<<<<<<<<<<<
@@ -2707,7 +2707,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":253
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":253
  *     cdef readonly int maxsize
  * 
  *     def __init__(self, int maxsize=INITSIZE):             # <<<<<<<<<<<<<<
@@ -2767,7 +2767,7 @@
   return -1;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":259
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":259
  *         cdef char *p
  * 
  *         self.maxsize = 0             # <<<<<<<<<<<<<<
@@ -2776,7 +2776,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":260
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":260
  * 
  *         self.maxsize = 0
  *         self.size = 0             # <<<<<<<<<<<<<<
@@ -2785,7 +2785,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->size = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":261
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":261
  *         self.maxsize = 0
  *         self.size = 0
  *         self.tail = NULL             # <<<<<<<<<<<<<<
@@ -2794,7 +2794,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = NULL;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":263
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":263
  *         self.tail = NULL
  * 
  *         p = <char*>malloc(maxsize)             # <<<<<<<<<<<<<<
@@ -2803,7 +2803,7 @@
  */
   __pyx_v_p = ((char *)malloc(__pyx_v_maxsize));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":264
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":264
  * 
  *         p = <char*>malloc(maxsize)
  *         if p == NULL:             # <<<<<<<<<<<<<<
@@ -2813,7 +2813,7 @@
   __pyx_t_1 = (__pyx_v_p == NULL);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":265
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":265
  *         p = <char*>malloc(maxsize)
  *         if p == NULL:
  *             raise MemoryError('Not enough memory to allocate buffer '             # <<<<<<<<<<<<<<
@@ -2835,7 +2835,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":267
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":267
  *             raise MemoryError('Not enough memory to allocate buffer '
  *                               'for encoder')
  *         self.buffer = p             # <<<<<<<<<<<<<<
@@ -2844,7 +2844,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = __pyx_v_p;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":268
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":268
  *                               'for encoder')
  *         self.buffer = p
  *         self.maxsize = maxsize             # <<<<<<<<<<<<<<
@@ -2853,7 +2853,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = __pyx_v_maxsize;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":269
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":269
  *         self.buffer = p
  *         self.maxsize = maxsize
  *         self.tail = p             # <<<<<<<<<<<<<<
@@ -2874,7 +2874,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":271
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":271
  *         self.tail = p
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -2886,7 +2886,7 @@
 static void __pyx_pf_6bzrlib_12_bencode_pyx_7Encoder___dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannySetupContext("__dealloc__");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":272
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":272
  * 
  *     def __dealloc__(self):
  *         free(self.buffer)             # <<<<<<<<<<<<<<
@@ -2895,7 +2895,7 @@
  */
   free(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":273
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":273
  *     def __dealloc__(self):
  *         free(self.buffer)
  *         self.buffer = NULL             # <<<<<<<<<<<<<<
@@ -2904,7 +2904,7 @@
  */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = NULL;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":274
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":274
  *         free(self.buffer)
  *         self.buffer = NULL
  *         self.maxsize = 0             # <<<<<<<<<<<<<<
@@ -2916,7 +2916,7 @@
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":276
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":276
  *         self.maxsize = 0
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -2933,7 +2933,7 @@
   PyObject *__pyx_t_4 = NULL;
   __Pyx_RefNannySetupContext("__str__");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":277
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":277
  * 
  *     def __str__(self):
  *         if self.buffer != NULL and self.size != 0:             # <<<<<<<<<<<<<<
@@ -2949,7 +2949,7 @@
   }
   if (__pyx_t_3) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":278
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":278
  *     def __str__(self):
  *         if self.buffer != NULL and self.size != 0:
  *             return PyString_FromStringAndSize(self.buffer, self.size)             # <<<<<<<<<<<<<<
@@ -2966,7 +2966,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":280
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":280
  *             return PyString_FromStringAndSize(self.buffer, self.size)
  *         else:
  *             return ''             # <<<<<<<<<<<<<<
@@ -2992,7 +2992,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":282
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":282
  *             return ''
  * 
  *     cdef int _ensure_buffer(self, int required) except 0:             # <<<<<<<<<<<<<<
@@ -3009,7 +3009,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("_ensure_buffer");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":290
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":290
  *         cdef int   new_size
  * 
  *         if self.size + required < self.maxsize:             # <<<<<<<<<<<<<<
@@ -3019,7 +3019,7 @@
   __pyx_t_1 = ((__pyx_v_self->size + __pyx_v_required) < __pyx_v_self->maxsize);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":291
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":291
  * 
  *         if self.size + required < self.maxsize:
  *             return 1             # <<<<<<<<<<<<<<
@@ -3032,7 +3032,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":293
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":293
  *             return 1
  * 
  *         new_size = self.maxsize             # <<<<<<<<<<<<<<
@@ -3041,7 +3041,7 @@
  */
   __pyx_v_new_size = __pyx_v_self->maxsize;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":294
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":294
  * 
  *         new_size = self.maxsize
  *         while new_size < self.size + required:             # <<<<<<<<<<<<<<
@@ -3052,7 +3052,7 @@
     __pyx_t_1 = (__pyx_v_new_size < (__pyx_v_self->size + __pyx_v_required));
     if (!__pyx_t_1) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":295
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":295
  *         new_size = self.maxsize
  *         while new_size < self.size + required:
  *             new_size = new_size * 2             # <<<<<<<<<<<<<<
@@ -3062,7 +3062,7 @@
     __pyx_v_new_size = (__pyx_v_new_size * 2);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":296
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":296
  *         while new_size < self.size + required:
  *             new_size = new_size * 2
  *         new_buffer = <char*>realloc(self.buffer, <size_t>new_size)             # <<<<<<<<<<<<<<
@@ -3071,7 +3071,7 @@
  */
   __pyx_v_new_buffer = ((char *)realloc(__pyx_v_self->buffer, ((size_t)__pyx_v_new_size)));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":297
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":297
  *             new_size = new_size * 2
  *         new_buffer = <char*>realloc(self.buffer, <size_t>new_size)
  *         if new_buffer == NULL:             # <<<<<<<<<<<<<<
@@ -3081,7 +3081,7 @@
   __pyx_t_1 = (__pyx_v_new_buffer == NULL);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":298
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":298
  *         new_buffer = <char*>realloc(self.buffer, <size_t>new_size)
  *         if new_buffer == NULL:
  *             raise MemoryError('Cannot realloc buffer for encoder')             # <<<<<<<<<<<<<<
@@ -3103,7 +3103,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":300
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":300
  *             raise MemoryError('Cannot realloc buffer for encoder')
  * 
  *         self.buffer = new_buffer             # <<<<<<<<<<<<<<
@@ -3112,7 +3112,7 @@
  */
   __pyx_v_self->buffer = __pyx_v_new_buffer;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":301
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":301
  * 
  *         self.buffer = new_buffer
  *         self.maxsize = new_size             # <<<<<<<<<<<<<<
@@ -3121,7 +3121,7 @@
  */
   __pyx_v_self->maxsize = __pyx_v_new_size;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":302
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":302
  *         self.buffer = new_buffer
  *         self.maxsize = new_size
  *         self.tail = &new_buffer[self.size]             # <<<<<<<<<<<<<<
@@ -3130,7 +3130,7 @@
  */
   __pyx_v_self->tail = (&(__pyx_v_new_buffer[__pyx_v_self->size]));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":303
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":303
  *         self.maxsize = new_size
  *         self.tail = &new_buffer[self.size]
  *         return 1             # <<<<<<<<<<<<<<
@@ -3152,7 +3152,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":305
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":305
  *         return 1
  * 
  *     cdef int _encode_int(self, int x) except 0:             # <<<<<<<<<<<<<<
@@ -3169,7 +3169,7 @@
   PyObject *__pyx_t_4 = NULL;
   __Pyx_RefNannySetupContext("_encode_int");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":310
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":310
  *         """
  *         cdef int n
  *         self._ensure_buffer(INT_BUF_SIZE)             # <<<<<<<<<<<<<<
@@ -3178,7 +3178,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":311
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":311
  *         cdef int n
  *         self._ensure_buffer(INT_BUF_SIZE)
  *         n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x)             # <<<<<<<<<<<<<<
@@ -3187,7 +3187,7 @@
  */
   __pyx_v_n = snprintf(__pyx_v_self->tail, __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE, __pyx_k_18, __pyx_v_x);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":312
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":312
  *         self._ensure_buffer(INT_BUF_SIZE)
  *         n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x)
  *         if n < 0:             # <<<<<<<<<<<<<<
@@ -3197,7 +3197,7 @@
   __pyx_t_2 = (__pyx_v_n < 0);
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":313
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":313
  *         n = snprintf(self.tail, INT_BUF_SIZE, "i%de", x)
  *         if n < 0:
  *             raise MemoryError('int %d too big to encode' % x)             # <<<<<<<<<<<<<<
@@ -3224,7 +3224,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":314
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":314
  *         if n < 0:
  *             raise MemoryError('int %d too big to encode' % x)
  *         E_UPDATE_TAIL(self, n)             # <<<<<<<<<<<<<<
@@ -3233,7 +3233,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":315
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":315
  *             raise MemoryError('int %d too big to encode' % x)
  *         E_UPDATE_TAIL(self, n)
  *         return 1             # <<<<<<<<<<<<<<
@@ -3255,7 +3255,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":317
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":317
  *         return 1
  * 
  *     cdef int _encode_long(self, x) except 0:             # <<<<<<<<<<<<<<
@@ -3271,7 +3271,7 @@
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("_encode_long");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":318
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":318
  * 
  *     cdef int _encode_long(self, x) except 0:
  *         return self._append_string(''.join(('i', str(x), 'e')))             # <<<<<<<<<<<<<<
@@ -3326,7 +3326,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":320
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":320
  *         return self._append_string(''.join(('i', str(x), 'e')))
  * 
  *     cdef int _append_string(self, s) except 0:             # <<<<<<<<<<<<<<
@@ -3342,7 +3342,7 @@
   char *__pyx_t_3;
   __Pyx_RefNannySetupContext("_append_string");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":322
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":322
  *     cdef int _append_string(self, s) except 0:
  *         cdef Py_ssize_t n
  *         n = PyString_GET_SIZE(s)             # <<<<<<<<<<<<<<
@@ -3352,7 +3352,7 @@
   __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;}
   __pyx_v_n = __pyx_t_1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":323
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":323
  *         cdef Py_ssize_t n
  *         n = PyString_GET_SIZE(s)
  *         self._ensure_buffer(n)             # <<<<<<<<<<<<<<
@@ -3361,7 +3361,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":324
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":324
  *         n = PyString_GET_SIZE(s)
  *         self._ensure_buffer(n)
  *         memcpy(self.tail, PyString_AS_STRING(s), n)             # <<<<<<<<<<<<<<
@@ -3371,7 +3371,7 @@
   __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;}
   memcpy(__pyx_v_self->tail, __pyx_t_3, __pyx_v_n);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":325
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":325
  *         self._ensure_buffer(n)
  *         memcpy(self.tail, PyString_AS_STRING(s), n)
  *         E_UPDATE_TAIL(self, n)             # <<<<<<<<<<<<<<
@@ -3380,7 +3380,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, __pyx_v_n);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":326
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":326
  *         memcpy(self.tail, PyString_AS_STRING(s), n)
  *         E_UPDATE_TAIL(self, n)
  *         return 1             # <<<<<<<<<<<<<<
@@ -3400,7 +3400,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":328
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":328
  *         return 1
  * 
  *     cdef int _encode_string(self, x) except 0:             # <<<<<<<<<<<<<<
@@ -3420,7 +3420,7 @@
   char *__pyx_t_6;
   __Pyx_RefNannySetupContext("_encode_string");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":331
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":331
  *         cdef int n
  *         cdef Py_ssize_t x_len
  *         x_len = PyString_GET_SIZE(x)             # <<<<<<<<<<<<<<
@@ -3430,7 +3430,7 @@
   __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;}
   __pyx_v_x_len = __pyx_t_1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":332
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":332
  *         cdef Py_ssize_t x_len
  *         x_len = PyString_GET_SIZE(x)
  *         self._ensure_buffer(x_len + INT_BUF_SIZE)             # <<<<<<<<<<<<<<
@@ -3439,7 +3439,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":333
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":333
  *         x_len = PyString_GET_SIZE(x)
  *         self._ensure_buffer(x_len + INT_BUF_SIZE)
  *         n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len)             # <<<<<<<<<<<<<<
@@ -3448,7 +3448,7 @@
  */
   __pyx_v_n = snprintf(__pyx_v_self->tail, __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE, __pyx_k_20, __pyx_v_x_len);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":334
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":334
  *         self._ensure_buffer(x_len + INT_BUF_SIZE)
  *         n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len)
  *         if n < 0:             # <<<<<<<<<<<<<<
@@ -3458,7 +3458,7 @@
   __pyx_t_3 = (__pyx_v_n < 0);
   if (__pyx_t_3) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":335
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":335
  *         n = snprintf(self.tail, INT_BUF_SIZE, '%d:', x_len)
  *         if n < 0:
  *             raise MemoryError('string %s too big to encode' % x)             # <<<<<<<<<<<<<<
@@ -3482,7 +3482,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":336
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":336
  *         if n < 0:
  *             raise MemoryError('string %s too big to encode' % x)
  *         memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len)             # <<<<<<<<<<<<<<
@@ -3492,7 +3492,7 @@
   __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;}
   memcpy(((void *)(__pyx_v_self->tail + __pyx_v_n)), __pyx_t_6, __pyx_v_x_len);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":337
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":337
  *             raise MemoryError('string %s too big to encode' % x)
  *         memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len)
  *         E_UPDATE_TAIL(self, n + x_len)             # <<<<<<<<<<<<<<
@@ -3501,7 +3501,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, (__pyx_v_n + __pyx_v_x_len));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":338
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":338
  *         memcpy(<void *>(self.tail+n), PyString_AS_STRING(x), x_len)
  *         E_UPDATE_TAIL(self, n + x_len)
  *         return 1             # <<<<<<<<<<<<<<
@@ -3523,7 +3523,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":340
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":340
  *         return 1
  * 
  *     cdef int _encode_list(self, x) except 0:             # <<<<<<<<<<<<<<
@@ -3543,7 +3543,7 @@
   __Pyx_RefNannySetupContext("_encode_list");
   __pyx_v_i = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":341
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":341
  * 
  *     cdef int _encode_list(self, x) except 0:
  *         self._ensure_buffer(1)             # <<<<<<<<<<<<<<
@@ -3552,7 +3552,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":342
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":342
  *     cdef int _encode_list(self, x) except 0:
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'l'             # <<<<<<<<<<<<<<
@@ -3561,7 +3561,7 @@
  */
   (__pyx_v_self->tail[0]) = 'l';
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":343
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":343
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'l'
  *         E_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -3570,7 +3570,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":345
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":345
  *         E_UPDATE_TAIL(self, 1)
  * 
  *         for i in x:             # <<<<<<<<<<<<<<
@@ -3602,7 +3602,7 @@
     __pyx_v_i = __pyx_t_4;
     __pyx_t_4 = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":346
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":346
  * 
  *         for i in x:
  *             self.process(i)             # <<<<<<<<<<<<<<
@@ -3624,7 +3624,7 @@
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":348
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":348
  *             self.process(i)
  * 
  *         self._ensure_buffer(1)             # <<<<<<<<<<<<<<
@@ -3633,7 +3633,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":349
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":349
  * 
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'e'             # <<<<<<<<<<<<<<
@@ -3642,7 +3642,7 @@
  */
   (__pyx_v_self->tail[0]) = 'e';
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":350
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":350
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'e'
  *         E_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -3651,7 +3651,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":351
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":351
  *         self.tail[0] = c'e'
  *         E_UPDATE_TAIL(self, 1)
  *         return 1             # <<<<<<<<<<<<<<
@@ -3676,7 +3676,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":353
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":353
  *         return 1
  * 
  *     cdef int _encode_dict(self, x) except 0:             # <<<<<<<<<<<<<<
@@ -3699,7 +3699,7 @@
   __pyx_v_keys = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_k = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":354
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":354
  * 
  *     cdef int _encode_dict(self, x) except 0:
  *         self._ensure_buffer(1)             # <<<<<<<<<<<<<<
@@ -3708,7 +3708,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":355
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":355
  *     cdef int _encode_dict(self, x) except 0:
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'd'             # <<<<<<<<<<<<<<
@@ -3717,7 +3717,7 @@
  */
   (__pyx_v_self->tail[0]) = 'd';
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":356
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":356
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'd'
  *         E_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -3726,7 +3726,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":358
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":358
  *         E_UPDATE_TAIL(self, 1)
  * 
  *         keys = x.keys()             # <<<<<<<<<<<<<<
@@ -3742,7 +3742,7 @@
   __pyx_v_keys = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":359
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":359
  * 
  *         keys = x.keys()
  *         keys.sort()             # <<<<<<<<<<<<<<
@@ -3756,7 +3756,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":360
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":360
  *         keys = x.keys()
  *         keys.sort()
  *         for k in keys:             # <<<<<<<<<<<<<<
@@ -3788,7 +3788,7 @@
     __pyx_v_k = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":361
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":361
  *         keys.sort()
  *         for k in keys:
  *             if not PyString_CheckExact(k):             # <<<<<<<<<<<<<<
@@ -3798,7 +3798,7 @@
     __pyx_t_5 = (!PyString_CheckExact(__pyx_v_k));
     if (__pyx_t_5) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":362
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":362
  *         for k in keys:
  *             if not PyString_CheckExact(k):
  *                 raise TypeError('key in dict should be string')             # <<<<<<<<<<<<<<
@@ -3820,7 +3820,7 @@
     }
     __pyx_L5:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":363
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":363
  *             if not PyString_CheckExact(k):
  *                 raise TypeError('key in dict should be string')
  *             self._encode_string(k)             # <<<<<<<<<<<<<<
@@ -3829,7 +3829,7 @@
  */
     __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;}
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":364
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":364
  *                 raise TypeError('key in dict should be string')
  *             self._encode_string(k)
  *             self.process(x[k])             # <<<<<<<<<<<<<<
@@ -3853,7 +3853,7 @@
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":366
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":366
  *             self.process(x[k])
  * 
  *         self._ensure_buffer(1)             # <<<<<<<<<<<<<<
@@ -3862,7 +3862,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":367
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":367
  * 
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'e'             # <<<<<<<<<<<<<<
@@ -3871,7 +3871,7 @@
  */
   (__pyx_v_self->tail[0]) = 'e';
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":368
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":368
  *         self._ensure_buffer(1)
  *         self.tail[0] = c'e'
  *         E_UPDATE_TAIL(self, 1)             # <<<<<<<<<<<<<<
@@ -3880,7 +3880,7 @@
  */
   E_UPDATE_TAIL(__pyx_v_self, 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":369
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":369
  *         self.tail[0] = c'e'
  *         E_UPDATE_TAIL(self, 1)
  *         return 1             # <<<<<<<<<<<<<<
@@ -3906,7 +3906,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":371
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":371
  *         return 1
  * 
  *     def process(self, object x):             # <<<<<<<<<<<<<<
@@ -3926,7 +3926,7 @@
   int __pyx_t_7;
   __Pyx_RefNannySetupContext("process");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":372
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":372
  * 
  *     def process(self, object x):
  *         if Py_EnterRecursiveCall("encode"):             # <<<<<<<<<<<<<<
@@ -3936,7 +3936,7 @@
   __pyx_t_1 = Py_EnterRecursiveCall(__pyx_k__encode);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":373
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":373
  *     def process(self, object x):
  *         if Py_EnterRecursiveCall("encode"):
  *             raise RuntimeError("too deeply nested")             # <<<<<<<<<<<<<<
@@ -3958,7 +3958,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":374
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":374
  *         if Py_EnterRecursiveCall("encode"):
  *             raise RuntimeError("too deeply nested")
  *         try:             # <<<<<<<<<<<<<<
@@ -3967,7 +3967,7 @@
  */
   /*try:*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":375
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":375
  *             raise RuntimeError("too deeply nested")
  *         try:
  *             if PyString_CheckExact(x):             # <<<<<<<<<<<<<<
@@ -3977,7 +3977,7 @@
     __pyx_t_1 = PyString_CheckExact(__pyx_v_x);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":376
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":376
  *         try:
  *             if PyString_CheckExact(x):
  *                 self._encode_string(x)             # <<<<<<<<<<<<<<
@@ -3988,7 +3988,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":377
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":377
  *             if PyString_CheckExact(x):
  *                 self._encode_string(x)
  *             elif PyInt_CheckExact(x):             # <<<<<<<<<<<<<<
@@ -3998,7 +3998,7 @@
     __pyx_t_1 = PyInt_CheckExact(__pyx_v_x);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":378
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":378
  *                 self._encode_string(x)
  *             elif PyInt_CheckExact(x):
  *                 self._encode_int(x)             # <<<<<<<<<<<<<<
@@ -4010,7 +4010,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":379
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":379
  *             elif PyInt_CheckExact(x):
  *                 self._encode_int(x)
  *             elif PyLong_CheckExact(x):             # <<<<<<<<<<<<<<
@@ -4020,7 +4020,7 @@
     __pyx_t_4 = PyLong_CheckExact(__pyx_v_x);
     if (__pyx_t_4) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":380
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":380
  *                 self._encode_int(x)
  *             elif PyLong_CheckExact(x):
  *                 self._encode_long(x)             # <<<<<<<<<<<<<<
@@ -4031,7 +4031,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":381
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":381
  *             elif PyLong_CheckExact(x):
  *                 self._encode_long(x)
  *             elif (PyList_CheckExact(x) or PyTuple_CheckExact(x)             # <<<<<<<<<<<<<<
@@ -4041,7 +4041,7 @@
     __pyx_t_4 = PyList_CheckExact(__pyx_v_x);
     if (!__pyx_t_4) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":382
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":382
  *                 self._encode_long(x)
  *             elif (PyList_CheckExact(x) or PyTuple_CheckExact(x)
  *                   or StaticTuple_CheckExact(x)):             # <<<<<<<<<<<<<<
@@ -4061,7 +4061,7 @@
     }
     if (__pyx_t_7) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":383
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":383
  *             elif (PyList_CheckExact(x) or PyTuple_CheckExact(x)
  *                   or StaticTuple_CheckExact(x)):
  *                 self._encode_list(x)             # <<<<<<<<<<<<<<
@@ -4072,7 +4072,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":384
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":384
  *                   or StaticTuple_CheckExact(x)):
  *                 self._encode_list(x)
  *             elif PyDict_CheckExact(x):             # <<<<<<<<<<<<<<
@@ -4082,7 +4082,7 @@
     __pyx_t_4 = PyDict_CheckExact(__pyx_v_x);
     if (__pyx_t_4) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":385
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":385
  *                 self._encode_list(x)
  *             elif PyDict_CheckExact(x):
  *                 self._encode_dict(x)             # <<<<<<<<<<<<<<
@@ -4093,7 +4093,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":386
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":386
  *             elif PyDict_CheckExact(x):
  *                 self._encode_dict(x)
  *             elif PyBool_Check(x):             # <<<<<<<<<<<<<<
@@ -4103,7 +4103,7 @@
     __pyx_t_4 = PyBool_Check(__pyx_v_x);
     if (__pyx_t_4) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":387
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":387
  *                 self._encode_dict(x)
  *             elif PyBool_Check(x):
  *                 self._encode_int(int(x))             # <<<<<<<<<<<<<<
@@ -4124,7 +4124,7 @@
       goto __pyx_L9;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":388
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":388
  *             elif PyBool_Check(x):
  *                 self._encode_int(int(x))
  *             elif isinstance(x, Bencached):             # <<<<<<<<<<<<<<
@@ -4137,7 +4137,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_7) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":389
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":389
  *                 self._encode_int(int(x))
  *             elif isinstance(x, Bencached):
  *                 self._append_string(x.bencoded)             # <<<<<<<<<<<<<<
@@ -4152,7 +4152,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":391
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":391
  *                 self._append_string(x.bencoded)
  *             else:
  *                 raise TypeError('unsupported type %r' % x)             # <<<<<<<<<<<<<<
@@ -4176,7 +4176,7 @@
     __pyx_L9:;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":393
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":393
  *                 raise TypeError('unsupported type %r' % x)
  *         finally:
  *             Py_LeaveRecursiveCall()             # <<<<<<<<<<<<<<
@@ -4224,7 +4224,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":396
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":396
  * 
  * 
  * def bencode(x):             # <<<<<<<<<<<<<<
@@ -4244,7 +4244,7 @@
   __pyx_self = __pyx_self;
   __pyx_v_encoder = ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":398
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":398
  * def bencode(x):
  *     """Encode Python object x to string"""
  *     encoder = Encoder()             # <<<<<<<<<<<<<<
@@ -4257,7 +4257,7 @@
   __pyx_v_encoder = ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":399
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":399
  *     """Encode Python object x to string"""
  *     encoder = Encoder()
  *     encoder.process(x)             # <<<<<<<<<<<<<<
@@ -4276,7 +4276,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":400
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":400
  *     encoder = Encoder()
  *     encoder.process(x)
  *     return str(encoder)             # <<<<<<<<<<<<<<
@@ -4964,7 +4964,7 @@
   /*--- Function import code ---*/
   /*--- Execution code ---*/
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":66
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":66
  *     import_static_tuple_c
  * 
  * import_static_tuple_c()             # <<<<<<<<<<<<<<
@@ -4973,7 +4973,7 @@
  */
   __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;}
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":233
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":233
  * 
  * 
  * class Bencached(object):             # <<<<<<<<<<<<<<
@@ -4991,7 +4991,7 @@
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":234
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":234
  * 
  * class Bencached(object):
  *     __slots__ = ['bencoded']             # <<<<<<<<<<<<<<
@@ -5006,7 +5006,7 @@
   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;}
   __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":236
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":236
  *     __slots__ = ['bencoded']
  * 
  *     def __init__(self, s):             # <<<<<<<<<<<<<<
@@ -5024,7 +5024,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":253
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":253
  *     cdef readonly int maxsize
  * 
  *     def __init__(self, int maxsize=INITSIZE):             # <<<<<<<<<<<<<<
@@ -5033,7 +5033,7 @@
  */
   __pyx_k_15 = __pyx_e_6bzrlib_12_bencode_pyx_INITSIZE;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_bencode_pyx.pyx":1
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_bencode_pyx.pyx":1
  * # Copyright (C) 2007, 2009, 2010 Canonical Ltd             # <<<<<<<<<<<<<<
  * #
  * # This program is free software; you can redistribute it and/or modify
 
=== modified file 'bzrlib/_btree_serializer_pyx.c'
--- bzrlib/_btree_serializer_pyx.c	2011-08-31 15:04:43 +0000
+++ bzrlib/_btree_serializer_pyx.c	2011-11-03 14:37:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.13 on Thu Aug 11 09:45:32 2011 */
+/* Generated by Cython 0.13 on Mon Sep 19 20:18:57 2011 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -279,7 +279,7 @@
 
 /* Type declarations */
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":337
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":337
  * #       One slightly ugly option would be to cache block offsets in a global.
  * #       However, that leads to thread-safety issues, etc.
  * ctypedef struct gc_chk_sha1_record:             # <<<<<<<<<<<<<<
@@ -295,7 +295,7 @@
   char sha1[20];
 } __pyx_t_6bzrlib_21_btree_serializer_pyx_gc_chk_sha1_record;
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":123
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":123
  * 
  * 
  * cdef class BTreeLeafParser:             # <<<<<<<<<<<<<<
@@ -316,7 +316,7 @@
   int _header_found;
 };
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":518
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":518
  * 
  * 
  * cdef class GCCHKSHA1LeafNode:             # <<<<<<<<<<<<<<
@@ -349,7 +349,7 @@
 static struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_GCCHKSHA1LeafNode *__pyx_vtabptr_6bzrlib_21_btree_serializer_pyx_GCCHKSHA1LeafNode;
 
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":123
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":123
  * 
  * 
  * cdef class BTreeLeafParser:             # <<<<<<<<<<<<<<
@@ -749,7 +749,7 @@
 static PyObject *__pyx_int_0;
 static PyObject *__pyx_int_1;
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":81
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":81
  * 
  * # TODO: Find some way to import this from _dirstate_helpers
  * cdef void* _my_memrchr(void *s, int c, size_t n): # cannot_raise             # <<<<<<<<<<<<<<
@@ -764,7 +764,7 @@
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("_my_memrchr");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":87
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":87
  *     cdef char *start
  * 
  *     start = <char*>s             # <<<<<<<<<<<<<<
@@ -773,7 +773,7 @@
  */
   __pyx_v_start = ((char *)__pyx_v_s);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":88
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":88
  * 
  *     start = <char*>s
  *     pos = start + n - 1             # <<<<<<<<<<<<<<
@@ -782,7 +782,7 @@
  */
   __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":89
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":89
  *     start = <char*>s
  *     pos = start + n - 1
  *     while pos >= start:             # <<<<<<<<<<<<<<
@@ -793,7 +793,7 @@
     __pyx_t_1 = (__pyx_v_pos >= __pyx_v_start);
     if (!__pyx_t_1) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":90
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":90
  *     pos = start + n - 1
  *     while pos >= start:
  *         if pos[0] == c:             # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@
     __pyx_t_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":91
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":91
  *     while pos >= start:
  *         if pos[0] == c:
  *             return <void*>pos             # <<<<<<<<<<<<<<
@@ -816,7 +816,7 @@
     }
     __pyx_L5:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":92
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":92
  *         if pos[0] == c:
  *             return <void*>pos
  *         pos = pos - 1             # <<<<<<<<<<<<<<
@@ -826,7 +826,7 @@
     __pyx_v_pos = (__pyx_v_pos - 1);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":93
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":93
  *             return <void*>pos
  *         pos = pos - 1
  *     return NULL             # <<<<<<<<<<<<<<
@@ -842,7 +842,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":97
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":97
  * 
  * # TODO: Import this from _dirstate_helpers when it is merged
  * cdef object safe_string_from_size(char *s, Py_ssize_t size):             # <<<<<<<<<<<<<<
@@ -858,7 +858,7 @@
   PyObject *__pyx_t_4 = NULL;
   __Pyx_RefNannySetupContext("safe_string_from_size");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":98
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":98
  * # TODO: Import this from _dirstate_helpers when it is merged
  * cdef object safe_string_from_size(char *s, Py_ssize_t size):
  *     if size < 0:             # <<<<<<<<<<<<<<
@@ -868,7 +868,7 @@
   __pyx_t_1 = (__pyx_v_size < 0);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":101
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":101
  *         raise AssertionError(
  *             'tried to create a string with an invalid size: %d @0x%x'
  *             % (size, <int>s))             # <<<<<<<<<<<<<<
@@ -905,7 +905,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":102
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":102
  *             'tried to create a string with an invalid size: %d @0x%x'
  *             % (size, <int>s))
  *     return PyString_FromStringAndSize(s, size)             # <<<<<<<<<<<<<<
@@ -933,7 +933,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":105
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":105
  * 
  * 
  * cdef object safe_interned_string_from_size(char *s, Py_ssize_t size):             # <<<<<<<<<<<<<<
@@ -952,7 +952,7 @@
   __Pyx_RefNannySetupContext("safe_interned_string_from_size");
   __pyx_v_result = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":107
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":107
  * cdef object safe_interned_string_from_size(char *s, Py_ssize_t size):
  *     cdef PyObject *py_str
  *     if size < 0:             # <<<<<<<<<<<<<<
@@ -962,7 +962,7 @@
   __pyx_t_1 = (__pyx_v_size < 0);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":110
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":110
  *         raise AssertionError(
  *             'tried to create a string with an invalid size: %d @0x%x'
  *             % (size, <int>s))             # <<<<<<<<<<<<<<
@@ -999,7 +999,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":111
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":111
  *             'tried to create a string with an invalid size: %d @0x%x'
  *             % (size, <int>s))
  *     py_str = PyString_FromStringAndSize_ptr(s, size)             # <<<<<<<<<<<<<<
@@ -1008,7 +1008,7 @@
  */
   __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s, __pyx_v_size);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":112
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":112
  *             % (size, <int>s))
  *     py_str = PyString_FromStringAndSize_ptr(s, size)
  *     PyString_InternInPlace(&py_str)             # <<<<<<<<<<<<<<
@@ -1017,7 +1017,7 @@
  */
   PyString_InternInPlace((&__pyx_v_py_str));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":113
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":113
  *     py_str = PyString_FromStringAndSize_ptr(s, size)
  *     PyString_InternInPlace(&py_str)
  *     result = <object>py_str             # <<<<<<<<<<<<<<
@@ -1028,7 +1028,7 @@
   __Pyx_DECREF(__pyx_v_result);
   __pyx_v_result = ((PyObject *)__pyx_v_py_str);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":116
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":116
  *     # Casting a PyObject* to an <object> triggers an INCREF from Pyrex, so we
  *     # DECREF it to avoid geting immortal strings
  *     Py_DECREF_ptr(py_str)             # <<<<<<<<<<<<<<
@@ -1037,7 +1037,7 @@
  */
   Py_DECREF(__pyx_v_py_str);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":117
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":117
  *     # DECREF it to avoid geting immortal strings
  *     Py_DECREF_ptr(py_str)
  *     return result             # <<<<<<<<<<<<<<
@@ -1064,7 +1064,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":153
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":153
  *     cdef int _header_found
  * 
  *     def __init__(self, bytes, key_length, ref_list_length):             # <<<<<<<<<<<<<<
@@ -1132,7 +1132,7 @@
   return -1;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":154
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":154
  * 
  *     def __init__(self, bytes, key_length, ref_list_length):
  *         self.bytes = bytes             # <<<<<<<<<<<<<<
@@ -1145,7 +1145,7 @@
   __Pyx_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes = __pyx_v_bytes;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":155
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":155
  *     def __init__(self, bytes, key_length, ref_list_length):
  *         self.bytes = bytes
  *         self.key_length = key_length             # <<<<<<<<<<<<<<
@@ -1155,7 +1155,7 @@
   __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;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->key_length = __pyx_t_1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":156
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":156
  *         self.bytes = bytes
  *         self.key_length = key_length
  *         self.ref_list_length = ref_list_length             # <<<<<<<<<<<<<<
@@ -1165,7 +1165,7 @@
   __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;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->ref_list_length = __pyx_t_1;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":157
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":157
  *         self.key_length = key_length
  *         self.ref_list_length = ref_list_length
  *         self.keys = []             # <<<<<<<<<<<<<<
@@ -1180,7 +1180,7 @@
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys = ((PyObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":158
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":158
  *         self.ref_list_length = ref_list_length
  *         self.keys = []
  *         self._cur_str = NULL             # <<<<<<<<<<<<<<
@@ -1189,7 +1189,7 @@
  */
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = NULL;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":159
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":159
  *         self.keys = []
  *         self._cur_str = NULL
  *         self._end_str = NULL             # <<<<<<<<<<<<<<
@@ -1198,7 +1198,7 @@
  */
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = NULL;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":160
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":160
  *         self._cur_str = NULL
  *         self._end_str = NULL
  *         self._header_found = 0             # <<<<<<<<<<<<<<
@@ -1218,7 +1218,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":163
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":163
  *         # keys are tuples
  * 
  *     cdef extract_key(self, char * last):             # <<<<<<<<<<<<<<
@@ -1245,7 +1245,7 @@
   __pyx_v_failure_string = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_key_element = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":173
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":173
  *         cdef StaticTuple key
  * 
  *         key = StaticTuple_New(self.key_length)             # <<<<<<<<<<<<<<
@@ -1258,7 +1258,7 @@
   __pyx_v_key = ((StaticTuple *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":174
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":174
  * 
  *         key = StaticTuple_New(self.key_length)
  *         for loop_counter from 0 <= loop_counter < self.key_length:             # <<<<<<<<<<<<<<
@@ -1268,7 +1268,7 @@
   __pyx_t_2 = __pyx_v_self->key_length;
   for (__pyx_v_loop_counter = 0; __pyx_v_loop_counter < __pyx_t_2; __pyx_v_loop_counter++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":176
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":176
  *         for loop_counter from 0 <= loop_counter < self.key_length:
  *             # grab a key segment
  *             temp_ptr = <char*>memchr(self._start, c'\0', last - self._start)             # <<<<<<<<<<<<<<
@@ -1277,7 +1277,7 @@
  */
     __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\x00', (__pyx_v_last - __pyx_v_self->_start)));
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":177
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":177
  *             # grab a key segment
  *             temp_ptr = <char*>memchr(self._start, c'\0', last - self._start)
  *             if temp_ptr == NULL:             # <<<<<<<<<<<<<<
@@ -1287,7 +1287,7 @@
     __pyx_t_3 = (__pyx_v_temp_ptr == NULL);
     if (__pyx_t_3) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":178
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":178
  *             temp_ptr = <char*>memchr(self._start, c'\0', last - self._start)
  *             if temp_ptr == NULL:
  *                 if loop_counter + 1 == self.key_length:             # <<<<<<<<<<<<<<
@@ -1297,7 +1297,7 @@
       __pyx_t_3 = ((__pyx_v_loop_counter + 1) == __pyx_v_self->key_length);
       if (__pyx_t_3) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":180
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":180
  *                 if loop_counter + 1 == self.key_length:
  *                     # capture to last
  *                     temp_ptr = last             # <<<<<<<<<<<<<<
@@ -1309,7 +1309,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":185
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":185
  *                     failure_string = ("invalid key, wanted segment from " +
  *                         repr(safe_string_from_size(self._start,
  *                                                    last - self._start)))             # <<<<<<<<<<<<<<
@@ -1328,7 +1328,7 @@
         __pyx_v_failure_string = __pyx_t_1;
         __pyx_t_1 = 0;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":186
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":186
  *                         repr(safe_string_from_size(self._start,
  *                                                    last - self._start)))
  *                     raise AssertionError(failure_string)             # <<<<<<<<<<<<<<
@@ -1352,7 +1352,7 @@
     }
     __pyx_L5:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":188
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":188
  *                     raise AssertionError(failure_string)
  *             # capture the key string
  *             if (self.key_length == 1             # <<<<<<<<<<<<<<
@@ -1362,7 +1362,7 @@
     __pyx_t_3 = (__pyx_v_self->key_length == 1);
     if (__pyx_t_3) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":189
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":189
  *             # capture the key string
  *             if (self.key_length == 1
  *                 and (temp_ptr - self._start) == 45             # <<<<<<<<<<<<<<
@@ -1372,7 +1372,7 @@
       __pyx_t_5 = ((__pyx_v_temp_ptr - __pyx_v_self->_start) == 45);
       if (__pyx_t_5) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":190
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":190
  *             if (self.key_length == 1
  *                 and (temp_ptr - self._start) == 45
  *                 and strncmp(self._start, 'sha1:', 5) == 0):             # <<<<<<<<<<<<<<
@@ -1390,7 +1390,7 @@
     }
     if (__pyx_t_5) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":192
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":192
  *                 and strncmp(self._start, 'sha1:', 5) == 0):
  *                 key_element = safe_string_from_size(self._start,
  *                                                     temp_ptr - self._start)             # <<<<<<<<<<<<<<
@@ -1406,7 +1406,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":195
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":195
  *             else:
  *                 key_element = safe_interned_string_from_size(self._start,
  *                                                          temp_ptr - self._start)             # <<<<<<<<<<<<<<
@@ -1421,7 +1421,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":197
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":197
  *                                                          temp_ptr - self._start)
  *             # advance our pointer
  *             self._start = temp_ptr + 1             # <<<<<<<<<<<<<<
@@ -1430,7 +1430,7 @@
  */
     __pyx_v_self->_start = (__pyx_v_temp_ptr + 1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":198
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":198
  *             # advance our pointer
  *             self._start = temp_ptr + 1
  *             Py_INCREF(key_element)             # <<<<<<<<<<<<<<
@@ -1439,7 +1439,7 @@
  */
     Py_INCREF(__pyx_v_key_element);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":199
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":199
  *             self._start = temp_ptr + 1
  *             Py_INCREF(key_element)
  *             StaticTuple_SET_ITEM(key, loop_counter, key_element)             # <<<<<<<<<<<<<<
@@ -1449,7 +1449,7 @@
     StaticTuple_SET_ITEM(__pyx_v_key, __pyx_v_loop_counter, __pyx_v_key_element);
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":200
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":200
  *             Py_INCREF(key_element)
  *             StaticTuple_SET_ITEM(key, loop_counter, key_element)
  *         key = StaticTuple_Intern(key)             # <<<<<<<<<<<<<<
@@ -1462,7 +1462,7 @@
   __pyx_v_key = ((StaticTuple *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":201
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":201
  *             StaticTuple_SET_ITEM(key, loop_counter, key_element)
  *         key = StaticTuple_Intern(key)
  *         return key             # <<<<<<<<<<<<<<
@@ -1490,7 +1490,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":203
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":203
  *         return key
  * 
  *     cdef int process_line(self) except -1:             # <<<<<<<<<<<<<<
@@ -1524,7 +1524,7 @@
   __pyx_v_ref_list = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_node_value = ((StaticTuple *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":212
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":212
  *         cdef Py_ssize_t str_len
  * 
  *         self._start = self._cur_str             # <<<<<<<<<<<<<<
@@ -1533,7 +1533,7 @@
  */
   __pyx_v_self->_start = __pyx_v_self->_cur_str;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":214
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":214
  *         self._start = self._cur_str
  *         # Find the next newline
  *         last = <char*>memchr(self._start, c'\n', self._end_str - self._start)             # <<<<<<<<<<<<<<
@@ -1542,7 +1542,7 @@
  */
   __pyx_v_last = ((char *)memchr(__pyx_v_self->_start, '\n', (__pyx_v_self->_end_str - __pyx_v_self->_start)));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":215
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":215
  *         # Find the next newline
  *         last = <char*>memchr(self._start, c'\n', self._end_str - self._start)
  *         if last == NULL:             # <<<<<<<<<<<<<<
@@ -1552,7 +1552,7 @@
   __pyx_t_1 = (__pyx_v_last == NULL);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":217
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":217
  *         if last == NULL:
  *             # Process until the end of the file
  *             last = self._end_str             # <<<<<<<<<<<<<<
@@ -1561,7 +1561,7 @@
  */
     __pyx_v_last = __pyx_v_self->_end_str;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":218
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":218
  *             # Process until the end of the file
  *             last = self._end_str
  *             self._cur_str = self._end_str             # <<<<<<<<<<<<<<
@@ -1573,7 +1573,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":221
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":221
  *         else:
  *             # And the next string is right after it
  *             self._cur_str = last + 1             # <<<<<<<<<<<<<<
@@ -1584,7 +1584,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":224
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":224
  *             # The last character is right before the '\n'
  * 
  *         if last == self._start:             # <<<<<<<<<<<<<<
@@ -1594,7 +1594,7 @@
   __pyx_t_1 = (__pyx_v_last == __pyx_v_self->_start);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":226
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":226
  *         if last == self._start:
  *             # parsed it all.
  *             return 0             # <<<<<<<<<<<<<<
@@ -1607,7 +1607,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":227
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":227
  *             # parsed it all.
  *             return 0
  *         if last < self._start:             # <<<<<<<<<<<<<<
@@ -1617,7 +1617,7 @@
   __pyx_t_1 = (__pyx_v_last < __pyx_v_self->_start);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":229
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":229
  *         if last < self._start:
  *             # Unexpected error condition - fail
  *             raise AssertionError("last < self._start")             # <<<<<<<<<<<<<<
@@ -1639,7 +1639,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":230
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":230
  *             # Unexpected error condition - fail
  *             raise AssertionError("last < self._start")
  *         if 0 == self._header_found:             # <<<<<<<<<<<<<<
@@ -1649,7 +1649,7 @@
   __pyx_t_1 = (0 == __pyx_v_self->_header_found);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":232
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":232
  *         if 0 == self._header_found:
  *             # The first line in a leaf node is the header "type=leaf\n"
  *             if strncmp("type=leaf", self._start, last - self._start) == 0:             # <<<<<<<<<<<<<<
@@ -1659,7 +1659,7 @@
     __pyx_t_1 = (strncmp(__pyx_k_5, __pyx_v_self->_start, (__pyx_v_last - __pyx_v_self->_start)) == 0);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":233
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":233
  *             # The first line in a leaf node is the header "type=leaf\n"
  *             if strncmp("type=leaf", self._start, last - self._start) == 0:
  *                 self._header_found = 1             # <<<<<<<<<<<<<<
@@ -1668,7 +1668,7 @@
  */
       __pyx_v_self->_header_found = 1;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":234
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":234
  *             if strncmp("type=leaf", self._start, last - self._start) == 0:
  *                 self._header_found = 1
  *                 return 0             # <<<<<<<<<<<<<<
@@ -1681,7 +1681,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":237
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":237
  *             else:
  *                 raise AssertionError('Node did not start with "type=leaf": %r'
  *                     % (safe_string_from_size(self._start, last - self._start)))             # <<<<<<<<<<<<<<
@@ -1710,7 +1710,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":239
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":239
  *                     % (safe_string_from_size(self._start, last - self._start)))
  * 
  *         key = self.extract_key(last)             # <<<<<<<<<<<<<<
@@ -1723,7 +1723,7 @@
   __pyx_v_key = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":241
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":241
  *         key = self.extract_key(last)
  *         # find the value area
  *         temp_ptr = <char*>_my_memrchr(self._start, c'\0', last - self._start)             # <<<<<<<<<<<<<<
@@ -1732,7 +1732,7 @@
  */
   __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)));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":242
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":242
  *         # find the value area
  *         temp_ptr = <char*>_my_memrchr(self._start, c'\0', last - self._start)
  *         if temp_ptr == NULL:             # <<<<<<<<<<<<<<
@@ -1742,7 +1742,7 @@
   __pyx_t_1 = (__pyx_v_temp_ptr == NULL);
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":244
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":244
  *         if temp_ptr == NULL:
  *             # Invalid line
  *             raise AssertionError("Failed to find the value area")             # <<<<<<<<<<<<<<
@@ -1764,7 +1764,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":252
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":252
  *             # something like '12607215 328306 0 0', which ends up consuming 1MB
  *             # of memory, just for those strings.
  *             str_len = last - temp_ptr - 1             # <<<<<<<<<<<<<<
@@ -1773,7 +1773,7 @@
  */
     __pyx_v_str_len = ((__pyx_v_last - __pyx_v_temp_ptr) - 1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":253
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":253
  *             # of memory, just for those strings.
  *             str_len = last - temp_ptr - 1
  *             if (str_len > 4             # <<<<<<<<<<<<<<
@@ -1783,7 +1783,7 @@
     __pyx_t_1 = (__pyx_v_str_len > 4);
     if (__pyx_t_1) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":254
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":254
  *             str_len = last - temp_ptr - 1
  *             if (str_len > 4
  *                 and strncmp(" 0 0", last - 4, 4) == 0):             # <<<<<<<<<<<<<<
@@ -1797,7 +1797,7 @@
     }
     if (__pyx_t_5) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":257
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":257
  *                 # This drops peak mem for bzr.dev from 87.4MB => 86.2MB
  *                 # For Launchpad 236MB => 232MB
  *                 value = safe_interned_string_from_size(temp_ptr + 1, str_len)             # <<<<<<<<<<<<<<
@@ -1813,7 +1813,7 @@
     }
     /*else*/ {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":259
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":259
  *                 value = safe_interned_string_from_size(temp_ptr + 1, str_len)
  *             else:
  *                 value = safe_string_from_size(temp_ptr + 1, str_len)             # <<<<<<<<<<<<<<
@@ -1828,7 +1828,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":261
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":261
  *                 value = safe_string_from_size(temp_ptr + 1, str_len)
  *             # shrink the references end point
  *             last = temp_ptr             # <<<<<<<<<<<<<<
@@ -1839,7 +1839,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":263
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":263
  *             last = temp_ptr
  * 
  *         if self.ref_list_length:             # <<<<<<<<<<<<<<
@@ -1848,7 +1848,7 @@
  */
   if (__pyx_v_self->ref_list_length) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":264
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":264
  * 
  *         if self.ref_list_length:
  *             ref_lists = StaticTuple_New(self.ref_list_length)             # <<<<<<<<<<<<<<
@@ -1861,7 +1861,7 @@
     __pyx_v_ref_lists = ((StaticTuple *)__pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":265
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":265
  *         if self.ref_list_length:
  *             ref_lists = StaticTuple_New(self.ref_list_length)
  *             loop_counter = 0             # <<<<<<<<<<<<<<
@@ -1870,7 +1870,7 @@
  */
     __pyx_v_loop_counter = 0;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":266
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":266
  *             ref_lists = StaticTuple_New(self.ref_list_length)
  *             loop_counter = 0
  *             while loop_counter < self.ref_list_length:             # <<<<<<<<<<<<<<
@@ -1881,7 +1881,7 @@
       __pyx_t_5 = (__pyx_v_loop_counter < __pyx_v_self->ref_list_length);
       if (!__pyx_t_5) break;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":267
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":267
  *             loop_counter = 0
  *             while loop_counter < self.ref_list_length:
  *                 ref_list = []             # <<<<<<<<<<<<<<
@@ -1894,7 +1894,7 @@
       __pyx_v_ref_list = ((PyObject *)__pyx_t_3);
       __pyx_t_3 = 0;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":269
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":269
  *                 ref_list = []
  *                 # extract a reference list
  *                 loop_counter = loop_counter + 1             # <<<<<<<<<<<<<<
@@ -1903,7 +1903,7 @@
  */
       __pyx_v_loop_counter = (__pyx_v_loop_counter + 1);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":270
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":270
  *                 # extract a reference list
  *                 loop_counter = loop_counter + 1
  *                 if last < self._start:             # <<<<<<<<<<<<<<
@@ -1913,7 +1913,7 @@
       __pyx_t_5 = (__pyx_v_last < __pyx_v_self->_start);
       if (__pyx_t_5) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":271
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":271
  *                 loop_counter = loop_counter + 1
  *                 if last < self._start:
  *                     raise AssertionError("last < self._start")             # <<<<<<<<<<<<<<
@@ -1935,7 +1935,7 @@
       }
       __pyx_L13:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":273
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":273
  *                     raise AssertionError("last < self._start")
  *                 # find the next reference list end point:
  *                 temp_ptr = <char*>memchr(self._start, c'\t', last - self._start)             # <<<<<<<<<<<<<<
@@ -1944,7 +1944,7 @@
  */
       __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\t', (__pyx_v_last - __pyx_v_self->_start)));
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":274
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":274
  *                 # find the next reference list end point:
  *                 temp_ptr = <char*>memchr(self._start, c'\t', last - self._start)
  *                 if temp_ptr == NULL:             # <<<<<<<<<<<<<<
@@ -1954,7 +1954,7 @@
       __pyx_t_5 = (__pyx_v_temp_ptr == NULL);
       if (__pyx_t_5) {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":276
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":276
  *                 if temp_ptr == NULL:
  *                     # Only valid for the last list
  *                     if loop_counter != self.ref_list_length:             # <<<<<<<<<<<<<<
@@ -1964,7 +1964,7 @@
         __pyx_t_5 = (__pyx_v_loop_counter != __pyx_v_self->ref_list_length);
         if (__pyx_t_5) {
 
-          /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":278
+          /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":278
  *                     if loop_counter != self.ref_list_length:
  *                         # Invalid line
  *                         raise AssertionError(             # <<<<<<<<<<<<<<
@@ -1986,7 +1986,7 @@
         }
         /*else*/ {
 
-          /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":282
+          /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":282
  *                     else:
  *                         # scan to the end of the ref list area
  *                         ref_ptr = last             # <<<<<<<<<<<<<<
@@ -1995,7 +1995,7 @@
  */
           __pyx_v_ref_ptr = __pyx_v_last;
 
-          /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":283
+          /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":283
  *                         # scan to the end of the ref list area
  *                         ref_ptr = last
  *                         next_start = last             # <<<<<<<<<<<<<<
@@ -2009,7 +2009,7 @@
       }
       /*else*/ {
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":286
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":286
  *                 else:
  *                     # scan to the end of this ref list
  *                     ref_ptr = temp_ptr             # <<<<<<<<<<<<<<
@@ -2018,7 +2018,7 @@
  */
         __pyx_v_ref_ptr = __pyx_v_temp_ptr;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":287
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":287
  *                     # scan to the end of this ref list
  *                     ref_ptr = temp_ptr
  *                     next_start = temp_ptr + 1             # <<<<<<<<<<<<<<
@@ -2029,7 +2029,7 @@
       }
       __pyx_L14:;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":289
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":289
  *                     next_start = temp_ptr + 1
  *                 # Now, there may be multiple keys in the ref list.
  *                 while self._start < ref_ptr:             # <<<<<<<<<<<<<<
@@ -2040,7 +2040,7 @@
         __pyx_t_5 = (__pyx_v_self->_start < __pyx_v_ref_ptr);
         if (!__pyx_t_5) break;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":292
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":292
  *                     # loop finding keys and extracting them
  *                     temp_ptr = <char*>memchr(self._start, c'\r',
  *                                              ref_ptr - self._start)             # <<<<<<<<<<<<<<
@@ -2049,7 +2049,7 @@
  */
         __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start, '\r', (__pyx_v_ref_ptr - __pyx_v_self->_start)));
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":293
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":293
  *                     temp_ptr = <char*>memchr(self._start, c'\r',
  *                                              ref_ptr - self._start)
  *                     if temp_ptr == NULL:             # <<<<<<<<<<<<<<
@@ -2059,7 +2059,7 @@
         __pyx_t_5 = (__pyx_v_temp_ptr == NULL);
         if (__pyx_t_5) {
 
-          /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":295
+          /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":295
  *                     if temp_ptr == NULL:
  *                         # key runs to the end
  *                         temp_ptr = ref_ptr             # <<<<<<<<<<<<<<
@@ -2071,7 +2071,7 @@
         }
         __pyx_L18:;
 
-        /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":297
+        /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":297
  *                         temp_ptr = ref_ptr
  * 
  *                     PyList_Append(ref_list, self.extract_key(temp_ptr))             # <<<<<<<<<<<<<<
@@ -2084,7 +2084,7 @@
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       }
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":298
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":298
  * 
  *                     PyList_Append(ref_list, self.extract_key(temp_ptr))
  *                 ref_list = StaticTuple_Intern(StaticTuple(*ref_list))             # <<<<<<<<<<<<<<
@@ -2103,7 +2103,7 @@
       __pyx_v_ref_list = __pyx_t_3;
       __pyx_t_3 = 0;
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":299
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":299
  *                     PyList_Append(ref_list, self.extract_key(temp_ptr))
  *                 ref_list = StaticTuple_Intern(StaticTuple(*ref_list))
  *                 Py_INCREF(ref_list)             # <<<<<<<<<<<<<<
@@ -2112,7 +2112,7 @@
  */
       Py_INCREF(__pyx_v_ref_list);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":300
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":300
  *                 ref_list = StaticTuple_Intern(StaticTuple(*ref_list))
  *                 Py_INCREF(ref_list)
  *                 StaticTuple_SET_ITEM(ref_lists, loop_counter - 1, ref_list)             # <<<<<<<<<<<<<<
@@ -2121,7 +2121,7 @@
  */
       StaticTuple_SET_ITEM(__pyx_v_ref_lists, (__pyx_v_loop_counter - 1), __pyx_v_ref_list);
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":302
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":302
  *                 StaticTuple_SET_ITEM(ref_lists, loop_counter - 1, ref_list)
  *                 # prepare for the next reference list
  *                 self._start = next_start             # <<<<<<<<<<<<<<
@@ -2131,7 +2131,7 @@
       __pyx_v_self->_start = __pyx_v_next_start;
     }
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":303
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":303
  *                 # prepare for the next reference list
  *                 self._start = next_start
  *             node_value = StaticTuple(value, ref_lists)             # <<<<<<<<<<<<<<
@@ -2156,7 +2156,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":305
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":305
  *             node_value = StaticTuple(value, ref_lists)
  *         else:
  *             if last != self._start:             # <<<<<<<<<<<<<<
@@ -2166,7 +2166,7 @@
     __pyx_t_5 = (__pyx_v_last != __pyx_v_self->_start);
     if (__pyx_t_5) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":307
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":307
  *             if last != self._start:
  *                 # unexpected reference data present
  *                 raise AssertionError("unexpected reference data present")             # <<<<<<<<<<<<<<
@@ -2188,7 +2188,7 @@
     }
     __pyx_L19:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":308
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":308
  *                 # unexpected reference data present
  *                 raise AssertionError("unexpected reference data present")
  *             node_value = StaticTuple(value, StaticTuple())             # <<<<<<<<<<<<<<
@@ -2214,7 +2214,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":309
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":309
  *                 raise AssertionError("unexpected reference data present")
  *             node_value = StaticTuple(value, StaticTuple())
  *         PyList_Append(self.keys, StaticTuple(key, node_value))             # <<<<<<<<<<<<<<
@@ -2235,7 +2235,7 @@
   __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;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":310
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":310
  *             node_value = StaticTuple(value, StaticTuple())
  *         PyList_Append(self.keys, StaticTuple(key, node_value))
  *         return 0             # <<<<<<<<<<<<<<
@@ -2262,7 +2262,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":312
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":312
  *         return 0
  * 
  *     def parse(self):             # <<<<<<<<<<<<<<
@@ -2281,7 +2281,7 @@
   int __pyx_t_5;
   __Pyx_RefNannySetupContext("parse");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":314
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":314
  *     def parse(self):
  *         cdef Py_ssize_t byte_count
  *         if not PyString_CheckExact(self.bytes):             # <<<<<<<<<<<<<<
@@ -2291,7 +2291,7 @@
   __pyx_t_1 = (!PyString_CheckExact(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes));
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":315
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":315
  *         cdef Py_ssize_t byte_count
  *         if not PyString_CheckExact(self.bytes):
  *             raise AssertionError('self.bytes is not a string.')             # <<<<<<<<<<<<<<
@@ -2313,7 +2313,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":316
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":316
  *         if not PyString_CheckExact(self.bytes):
  *             raise AssertionError('self.bytes is not a string.')
  *         byte_count = PyString_Size(self.bytes)             # <<<<<<<<<<<<<<
@@ -2322,7 +2322,7 @@
  */
   __pyx_v_byte_count = PyString_Size(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":317
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":317
  *             raise AssertionError('self.bytes is not a string.')
  *         byte_count = PyString_Size(self.bytes)
  *         self._cur_str = PyString_AsString(self.bytes)             # <<<<<<<<<<<<<<
@@ -2332,7 +2332,7 @@
   __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;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = __pyx_t_4;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":319
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":319
  *         self._cur_str = PyString_AsString(self.bytes)
  *         # This points to the last character in the string
  *         self._end_str = self._cur_str + byte_count             # <<<<<<<<<<<<<<
@@ -2341,7 +2341,7 @@
  */
   ((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);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":320
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":320
  *         # This points to the last character in the string
  *         self._end_str = self._cur_str + byte_count
  *         while self._cur_str < self._end_str:             # <<<<<<<<<<<<<<
@@ -2352,7 +2352,7 @@
     __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);
     if (!__pyx_t_1) break;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":321
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":321
  *         self._end_str = self._cur_str + byte_count
  *         while self._cur_str < self._end_str:
  *             self.process_line()             # <<<<<<<<<<<<<<
@@ -2362,7 +2362,7 @@
     __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;}
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":322
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":322
  *         while self._cur_str < self._end_str:
  *             self.process_line()
  *         return self.keys             # <<<<<<<<<<<<<<
@@ -2387,7 +2387,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":325
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":325
  * 
  * 
  * def _parse_leaf_lines(bytes, key_length, ref_list_length):             # <<<<<<<<<<<<<<
@@ -2458,7 +2458,7 @@
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_parser = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":326
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":326
  * 
  * def _parse_leaf_lines(bytes, key_length, ref_list_length):
  *     parser = BTreeLeafParser(bytes, key_length, ref_list_length)             # <<<<<<<<<<<<<<
@@ -2483,7 +2483,7 @@
   __pyx_v_parser = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":327
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":327
  * def _parse_leaf_lines(bytes, key_length, ref_list_length):
  *     parser = BTreeLeafParser(bytes, key_length, ref_list_length)
  *     return parser.parse()             # <<<<<<<<<<<<<<
@@ -2514,7 +2514,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":349
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":349
  * _hexbuf = '0123456789abcdef'
  * 
  * cdef _populate_unhexbuf():             # <<<<<<<<<<<<<<
@@ -2527,7 +2527,7 @@
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannySetupContext("_populate_unhexbuf");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":351
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":351
  * cdef _populate_unhexbuf():
  *     cdef int i
  *     for i from 0 <= i < 256:             # <<<<<<<<<<<<<<
@@ -2536,7 +2536,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < 256; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":352
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":352
  *     cdef int i
  *     for i from 0 <= i < 256:
  *         _unhexbuf[i] = -1             # <<<<<<<<<<<<<<
@@ -2546,7 +2546,7 @@
     (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[__pyx_v_i]) = -1;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":353
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":353
  *     for i from 0 <= i < 256:
  *         _unhexbuf[i] = -1
  *     for i from 0 <= i < 10: # 0123456789 => map to the raw number             # <<<<<<<<<<<<<<
@@ -2555,7 +2555,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < 10; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":354
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":354
  *         _unhexbuf[i] = -1
  *     for i from 0 <= i < 10: # 0123456789 => map to the raw number
  *         _unhexbuf[(i + c'0')] = i             # <<<<<<<<<<<<<<
@@ -2565,7 +2565,7 @@
     (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[(__pyx_v_i + '0')]) = __pyx_v_i;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":355
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":355
  *     for i from 0 <= i < 10: # 0123456789 => map to the raw number
  *         _unhexbuf[(i + c'0')] = i
  *     for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16             # <<<<<<<<<<<<<<
@@ -2574,7 +2574,7 @@
  */
   for (__pyx_v_i = 10; __pyx_v_i < 16; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":356
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":356
  *         _unhexbuf[(i + c'0')] = i
  *     for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16
  *         _unhexbuf[(i - 10 + c'a')] = i             # <<<<<<<<<<<<<<
@@ -2584,7 +2584,7 @@
     (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((__pyx_v_i - 10) + 'a')]) = __pyx_v_i;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":357
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":357
  *     for i from 10 <= i < 16: # abcdef => 10, 11, 12, 13, 14, 15, 16
  *         _unhexbuf[(i - 10 + c'a')] = i
  *     for i from 10 <= i < 16: # ABCDEF => 10, 11, 12, 13, 14, 15, 16             # <<<<<<<<<<<<<<
@@ -2593,7 +2593,7 @@
  */
   for (__pyx_v_i = 10; __pyx_v_i < 16; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":358
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":358
  *         _unhexbuf[(i - 10 + c'a')] = i
  *     for i from 10 <= i < 16: # ABCDEF => 10, 11, 12, 13, 14, 15, 16
  *         _unhexbuf[(i - 10 + c'A')] = i             # <<<<<<<<<<<<<<
@@ -2609,7 +2609,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":362
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":362
  * 
  * 
  * cdef int _unhexlify_sha1(char *as_hex, char *as_bin): # cannot_raise             # <<<<<<<<<<<<<<
@@ -2628,7 +2628,7 @@
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("_unhexlify_sha1");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":374
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":374
  *     # binascii does this using isupper() and tolower() and ?: syntax. I'm
  *     # guessing a simple lookup array should be faster.
  *     j = 0             # <<<<<<<<<<<<<<
@@ -2637,7 +2637,7 @@
  */
   __pyx_v_j = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":375
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":375
  *     # guessing a simple lookup array should be faster.
  *     j = 0
  *     for i from 0 <= i < 20:             # <<<<<<<<<<<<<<
@@ -2646,7 +2646,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < 20; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":376
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":376
  *     j = 0
  *     for i from 0 <= i < 20:
  *         top = _unhexbuf[<unsigned char>(as_hex[j])]             # <<<<<<<<<<<<<<
@@ -2655,7 +2655,7 @@
  */
     __pyx_v_top = (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((unsigned char)(__pyx_v_as_hex[__pyx_v_j]))]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":377
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":377
  *     for i from 0 <= i < 20:
  *         top = _unhexbuf[<unsigned char>(as_hex[j])]
  *         j = j + 1             # <<<<<<<<<<<<<<
@@ -2664,7 +2664,7 @@
  */
     __pyx_v_j = (__pyx_v_j + 1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":378
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":378
  *         top = _unhexbuf[<unsigned char>(as_hex[j])]
  *         j = j + 1
  *         bot = _unhexbuf[<unsigned char>(as_hex[j])]             # <<<<<<<<<<<<<<
@@ -2673,7 +2673,7 @@
  */
     __pyx_v_bot = (__pyx_v_6bzrlib_21_btree_serializer_pyx__unhexbuf[((unsigned char)(__pyx_v_as_hex[__pyx_v_j]))]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":379
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":379
  *         j = j + 1
  *         bot = _unhexbuf[<unsigned char>(as_hex[j])]
  *         j = j + 1             # <<<<<<<<<<<<<<
@@ -2682,7 +2682,7 @@
  */
     __pyx_v_j = (__pyx_v_j + 1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":380
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":380
  *         bot = _unhexbuf[<unsigned char>(as_hex[j])]
  *         j = j + 1
  *         if top == -1 or bot == -1:             # <<<<<<<<<<<<<<
@@ -2698,7 +2698,7 @@
     }
     if (__pyx_t_3) {
 
-      /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":381
+      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":381
  *         j = j + 1
  *         if top == -1 or bot == -1:
  *             return 0             # <<<<<<<<<<<<<<
@@ -2711,7 +2711,7 @@
     }
     __pyx_L5:;
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":382
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":382
  *         if top == -1 or bot == -1:
  *             return 0
  *         as_bin[i] = <unsigned char>((top << 4) + bot);             # <<<<<<<<<<<<<<
@@ -2721,7 +2721,7 @@
     (__pyx_v_as_bin[__pyx_v_i]) = ((unsigned char)((__pyx_v_top << 4) + __pyx_v_bot));
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":383
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":383
  *             return 0
  *         as_bin[i] = <unsigned char>((top << 4) + bot);
  *     return 1             # <<<<<<<<<<<<<<
@@ -2737,7 +2737,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":386
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":386
  * 
  * 
  * def _py_unhexlify(as_hex):             # <<<<<<<<<<<<<<
@@ -2761,7 +2761,7 @@
   __pyx_self = __pyx_self;
   __pyx_v_as_bin = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":388
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":388
  * def _py_unhexlify(as_hex):
  *     """For the test infrastructure, just thunks to _unhexlify_sha1"""
  *     if len(as_hex) != 40 or not PyString_CheckExact(as_hex):             # <<<<<<<<<<<<<<
@@ -2778,7 +2778,7 @@
   }
   if (__pyx_t_4) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":389
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":389
  *     """For the test infrastructure, just thunks to _unhexlify_sha1"""
  *     if len(as_hex) != 40 or not PyString_CheckExact(as_hex):
  *         raise ValueError('not a 40-byte hex digest')             # <<<<<<<<<<<<<<
@@ -2800,7 +2800,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":390
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":390
  *     if len(as_hex) != 40 or not PyString_CheckExact(as_hex):
  *         raise ValueError('not a 40-byte hex digest')
  *     as_bin = PyString_FromStringAndSize(NULL, 20)             # <<<<<<<<<<<<<<
@@ -2813,7 +2813,7 @@
   __pyx_v_as_bin = __pyx_t_6;
   __pyx_t_6 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":391
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":391
  *         raise ValueError('not a 40-byte hex digest')
  *     as_bin = PyString_FromStringAndSize(NULL, 20)
  *     if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)):             # <<<<<<<<<<<<<<
@@ -2823,7 +2823,7 @@
   __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));
   if (__pyx_t_7) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":392
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":392
  *     as_bin = PyString_FromStringAndSize(NULL, 20)
  *     if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)):
  *         return as_bin             # <<<<<<<<<<<<<<
@@ -2838,7 +2838,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":393
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":393
  *     if _unhexlify_sha1(PyString_AS_STRING(as_hex), PyString_AS_STRING(as_bin)):
  *         return as_bin
  *     return None             # <<<<<<<<<<<<<<
@@ -2864,7 +2864,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":396
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":396
  * 
  * 
  * cdef void _hexlify_sha1(char *as_bin, char *as_hex): # cannot_raise             # <<<<<<<<<<<<<<
@@ -2878,7 +2878,7 @@
   char __pyx_v_c;
   __Pyx_RefNannySetupContext("_hexlify_sha1");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":400
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":400
  *     cdef char c
  * 
  *     j = 0             # <<<<<<<<<<<<<<
@@ -2887,7 +2887,7 @@
  */
   __pyx_v_j = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":401
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":401
  * 
  *     j = 0
  *     for i from 0 <= i < 20:             # <<<<<<<<<<<<<<
@@ -2896,7 +2896,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < 20; __pyx_v_i++) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":402
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":402
  *     j = 0
  *     for i from 0 <= i < 20:
  *         c = as_bin[i]             # <<<<<<<<<<<<<<
@@ -2905,7 +2905,7 @@
  */
     __pyx_v_c = (__pyx_v_as_bin[__pyx_v_i]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":403
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":403
  *     for i from 0 <= i < 20:
  *         c = as_bin[i]
  *         as_hex[j] = _hexbuf[(c>>4)&0xf]             # <<<<<<<<<<<<<<
@@ -2914,7 +2914,7 @@
  */
     (__pyx_v_as_hex[__pyx_v_j]) = (__pyx_v_6bzrlib_21_btree_serializer_pyx__hexbuf[((__pyx_v_c >> 4) & 0xf)]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":404
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":404
  *         c = as_bin[i]
  *         as_hex[j] = _hexbuf[(c>>4)&0xf]
  *         j = j + 1             # <<<<<<<<<<<<<<
@@ -2923,7 +2923,7 @@
  */
     __pyx_v_j = (__pyx_v_j + 1);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":405
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":405
  *         as_hex[j] = _hexbuf[(c>>4)&0xf]
  *         j = j + 1
  *         as_hex[j] = _hexbuf[(c)&0xf]             # <<<<<<<<<<<<<<
@@ -2932,7 +2932,7 @@
  */
     (__pyx_v_as_hex[__pyx_v_j]) = (__pyx_v_6bzrlib_21_btree_serializer_pyx__hexbuf[(__pyx_v_c & 0xf)]);
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":406
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":406
  *         j = j + 1
  *         as_hex[j] = _hexbuf[(c)&0xf]
  *         j = j + 1             # <<<<<<<<<<<<<<
@@ -2945,7 +2945,7 @@
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":409
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":409
  * 
  * 
  * def _py_hexlify(as_bin):             # <<<<<<<<<<<<<<
@@ -2968,7 +2968,7 @@
   __pyx_self = __pyx_self;
   __pyx_v_as_hex = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":411
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":411
  * def _py_hexlify(as_bin):
  *     """For test infrastructure, thunk to _hexlify_sha1"""
  *     if len(as_bin) != 20 or not PyString_CheckExact(as_bin):             # <<<<<<<<<<<<<<
@@ -2985,7 +2985,7 @@
   }
   if (__pyx_t_4) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":412
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":412
  *     """For test infrastructure, thunk to _hexlify_sha1"""
  *     if len(as_bin) != 20 or not PyString_CheckExact(as_bin):
  *         raise ValueError('not a 20-byte binary digest')             # <<<<<<<<<<<<<<
@@ -3007,7 +3007,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":413
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":413
  *     if len(as_bin) != 20 or not PyString_CheckExact(as_bin):
  *         raise ValueError('not a 20-byte binary digest')
  *     as_hex = PyString_FromStringAndSize(NULL, 40)             # <<<<<<<<<<<<<<
@@ -3020,7 +3020,7 @@
   __pyx_v_as_hex = __pyx_t_6;
   __pyx_t_6 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":414
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":414
  *         raise ValueError('not a 20-byte binary digest')
  *     as_hex = PyString_FromStringAndSize(NULL, 40)
  *     _hexlify_sha1(PyString_AS_STRING(as_bin), PyString_AS_STRING(as_hex))             # <<<<<<<<<<<<<<
@@ -3029,7 +3029,7 @@
  */
   __pyx_f_6bzrlib_21_btree_serializer_pyx__hexlify_sha1(PyString_AS_STRING(__pyx_v_as_bin), PyString_AS_STRING(__pyx_v_as_hex));
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":415
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":415
  *     as_hex = PyString_FromStringAndSize(NULL, 40)
  *     _hexlify_sha1(PyString_AS_STRING(as_bin), PyString_AS_STRING(as_hex))
  *     return as_hex             # <<<<<<<<<<<<<<
@@ -3055,7 +3055,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":418
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":418
  * 
  * 
  * cdef int _key_to_sha1(key, char *sha1): # cannot_raise             # <<<<<<<<<<<<<<
@@ -3071,7 +3071,7 @@
   int __pyx_t_2;
   __Pyx_RefNannySetupContext("_key_to_sha1");
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":428
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":428
  *     cdef PyObject *p_val
  * 
  *     if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1:             # <<<<<<<<<<<<<<
@@ -3087,7 +3087,7 @@
   }
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":429
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":429
  * 
  *     if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1:
  *         p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0)             # <<<<<<<<<<<<<<
@@ -3099,7 +3099,7 @@
     goto __pyx_L3;
   }
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":430
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":430
  *     if StaticTuple_CheckExact(key) and StaticTuple_GET_SIZE(key) == 1:
  *         p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0)
  *     elif (PyTuple_CheckExact(key) and PyTuple_GET_SIZE(key) == 1):             # <<<<<<<<<<<<<<
@@ -3114,7 +3114,7 @@
   }
   if (__pyx_t_1) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":431
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":431
  *         p_val = <PyObject *>StaticTuple_GET_ITEM(key, 0)
  *     elif (PyTuple_CheckExact(key) and PyTuple_GET_SIZE(key) == 1):
  *         p_val = PyTuple_GET_ITEM_ptr_object(key, 0)             # <<<<<<<<<<<<<<
@@ -3126,7 +3126,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":434
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":434
  *     else:
  *         # Not a tuple or a StaticTuple
  *         return 0             # <<<<<<<<<<<<<<
@@ -3138,7 +3138,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":435
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":435
  *         # Not a tuple or a StaticTuple
  *         return 0
  *     if (PyString_CheckExact_ptr(p_val) and PyString_GET_SIZE_ptr(p_val) == 45):             # <<<<<<<<<<<<<<
@@ -3153,7 +3153,7 @@
   }
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":436
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":436
  *         return 0
  *     if (PyString_CheckExact_ptr(p_val) and PyString_GET_SIZE_ptr(p_val) == 45):
  *         c_val = PyString_AS_STRING_ptr(p_val)             # <<<<<<<<<<<<<<
@@ -3165,7 +3165,7 @@
   }
   /*else*/ {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":438
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":438
  *         c_val = PyString_AS_STRING_ptr(p_val)
  *     else:
  *         return 0             # <<<<<<<<<<<<<<
@@ -3177,7 +3177,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":439
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":439
  *     else:
  *         return 0
  *     if strncmp(c_val, 'sha1:', 5) != 0:             # <<<<<<<<<<<<<<
@@ -3187,7 +3187,7 @@
   __pyx_t_2 = (strncmp(__pyx_v_c_val, __pyx_k_3, 5) != 0);
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":440
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":440
  *         return 0
  *     if strncmp(c_val, 'sha1:', 5) != 0:
  *         return 0             # <<<<<<<<<<<<<<
@@ -3200,7 +3200,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":441
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":441
  *     if strncmp(c_val, 'sha1:', 5) != 0:
  *         return 0
  *     if not _unhexlify_sha1(c_val + 5, sha1):             # <<<<<<<<<<<<<<
@@ -3210,7 +3210,7 @@
   __pyx_t_2 = (!__pyx_f_6bzrlib_21_btree_serializer_pyx__unhexlify_sha1((__pyx_v_c_val + 5), __pyx_v_sha1));
   if (__pyx_t_2) {
 
-    /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":442
+    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":442
  *         return 0
  *     if not _unhexlify_sha1(c_val + 5, sha1):
  *         return 0             # <<<<<<<<<<<<<<
@@ -3223,7 +3223,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":443
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":443
  *     if not _unhexlify_sha1(c_val + 5, sha1):
  *         return 0
  *     return 1             # <<<<<<<<<<<<<<
@@ -3243,7 +3243,7 @@
   return __pyx_r;
 }
 
-/* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":446
+/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":446
  * 
  * 
  * def _py_key_to_sha1(key):             # <<<<<<<<<<<<<<
@@ -3262,7 +3262,7 @@
   __pyx_self = __pyx_self;
   __pyx_v_as_bin_sha = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":451
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":451
  *     This is a testing thunk to the C function.
  *     """
  *     as_bin_sha = PyString_FromStringAndSize(NULL, 20)             # <<<<<<<<<<<<<<
@@ -3275,7 +3275,7 @@
   __pyx_v_as_bin_sha = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/vila/src/bzr/integration/2.4.0-dev/bzrlib/_btree_serializer_pyx.pyx":452
+  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_btree_serializer_pyx.pyx":452
  *     """
  *     as_bin_sha = PyString_FromStringAndSize(NULL, 20)