/* Generated by Cython 0.13 on Mon Sep 19 20:18:37 2011 */

#define PY_SSIZE_T_CLEAN
#include "Python.h"
#ifndef Py_PYTHON_H
    #error Python headers needed to compile C extensions, please install development version of Python.
#else

#include <stddef.h> /* For offsetof */
#ifndef offsetof
#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
#endif

#if !defined(WIN32) && !defined(MS_WINDOWS)
  #ifndef __stdcall
    #define __stdcall
  #endif
  #ifndef __cdecl
    #define __cdecl
  #endif
  #ifndef __fastcall
    #define __fastcall
  #endif
#endif

#ifndef DL_IMPORT
  #define DL_IMPORT(t) t
#endif
#ifndef DL_EXPORT
  #define DL_EXPORT(t) t
#endif

#ifndef PY_LONG_LONG
  #define PY_LONG_LONG LONG_LONG
#endif

#if PY_VERSION_HEX < 0x02040000
  #define METH_COEXIST 0
  #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
  #define PyDict_Contains(d,o)   PySequence_Contains(d,o)
#endif

#if PY_VERSION_HEX < 0x02050000
  typedef int Py_ssize_t;
  #define PY_SSIZE_T_MAX INT_MAX
  #define PY_SSIZE_T_MIN INT_MIN
  #define PY_FORMAT_SIZE_T ""
  #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
  #define PyInt_AsSsize_t(o)   PyInt_AsLong(o)
  #define PyNumber_Index(o)    PyNumber_Int(o)
  #define PyIndex_Check(o)     PyNumber_Check(o)
  #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
#endif

#if PY_VERSION_HEX < 0x02060000
  #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
  #define Py_TYPE(ob)   (((PyObject*)(ob))->ob_type)
  #define Py_SIZE(ob)   (((PyVarObject*)(ob))->ob_size)
  #define PyVarObject_HEAD_INIT(type, size) \
          PyObject_HEAD_INIT(type) size,
  #define PyType_Modified(t)

  typedef struct {
     void *buf;
     PyObject *obj;
     Py_ssize_t len;
     Py_ssize_t itemsize;
     int readonly;
     int ndim;
     char *format;
     Py_ssize_t *shape;
     Py_ssize_t *strides;
     Py_ssize_t *suboffsets;
     void *internal;
  } Py_buffer;

  #define PyBUF_SIMPLE 0
  #define PyBUF_WRITABLE 0x0001
  #define PyBUF_FORMAT 0x0004
  #define PyBUF_ND 0x0008
  #define PyBUF_STRIDES (0x0010 | PyBUF_ND)
  #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
  #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
  #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
  #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)

#endif

#if PY_MAJOR_VERSION < 3
  #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
#else
  #define __Pyx_BUILTIN_MODULE_NAME "builtins"
#endif

#if PY_MAJOR_VERSION >= 3
  #define Py_TPFLAGS_CHECKTYPES 0
  #define Py_TPFLAGS_HAVE_INDEX 0
#endif

#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
  #define Py_TPFLAGS_HAVE_NEWBUFFER 0
#endif

#if PY_MAJOR_VERSION >= 3
  #define PyBaseString_Type            PyUnicode_Type
  #define PyStringObject               PyUnicodeObject
  #define PyString_Type                PyUnicode_Type
  #define PyString_Check               PyUnicode_Check
  #define PyString_CheckExact          PyUnicode_CheckExact
#endif

#if PY_VERSION_HEX < 0x02060000
  #define PyBytesObject                PyStringObject
  #define PyBytes_Type                 PyString_Type
  #define PyBytes_Check                PyString_Check
  #define PyBytes_CheckExact           PyString_CheckExact
  #define PyBytes_FromString           PyString_FromString
  #define PyBytes_FromStringAndSize    PyString_FromStringAndSize
  #define PyBytes_FromFormat           PyString_FromFormat
  #define PyBytes_DecodeEscape         PyString_DecodeEscape
  #define PyBytes_AsString             PyString_AsString
  #define PyBytes_AsStringAndSize      PyString_AsStringAndSize
  #define PyBytes_Size                 PyString_Size
  #define PyBytes_AS_STRING            PyString_AS_STRING
  #define PyBytes_GET_SIZE             PyString_GET_SIZE
  #define PyBytes_Repr                 PyString_Repr
  #define PyBytes_Concat               PyString_Concat
  #define PyBytes_ConcatAndDel         PyString_ConcatAndDel
  #define PySet_Check(obj)             PyObject_TypeCheck(obj, &PySet_Type)
  #define PyFrozenSet_Check(obj)       PyObject_TypeCheck(obj, &PyFrozenSet_Type)
#endif

#ifndef PySet_CheckExact
#  define PySet_CheckExact(obj)          (Py_TYPE(obj) == &PySet_Type)
#endif

#if PY_MAJOR_VERSION >= 3
  #define PyInt_Type                   PyLong_Type
  #define PyInt_Check(op)              PyLong_Check(op)
  #define PyInt_CheckExact(op)         PyLong_CheckExact(op)
  #define PyInt_FromString             PyLong_FromString
  #define PyInt_FromUnicode            PyLong_FromUnicode
  #define PyInt_FromLong               PyLong_FromLong
  #define PyInt_FromSize_t             PyLong_FromSize_t
  #define PyInt_FromSsize_t            PyLong_FromSsize_t
  #define PyInt_AsLong                 PyLong_AsLong
  #define PyInt_AS_LONG                PyLong_AS_LONG
  #define PyInt_AsSsize_t              PyLong_AsSsize_t
  #define PyInt_AsUnsignedLongMask     PyLong_AsUnsignedLongMask
  #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#endif

#if PY_MAJOR_VERSION >= 3
  #define PyBoolObject PyLongObject
#endif


#if PY_MAJOR_VERSION >= 3
  #define __Pyx_PyNumber_Divide(x,y)         PyNumber_TrueDivide(x,y)
  #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceTrueDivide(x,y)
#else
  #define __Pyx_PyNumber_Divide(x,y)         PyNumber_Divide(x,y)
  #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceDivide(x,y)
#endif

#if PY_MAJOR_VERSION >= 3
  #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
#endif

#if PY_VERSION_HEX < 0x02050000
  #define __Pyx_GetAttrString(o,n)   PyObject_GetAttrString((o),((char *)(n)))
  #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
  #define __Pyx_DelAttrString(o,n)   PyObject_DelAttrString((o),((char *)(n)))
#else
  #define __Pyx_GetAttrString(o,n)   PyObject_GetAttrString((o),(n))
  #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
  #define __Pyx_DelAttrString(o,n)   PyObject_DelAttrString((o),(n))
#endif

#if PY_VERSION_HEX < 0x02050000
  #define __Pyx_NAMESTR(n) ((char *)(n))
  #define __Pyx_DOCSTR(n)  ((char *)(n))
#else
  #define __Pyx_NAMESTR(n) (n)
  #define __Pyx_DOCSTR(n)  (n)
#endif

#ifdef __cplusplus
#define __PYX_EXTERN_C extern "C"
#else
#define __PYX_EXTERN_C extern
#endif

#if defined(WIN32) || defined(MS_WINDOWS)
#define _USE_MATH_DEFINES
#endif
#include <math.h>
#define __PYX_HAVE_API__bzrlib___annotator_pyx
#include "python-compat.h"

/* inline attribute */
#ifndef CYTHON_INLINE
  #if defined(__GNUC__)
    #define CYTHON_INLINE __inline__
  #elif defined(_MSC_VER)
    #define CYTHON_INLINE __inline
  #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
    #define CYTHON_INLINE inline
  #else
    #define CYTHON_INLINE 
  #endif
#endif

/* unused attribute */
#ifndef CYTHON_UNUSED
# if defined(__GNUC__)
#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#     define CYTHON_UNUSED __attribute__ ((__unused__)) 
#   else
#     define CYTHON_UNUSED
#   endif
# elif defined(__ICC) || defined(__INTEL_COMPILER)
#   define CYTHON_UNUSED __attribute__ ((__unused__)) 
# else
#   define CYTHON_UNUSED 
# endif
#endif

typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/


/* Type Conversion Predeclarations */

#define __Pyx_PyBytes_FromUString(s) PyBytes_FromString((char*)s)
#define __Pyx_PyBytes_AsUString(s)   ((unsigned char*) PyBytes_AsString(s))

#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);

static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);

#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))


#ifdef __GNUC__
/* Test for GCC > 2.95 */
#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)) 
#define likely(x)   __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
#else /* __GNUC__ > 2 ... */
#define likely(x)   (x)
#define unlikely(x) (x)
#endif /* __GNUC__ > 2 ... */
#else /* __GNUC__ */
#define likely(x)   (x)
#define unlikely(x) (x)
#endif /* __GNUC__ */
    
static PyObject *__pyx_m;
static PyObject *__pyx_b;
static PyObject *__pyx_empty_tuple;
static PyObject *__pyx_empty_bytes;
static int __pyx_lineno;
static int __pyx_clineno = 0;
static const char * __pyx_cfilenm= __FILE__;
static const char *__pyx_filename;


static const char *__pyx_f[] = {
  "_annotator_pyx.pyx",
};

/* Type declarations */

#ifndef CYTHON_REFNANNY
  #define CYTHON_REFNANNY 0
#endif

#if CYTHON_REFNANNY
  typedef struct {
    void (*INCREF)(void*, PyObject*, int);
    void (*DECREF)(void*, PyObject*, int);
    void (*GOTREF)(void*, PyObject*, int);
    void (*GIVEREF)(void*, PyObject*, int);
    void* (*SetupContext)(const char*, int, const char*);
    void (*FinishContext)(void**);
  } __Pyx_RefNannyAPIStruct;
  static __Pyx_RefNannyAPIStruct *__Pyx_RefNanny = NULL;
  static __Pyx_RefNannyAPIStruct * __Pyx_RefNannyImportAPI(const char *modname) {
    PyObject *m = NULL, *p = NULL;
    void *r = NULL;
    m = PyImport_ImportModule((char *)modname);
    if (!m) goto end;
    p = PyObject_GetAttrString(m, (char *)"RefNannyAPI");
    if (!p) goto end;
    r = PyLong_AsVoidPtr(p);
  end:
    Py_XDECREF(p);
    Py_XDECREF(m);
    return (__Pyx_RefNannyAPIStruct *)r;
  }
  #define __Pyx_RefNannySetupContext(name)           void *__pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)
  #define __Pyx_RefNannyFinishContext()           __Pyx_RefNanny->FinishContext(&__pyx_refnanny)
  #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
  #define __Pyx_DECREF(r) __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
  #define __Pyx_GOTREF(r) __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
  #define __Pyx_GIVEREF(r) __Pyx_RefNanny->GIVEREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
  #define __Pyx_XDECREF(r) do { if((r) != NULL) {__Pyx_DECREF(r);} } while(0)
#else
  #define __Pyx_RefNannySetupContext(name)
  #define __Pyx_RefNannyFinishContext()
  #define __Pyx_INCREF(r) Py_INCREF(r)
  #define __Pyx_DECREF(r) Py_DECREF(r)
  #define __Pyx_GOTREF(r)
  #define __Pyx_GIVEREF(r)
  #define __Pyx_XDECREF(r) Py_XDECREF(r)
#endif /* CYTHON_REFNANNY */
#define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);} } while(0)
#define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r);} } while(0)

static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/

static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);

static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected);

static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/
static int __Pyx_EndUnpack(PyObject *, Py_ssize_t expected); /*proto*/

static void __Pyx_RaiseDoubleKeywordsError(
    const char* func_name, PyObject* kw_name); /*proto*/

static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
    Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); /*proto*/

static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],     PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,     const char* function_name); /*proto*/


static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
    PyObject *r;
    if (!j) return NULL;
    r = PyObject_GetItem(o, j);
    Py_DECREF(j);
    return r;
}


#define __Pyx_GetItemInt_List(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
                                                    __Pyx_GetItemInt_List_Fast(o, i) : \
                                                    __Pyx_GetItemInt_Generic(o, to_py_func(i)))

static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i) {
    if (likely(o != Py_None)) {
        if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {
            PyObject *r = PyList_GET_ITEM(o, i);
            Py_INCREF(r);
            return r;
        }
        else if ((-PyList_GET_SIZE(o) <= i) & (i < 0)) {
            PyObject *r = PyList_GET_ITEM(o, PyList_GET_SIZE(o) + i);
            Py_INCREF(r);
            return r;
        }
    }
    return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
}

#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
                                                    __Pyx_GetItemInt_Tuple_Fast(o, i) : \
                                                    __Pyx_GetItemInt_Generic(o, to_py_func(i)))

static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i) {
    if (likely(o != Py_None)) {
        if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
            PyObject *r = PyTuple_GET_ITEM(o, i);
            Py_INCREF(r);
            return r;
        }
        else if ((-PyTuple_GET_SIZE(o) <= i) & (i < 0)) {
            PyObject *r = PyTuple_GET_ITEM(o, PyTuple_GET_SIZE(o) + i);
            Py_INCREF(r);
            return r;
        }
    }
    return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
}


#define __Pyx_GetItemInt(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
                                                    __Pyx_GetItemInt_Fast(o, i) : \
                                                    __Pyx_GetItemInt_Generic(o, to_py_func(i)))

static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i) {
    PyObject *r;
    if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
        r = PyList_GET_ITEM(o, i);
        Py_INCREF(r);
    }
    else if (PyTuple_CheckExact(o) && ((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
        r = PyTuple_GET_ITEM(o, i);
        Py_INCREF(r);
    }
    else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_item && (likely(i >= 0))) {
        r = PySequence_GetItem(o, i);
    }
    else {
        r = __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
    }
    return r;
}

static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/

static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, const char *modname); /*proto*/

static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/

static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/

static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);

static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);

static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);

static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);

static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);

static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);

static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);

static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);

static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);

static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject *);

static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);

static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);

static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);

static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);

static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);

static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);

static void __Pyx_AddTraceback(const char *funcname); /*proto*/

static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
/* Module declarations from bzrlib._annotator_pyx */

static int __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(PyObject *, PyObject *); /*proto*/
static int __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(PyObject *, PyObject *, Py_ssize_t, Py_ssize_t, Py_ssize_t); /*proto*/
static PyObject *__pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(PyObject *, Py_ssize_t *); /*proto*/
static PyObject *__pyx_f_6bzrlib_14_annotator_pyx__combine_annotations(PyObject *, PyObject *, PyObject *); /*proto*/
static int __pyx_f_6bzrlib_14_annotator_pyx__apply_parent_annotations(PyObject *, PyObject *, PyObject *); /*proto*/
static int __pyx_f_6bzrlib_14_annotator_pyx__merge_annotations(PyObject *, PyObject *, PyObject *, PyObject *, PyObject *); /*proto*/
#define __Pyx_MODULE_NAME "bzrlib._annotator_pyx"
int __pyx_module_is_main_bzrlib___annotator_pyx = 0;

/* Implementation of bzrlib._annotator_pyx */
static PyObject *__pyx_builtin_TypeError;
static PyObject *__pyx_builtin_ValueError;
static char __pyx_k_1[] = "annotations must be a list";
static char __pyx_k_2[] = "parent_annotations must be a list";
static char __pyx_k_3[] = "Match length exceeds len of parent_annotations %s > %s";
static char __pyx_k_4[] = "Match length exceeds len of annotations %s > %s";
static char __pyx_k_5[] = "annotations must be tuples";
static char __pyx_k_6[] = "_get_parent_annotations_and_matches";
static char __pyx_k_7[] = "_break_annotation_tie";
static char __pyx_k_8[] = "_resolve_annotation_tie";
static char __pyx_k_9[] = "Functionality for doing annotations in the 'optimal' way";
static char __pyx_k_10[] = "Class that drives performing annotations.";
static char __pyx_k_11[] = "_update_from_first_parent";
static char __pyx_k_12[] = "_update_from_other_parents";
static char __pyx_k_13[] = "Annotator._update_from_first_parent (line 247)";
static char __pyx_k_14[] = "Annotator._update_from_other_parents (line 256)";
static char __pyx_k_15[] = "Annotator.annotate_flat (line 265)";
static char __pyx_k__key[] = "key";
static char __pyx_k__self[] = "self";
static char __pyx_k__heads[] = "heads";
static char __pyx_k__lines[] = "lines";
static char __pyx_k__bzrlib[] = "bzrlib";
static char __pyx_k__ob_item[] = "ob_item";
static char __pyx_k____main__[] = "__main__";
static char __pyx_k____test__[] = "__test__";
static char __pyx_k__annotate[] = "annotate";
static char __pyx_k__Annotator[] = "Annotator";
static char __pyx_k__TypeError[] = "TypeError";
static char __pyx_k__ValueError[] = "ValueError";
static char __pyx_k__parent_key[] = "parent_key";
static char __pyx_k__annotations[] = "annotations";
static char __pyx_k___annotator_py[] = "_annotator_py";
static char __pyx_k__annotate_flat[] = "annotate_flat";
static char __pyx_k__this_annotation[] = "this_annotation";
static char __pyx_k___ann_tuple_cache[] = "_ann_tuple_cache";
static char __pyx_k___get_heads_provider[] = "_get_heads_provider";
static PyObject *__pyx_kp_s_1;
static PyObject *__pyx_kp_s_10;
static PyObject *__pyx_n_s_11;
static PyObject *__pyx_n_s_12;
static PyObject *__pyx_kp_u_13;
static PyObject *__pyx_kp_u_14;
static PyObject *__pyx_kp_u_15;
static PyObject *__pyx_kp_s_2;
static PyObject *__pyx_kp_s_3;
static PyObject *__pyx_kp_s_4;
static PyObject *__pyx_kp_s_5;
static PyObject *__pyx_n_s_6;
static PyObject *__pyx_n_s_7;
static PyObject *__pyx_n_s_8;
static PyObject *__pyx_n_s__Annotator;
static PyObject *__pyx_n_s__TypeError;
static PyObject *__pyx_n_s__ValueError;
static PyObject *__pyx_n_s____main__;
static PyObject *__pyx_n_s____test__;
static PyObject *__pyx_n_s___ann_tuple_cache;
static PyObject *__pyx_n_s___annotator_py;
static PyObject *__pyx_n_s___get_heads_provider;
static PyObject *__pyx_n_s__annotate;
static PyObject *__pyx_n_s__annotate_flat;
static PyObject *__pyx_n_s__annotations;
static PyObject *__pyx_n_s__bzrlib;
static PyObject *__pyx_n_s__heads;
static PyObject *__pyx_n_s__key;
static PyObject *__pyx_n_s__lines;
static PyObject *__pyx_n_s__ob_item;
static PyObject *__pyx_n_s__parent_key;
static PyObject *__pyx_n_s__self;
static PyObject *__pyx_n_s__this_annotation;

/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":61
 * 
 * 
 * cdef int _check_annotations_are_lists(annotations,             # <<<<<<<<<<<<<<
 *                                       parent_annotations) except -1:
 *     if not PyList_CheckExact(annotations):
 */

static  int __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(PyObject *__pyx_v_annotations, PyObject *__pyx_v_parent_annotations) {
  int __pyx_r;
  int __pyx_t_1;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  __Pyx_RefNannySetupContext("_check_annotations_are_lists");

  /* "/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):             # <<<<<<<<<<<<<<
 *         raise TypeError('annotations must be a list')
 *     if not PyList_CheckExact(parent_annotations):
 */
  __pyx_t_1 = (!PyList_CheckExact(__pyx_v_annotations));
  if (__pyx_t_1) {

    /* "/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')             # <<<<<<<<<<<<<<
 *     if not PyList_CheckExact(parent_annotations):
 *         raise TypeError('parent_annotations must be a list')
 */
    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __Pyx_INCREF(((PyObject *)__pyx_kp_s_1));
    PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_1));
    __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_1));
    __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
    __Pyx_Raise(__pyx_t_3, 0, 0);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    goto __pyx_L3;
  }
  __pyx_L3:;

  /* "/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):             # <<<<<<<<<<<<<<
 *         raise TypeError('parent_annotations must be a list')
 *     return 0
 */
  __pyx_t_1 = (!PyList_CheckExact(__pyx_v_parent_annotations));
  if (__pyx_t_1) {

    /* "/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')             # <<<<<<<<<<<<<<
 *     return 0
 * 
 */
    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __Pyx_INCREF(((PyObject *)__pyx_kp_s_2));
    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_2));
    __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_2));
    __pyx_t_2 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __Pyx_Raise(__pyx_t_2, 0, 0);
    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    goto __pyx_L4;
  }
  __pyx_L4:;

  /* "/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             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_r = 0;
  goto __pyx_L0;

  __pyx_r = 0;
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_AddTraceback("bzrlib._annotator_pyx._check_annotations_are_lists");
  __pyx_r = -1;
  __pyx_L0:;
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":70
 * 
 * 
 * cdef int _check_match_ranges(parent_annotations, annotations,             # <<<<<<<<<<<<<<
 *                              Py_ssize_t parent_idx, Py_ssize_t lines_idx,
 *                              Py_ssize_t match_len) except -1:
 */

static  int __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(PyObject *__pyx_v_parent_annotations, PyObject *__pyx_v_annotations, Py_ssize_t __pyx_v_parent_idx, Py_ssize_t __pyx_v_lines_idx, Py_ssize_t __pyx_v_match_len) {
  int __pyx_r;
  int __pyx_t_1;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  __Pyx_RefNannySetupContext("_check_match_ranges");

  /* "/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):             # <<<<<<<<<<<<<<
 *         raise ValueError('Match length exceeds len of'
 *                          ' parent_annotations %s > %s'
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":76
 *         raise ValueError('Match length exceeds len of'
 *                          ' parent_annotations %s > %s'
 *                          % (parent_idx + match_len,             # <<<<<<<<<<<<<<
 *                             PyList_GET_SIZE(parent_annotations)))
 *     if lines_idx + match_len > PyList_GET_SIZE(annotations):
 */
    __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.2-dev/bzrlib/_annotator_pyx.pyx":77
 *                          ' parent_annotations %s > %s'
 *                          % (parent_idx + match_len,
 *                             PyList_GET_SIZE(parent_annotations)))             # <<<<<<<<<<<<<<
 *     if lines_idx + match_len > PyList_GET_SIZE(annotations):
 *         raise ValueError('Match length exceeds len of'
 */
    __pyx_t_3 = PyInt_FromSsize_t(PyList_GET_SIZE(__pyx_v_parent_annotations)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);
    __Pyx_GIVEREF(__pyx_t_2);
    PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);
    __Pyx_GIVEREF(__pyx_t_3);
    __pyx_t_2 = 0;
    __pyx_t_3 = 0;
    __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_3), __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
    __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
    __pyx_t_3 = 0;
    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    __Pyx_Raise(__pyx_t_3, 0, 0);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    goto __pyx_L3;
  }
  __pyx_L3:;

  /* "/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):             # <<<<<<<<<<<<<<
 *         raise ValueError('Match length exceeds len of'
 *                          ' annotations %s > %s'
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":81
 *         raise ValueError('Match length exceeds len of'
 *                          ' annotations %s > %s'
 *                          % (lines_idx + match_len,             # <<<<<<<<<<<<<<
 *                             PyList_GET_SIZE(annotations)))
 *     return 0
 */
    __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.2-dev/bzrlib/_annotator_pyx.pyx":82
 *                          ' annotations %s > %s'
 *                          % (lines_idx + match_len,
 *                             PyList_GET_SIZE(annotations)))             # <<<<<<<<<<<<<<
 *     return 0
 * 
 */
    __pyx_t_4 = PyInt_FromSsize_t(PyList_GET_SIZE(__pyx_v_annotations)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3);
    __Pyx_GIVEREF(__pyx_t_3);
    PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4);
    __Pyx_GIVEREF(__pyx_t_4);
    __pyx_t_3 = 0;
    __pyx_t_4 = 0;
    __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_4), __pyx_t_2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_4));
    __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
    __pyx_t_4 = 0;
    __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
    __Pyx_Raise(__pyx_t_4, 0, 0);
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    goto __pyx_L4;
  }
  __pyx_L4:;

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":83
 *                          % (lines_idx + match_len,
 *                             PyList_GET_SIZE(annotations)))
 *     return 0             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_r = 0;
  goto __pyx_L0;

  __pyx_r = 0;
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_AddTraceback("bzrlib._annotator_pyx._check_match_ranges");
  __pyx_r = -1;
  __pyx_L0:;
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/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             # <<<<<<<<<<<<<<
 *     """Return the next entry from this tuple.
 * 
 */

static  PyObject *__pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(PyObject *__pyx_v_tpl, Py_ssize_t *__pyx_v_pos) {
  PyObject *__pyx_r;
  int __pyx_t_1;
  __Pyx_RefNannySetupContext("_next_tuple_entry");

  /* "/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             # <<<<<<<<<<<<<<
 *     if pos[0] >= PyTuple_GET_SIZE(tpl):
 *         return NULL
 */
  (__pyx_v_pos[0]) = ((__pyx_v_pos[0]) + 1);

  /* "/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):             # <<<<<<<<<<<<<<
 *         return NULL
 *     return PyTuple_GET_ITEM(tpl, pos[0])
 */
  __pyx_t_1 = ((__pyx_v_pos[0]) >= PyTuple_GET_SIZE(__pyx_v_tpl));
  if (__pyx_t_1) {

    /* "/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             # <<<<<<<<<<<<<<
 *     return PyTuple_GET_ITEM(tpl, pos[0])
 * 
 */
    __pyx_r = NULL;
    goto __pyx_L0;
    goto __pyx_L3;
  }
  __pyx_L3:;

  /* "/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])             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_r = PyTuple_GET_ITEM(__pyx_v_tpl, (__pyx_v_pos[0]));
  goto __pyx_L0;

  __pyx_r = 0;
  __pyx_L0:;
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":100
 * 
 * 
 * cdef object _combine_annotations(ann_one, ann_two, cache):             # <<<<<<<<<<<<<<
 *     """Combine the annotations from both sides."""
 *     cdef Py_ssize_t pos_one, pos_two, len_one, len_two
 */

static  PyObject *__pyx_f_6bzrlib_14_annotator_pyx__combine_annotations(PyObject *__pyx_v_ann_one, PyObject *__pyx_v_ann_two, PyObject *__pyx_v_cache) {
  Py_ssize_t __pyx_v_pos_one;
  Py_ssize_t __pyx_v_pos_two;
  Py_ssize_t __pyx_v_out_pos;
  PyObject *__pyx_v_temp;
  PyObject *__pyx_v_left;
  PyObject *__pyx_v_right;
  PyObject *__pyx_v_cache_key;
  PyObject *__pyx_v_new_ann;
  PyObject *__pyx_r = NULL;
  int __pyx_t_1;
  PyObject *__pyx_t_2 = NULL;
  int __pyx_t_3;
  int __pyx_t_4;
  int __pyx_t_5;
  PyObject *__pyx_t_6 = NULL;
  __Pyx_RefNannySetupContext("_combine_annotations");
  __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.2-dev/bzrlib/_annotator_pyx.pyx":106
 *     cdef PyObject *temp, *left, *right
 * 
 *     if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)):             # <<<<<<<<<<<<<<
 *         cache_key = (ann_one, ann_two)
 *     else:
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":107
 * 
 *     if (PyObject_RichCompareBool(ann_one, ann_two, Py_LT)):
 *         cache_key = (ann_one, ann_two)             # <<<<<<<<<<<<<<
 *     else:
 *         cache_key = (ann_two, ann_one)
 */
    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __Pyx_INCREF(__pyx_v_ann_one);
    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_ann_one);
    __Pyx_GIVEREF(__pyx_v_ann_one);
    __Pyx_INCREF(__pyx_v_ann_two);
    PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_ann_two);
    __Pyx_GIVEREF(__pyx_v_ann_two);
    if (!(likely(PyTuple_CheckExact(__pyx_t_2))||(PyErr_Format(PyExc_TypeError, "Expected tuple, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(((PyObject *)__pyx_v_cache_key));
    __pyx_v_cache_key = ((PyObject *)__pyx_t_2);
    __pyx_t_2 = 0;
    goto __pyx_L3;
  }
  /*else*/ {

    /* "/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)             # <<<<<<<<<<<<<<
 *     temp = PyDict_GetItem(cache, cache_key)
 *     if temp != NULL:
 */
    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __Pyx_INCREF(__pyx_v_ann_two);
    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_ann_two);
    __Pyx_GIVEREF(__pyx_v_ann_two);
    __Pyx_INCREF(__pyx_v_ann_one);
    PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_ann_one);
    __Pyx_GIVEREF(__pyx_v_ann_one);
    if (!(likely(PyTuple_CheckExact(__pyx_t_2))||(PyErr_Format(PyExc_TypeError, "Expected tuple, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(((PyObject *)__pyx_v_cache_key));
    __pyx_v_cache_key = ((PyObject *)__pyx_t_2);
    __pyx_t_2 = 0;
  }
  __pyx_L3:;

  /* "/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)             # <<<<<<<<<<<<<<
 *     if temp != NULL:
 *         return <object>temp
 */
  __pyx_v_temp = PyDict_GetItem(__pyx_v_cache, ((PyObject *)__pyx_v_cache_key));

  /* "/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:             # <<<<<<<<<<<<<<
 *         return <object>temp
 * 
 */
  __pyx_t_3 = (__pyx_v_temp != NULL);
  if (__pyx_t_3) {

    /* "/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             # <<<<<<<<<<<<<<
 * 
 *     if not PyTuple_CheckExact(ann_one) or not PyTuple_CheckExact(ann_two):
 */
    __Pyx_XDECREF(__pyx_r);
    __Pyx_INCREF(((PyObject *)__pyx_v_temp));
    __pyx_r = ((PyObject *)__pyx_v_temp);
    goto __pyx_L0;
    goto __pyx_L4;
  }
  __pyx_L4:;

  /* "/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):             # <<<<<<<<<<<<<<
 *         raise TypeError('annotations must be tuples')
 *     # We know that annotations are tuples, and that both sides are already
 */
  __pyx_t_3 = (!PyTuple_CheckExact(__pyx_v_ann_one));
  if (!__pyx_t_3) {
    __pyx_t_4 = (!PyTuple_CheckExact(__pyx_v_ann_two));
    __pyx_t_5 = __pyx_t_4;
  } else {
    __pyx_t_5 = __pyx_t_3;
  }
  if (__pyx_t_5) {

    /* "/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')             # <<<<<<<<<<<<<<
 *     # We know that annotations are tuples, and that both sides are already
 *     # sorted, so we can just walk and update a new list.
 */
    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __Pyx_INCREF(((PyObject *)__pyx_kp_s_5));
    PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_5));
    __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_5));
    __pyx_t_6 = PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_6);
    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
    __Pyx_Raise(__pyx_t_6, 0, 0);
    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    goto __pyx_L5;
  }
  __pyx_L5:;

  /* "/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             # <<<<<<<<<<<<<<
 *     pos_two = -1
 *     out_pos = 0
 */
  __pyx_v_pos_one = -1;

  /* "/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             # <<<<<<<<<<<<<<
 *     out_pos = 0
 *     left = _next_tuple_entry(ann_one, &pos_one)
 */
  __pyx_v_pos_two = -1;

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":120
 *     pos_one = -1
 *     pos_two = -1
 *     out_pos = 0             # <<<<<<<<<<<<<<
 *     left = _next_tuple_entry(ann_one, &pos_one)
 *     right = _next_tuple_entry(ann_two, &pos_two)
 */
  __pyx_v_out_pos = 0;

  /* "/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)             # <<<<<<<<<<<<<<
 *     right = _next_tuple_entry(ann_two, &pos_two)
 *     new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
 */
  __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.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)             # <<<<<<<<<<<<<<
 *     new_ann = PyTuple_New(PyTuple_GET_SIZE(ann_one)
 *                           + PyTuple_GET_SIZE(ann_two))
 */
  __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.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))             # <<<<<<<<<<<<<<
 *     while left != NULL and right != NULL:
 *         # left == right is done by PyObject_RichCompareBool_ptr, however it
 */
  __pyx_t_6 = PyTuple_New((PyTuple_GET_SIZE(__pyx_v_ann_one) + PyTuple_GET_SIZE(__pyx_v_ann_two))); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_6);
  __Pyx_DECREF(__pyx_v_new_ann);
  __pyx_v_new_ann = __pyx_t_6;
  __pyx_t_6 = 0;

  /* "/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:             # <<<<<<<<<<<<<<
 *         # left == right is done by PyObject_RichCompareBool_ptr, however it
 *         # avoids a function call for a very common case. Drops 'time bzr
 */
  while (1) {
    __pyx_t_5 = (__pyx_v_left != NULL);
    if (__pyx_t_5) {
      __pyx_t_3 = (__pyx_v_right != NULL);
      __pyx_t_4 = __pyx_t_3;
    } else {
      __pyx_t_4 = __pyx_t_5;
    }
    if (!__pyx_t_4) break;

    /* "/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)):             # <<<<<<<<<<<<<<
 *             # Identical values, step both
 *             Py_INCREF_ptr(left)
 */
    __pyx_t_4 = (__pyx_v_left == __pyx_v_right);
    if (!__pyx_t_4) {
      __pyx_t_5 = PyObject_RichCompareBool(__pyx_v_left, __pyx_v_right, Py_EQ);
    } else {
      __pyx_t_5 = __pyx_t_4;
    }
    if (__pyx_t_5) {

      /* "/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)             # <<<<<<<<<<<<<<
 *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
 *             left = _next_tuple_entry(ann_one, &pos_one)
 */
      Py_INCREF(__pyx_v_left);

      /* "/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)             # <<<<<<<<<<<<<<
 *             left = _next_tuple_entry(ann_one, &pos_one)
 *             right = _next_tuple_entry(ann_two, &pos_two)
 */
      PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);

      /* "/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)             # <<<<<<<<<<<<<<
 *             right = _next_tuple_entry(ann_two, &pos_two)
 *         elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)):
 */
      __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.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)             # <<<<<<<<<<<<<<
 *         elif (PyObject_RichCompareBool_ptr(left, right, Py_LT)):
 *             # left < right or right == NULL
 */
      __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
      goto __pyx_L8;
    }

    /* "/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)):             # <<<<<<<<<<<<<<
 *             # left < right or right == NULL
 *             Py_INCREF_ptr(left)
 */
    __pyx_t_1 = PyObject_RichCompareBool(__pyx_v_left, __pyx_v_right, Py_LT);
    if (__pyx_t_1) {

      /* "/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)             # <<<<<<<<<<<<<<
 *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
 *             left = _next_tuple_entry(ann_one, &pos_one)
 */
      Py_INCREF(__pyx_v_left);

      /* "/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)             # <<<<<<<<<<<<<<
 *             left = _next_tuple_entry(ann_one, &pos_one)
 *         else: # right < left or left == NULL
 */
      PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);

      /* "/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)             # <<<<<<<<<<<<<<
 *         else: # right < left or left == NULL
 *             Py_INCREF_ptr(right)
 */
      __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one, (&__pyx_v_pos_one));
      goto __pyx_L8;
    }
    /*else*/ {

      /* "/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)             # <<<<<<<<<<<<<<
 *             PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
 *             right = _next_tuple_entry(ann_two, &pos_two)
 */
      Py_INCREF(__pyx_v_right);

      /* "/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)             # <<<<<<<<<<<<<<
 *             right = _next_tuple_entry(ann_two, &pos_two)
 *         out_pos = out_pos + 1
 */
      PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);

      /* "/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)             # <<<<<<<<<<<<<<
 *         out_pos = out_pos + 1
 *     while left != NULL:
 */
      __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two, (&__pyx_v_pos_two));
    }
    __pyx_L8:;

    /* "/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             # <<<<<<<<<<<<<<
 *     while left != NULL:
 *         Py_INCREF_ptr(left)
 */
    __pyx_v_out_pos = (__pyx_v_out_pos + 1);
  }

  /* "/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:             # <<<<<<<<<<<<<<
 *         Py_INCREF_ptr(left)
 *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
 */
  while (1) {
    __pyx_t_5 = (__pyx_v_left != NULL);
    if (!__pyx_t_5) break;

    /* "/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)             # <<<<<<<<<<<<<<
 *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, left)
 *         left = _next_tuple_entry(ann_one, &pos_one)
 */
    Py_INCREF(__pyx_v_left);

    /* "/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)             # <<<<<<<<<<<<<<
 *         left = _next_tuple_entry(ann_one, &pos_one)
 *         out_pos = out_pos + 1
 */
    PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_left);

    /* "/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)             # <<<<<<<<<<<<<<
 *         out_pos = out_pos + 1
 *     while right != NULL:
 */
    __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.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             # <<<<<<<<<<<<<<
 *     while right != NULL:
 *         Py_INCREF_ptr(right)
 */
    __pyx_v_out_pos = (__pyx_v_out_pos + 1);
  }

  /* "/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:             # <<<<<<<<<<<<<<
 *         Py_INCREF_ptr(right)
 *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
 */
  while (1) {
    __pyx_t_5 = (__pyx_v_right != NULL);
    if (!__pyx_t_5) break;

    /* "/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)             # <<<<<<<<<<<<<<
 *         PyTuple_SET_ITEM_ptr(new_ann, out_pos, right)
 *         right = _next_tuple_entry(ann_two, &pos_two)
 */
    Py_INCREF(__pyx_v_right);

    /* "/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)             # <<<<<<<<<<<<<<
 *         right = _next_tuple_entry(ann_two, &pos_two)
 *         out_pos = out_pos + 1
 */
    PyTuple_SET_ITEM(__pyx_v_new_ann, __pyx_v_out_pos, __pyx_v_right);

    /* "/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)             # <<<<<<<<<<<<<<
 *         out_pos = out_pos + 1
 *     if out_pos != PyTuple_GET_SIZE(new_ann):
 */
    __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.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             # <<<<<<<<<<<<<<
 *     if out_pos != PyTuple_GET_SIZE(new_ann):
 *         # Timing _PyTuple_Resize was not significantly faster that slicing
 */
    __pyx_v_out_pos = (__pyx_v_out_pos + 1);
  }

  /* "/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):             # <<<<<<<<<<<<<<
 *         # Timing _PyTuple_Resize was not significantly faster that slicing
 *         # PyTuple_Resize((<PyObject **>new_ann), out_pos)
 */
  __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.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]             # <<<<<<<<<<<<<<
 *     PyDict_SetItem(cache, cache_key, new_ann)
 *     return new_ann
 */
    __pyx_t_6 = PySequence_GetSlice(__pyx_v_new_ann, 0, __pyx_v_out_pos); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_6);
    __Pyx_DECREF(__pyx_v_new_ann);
    __pyx_v_new_ann = __pyx_t_6;
    __pyx_t_6 = 0;
    goto __pyx_L13;
  }
  __pyx_L13:;

  /* "/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)             # <<<<<<<<<<<<<<
 *     return new_ann
 * 
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":161
 *         new_ann = new_ann[0:out_pos]
 *     PyDict_SetItem(cache, cache_key, new_ann)
 *     return new_ann             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __Pyx_XDECREF(__pyx_r);
  __Pyx_INCREF(__pyx_v_new_ann);
  __pyx_r = __pyx_v_new_ann;
  goto __pyx_L0;

  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_6);
  __Pyx_AddTraceback("bzrlib._annotator_pyx._combine_annotations");
  __pyx_r = 0;
  __pyx_L0:;
  __Pyx_DECREF(__pyx_v_cache_key);
  __Pyx_DECREF(__pyx_v_new_ann);
  __Pyx_XGIVEREF(__pyx_r);
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":164
 * 
 * 
 * cdef int _apply_parent_annotations(annotations, parent_annotations,             # <<<<<<<<<<<<<<
 *                                    matching_blocks) except -1:
 *     """Apply the annotations from parent_annotations into annotations.
 */

static  int __pyx_f_6bzrlib_14_annotator_pyx__apply_parent_annotations(PyObject *__pyx_v_annotations, PyObject *__pyx_v_parent_annotations, PyObject *__pyx_v_matching_blocks) {
  Py_ssize_t __pyx_v_parent_idx;
  Py_ssize_t __pyx_v_lines_idx;
  Py_ssize_t __pyx_v_match_len;
  Py_ssize_t __pyx_v_idx;
  PyListObject *__pyx_v_par_list;
  PyListObject *__pyx_v_ann_list;
  PyObject **__pyx_v_par_temp;
  PyObject **__pyx_v_ann_temp;
  int __pyx_r;
  int __pyx_t_1;
  Py_ssize_t __pyx_t_2;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  PyObject *__pyx_t_5 = NULL;
  PyObject *__pyx_t_6 = NULL;
  PyObject *__pyx_t_7 = NULL;
  Py_ssize_t __pyx_t_8;
  Py_ssize_t __pyx_t_9;
  Py_ssize_t __pyx_t_10;
  PyObject *__pyx_t_11 = NULL;
  __Pyx_RefNannySetupContext("_apply_parent_annotations");

  /* "/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)             # <<<<<<<<<<<<<<
 *     par_list = <PyListObject *>parent_annotations
 *     ann_list = <PyListObject *>annotations
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":175
 * 
 *     _check_annotations_are_lists(annotations, parent_annotations)
 *     par_list = <PyListObject *>parent_annotations             # <<<<<<<<<<<<<<
 *     ann_list = <PyListObject *>annotations
 *     # For NEWS and bzrlib/builtins.py, over 99% of the lines are simply copied
 */
  __pyx_v_par_list = ((PyListObject *)__pyx_v_parent_annotations);

  /* "/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             # <<<<<<<<<<<<<<
 *     # For NEWS and bzrlib/builtins.py, over 99% of the lines are simply copied
 *     # across from the parent entry. So this routine is heavily optimized for
 */
  __pyx_v_ann_list = ((PyListObject *)__pyx_v_annotations);

  /* "/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:             # <<<<<<<<<<<<<<
 *         _check_match_ranges(parent_annotations, annotations,
 *                             parent_idx, lines_idx, match_len)
 */
  if (PyList_CheckExact(__pyx_v_matching_blocks) || PyTuple_CheckExact(__pyx_v_matching_blocks)) {
    __pyx_t_2 = 0; __pyx_t_3 = __pyx_v_matching_blocks; __Pyx_INCREF(__pyx_t_3);
  } else {
    __pyx_t_2 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_matching_blocks); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
  }
  for (;;) {
    if (likely(PyList_CheckExact(__pyx_t_3))) {
      if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_3)) break;
      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++;
    } else if (likely(PyTuple_CheckExact(__pyx_t_3))) {
      if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_3)) break;
      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++;
    } else {
      __pyx_t_4 = PyIter_Next(__pyx_t_3);
      if (!__pyx_t_4) {
        if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        break;
      }
      __Pyx_GOTREF(__pyx_t_4);
    }
    if (PyTuple_CheckExact(__pyx_t_4) && likely(PyTuple_GET_SIZE(__pyx_t_4) == 3)) {
      PyObject* tuple = __pyx_t_4;
      __pyx_t_5 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_5);
      __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
      __pyx_t_6 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_6);
      __pyx_t_9 = __Pyx_PyIndex_AsSsize_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
      __pyx_t_7 = PyTuple_GET_ITEM(tuple, 2); __Pyx_INCREF(__pyx_t_7);
      __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_t_7); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
      __pyx_v_parent_idx = __pyx_t_8;
      __pyx_v_lines_idx = __pyx_t_9;
      __pyx_v_match_len = __pyx_t_10;
    } else {
      __pyx_t_11 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_11);
      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
      __pyx_t_5 = __Pyx_UnpackItem(__pyx_t_11, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_5);
      __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
      __pyx_t_6 = __Pyx_UnpackItem(__pyx_t_11, 1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_6);
      __pyx_t_9 = __Pyx_PyIndex_AsSsize_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
      __pyx_t_7 = __Pyx_UnpackItem(__pyx_t_11, 2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_7);
      __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
      if (__Pyx_EndUnpack(__pyx_t_11, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
      __pyx_v_parent_idx = __pyx_t_10;
      __pyx_v_lines_idx = __pyx_t_9;
      __pyx_v_match_len = __pyx_t_8;
    }

    /* "/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)             # <<<<<<<<<<<<<<
 *         par_temp = par_list.ob_item + parent_idx
 *         ann_temp = ann_list.ob_item + lines_idx
 */
    __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.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             # <<<<<<<<<<<<<<
 *         ann_temp = ann_list.ob_item + lines_idx
 *         for idx from 0 <= idx < match_len:
 */
    __pyx_v_par_temp = (__pyx_v_par_list->ob_item + __pyx_v_parent_idx);

    /* "/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             # <<<<<<<<<<<<<<
 *         for idx from 0 <= idx < match_len:
 *             Py_INCREF_ptr(par_temp[idx])
 */
    __pyx_v_ann_temp = (__pyx_v_ann_list->ob_item + __pyx_v_lines_idx);

    /* "/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:             # <<<<<<<<<<<<<<
 *             Py_INCREF_ptr(par_temp[idx])
 *             Py_DECREF_ptr(ann_temp[idx])
 */
    __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.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])             # <<<<<<<<<<<<<<
 *             Py_DECREF_ptr(ann_temp[idx])
 *             ann_temp[idx] = par_temp[idx]
 */
      Py_INCREF((__pyx_v_par_temp[__pyx_v_idx]));

      /* "/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])             # <<<<<<<<<<<<<<
 *             ann_temp[idx] = par_temp[idx]
 *     return 0
 */
      Py_DECREF((__pyx_v_ann_temp[__pyx_v_idx]));

      /* "/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]             # <<<<<<<<<<<<<<
 *     return 0
 * 
 */
      (__pyx_v_ann_temp[__pyx_v_idx]) = (__pyx_v_par_temp[__pyx_v_idx]);
    }
  }
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;

  /* "/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             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_r = 0;
  goto __pyx_L0;

  __pyx_r = 0;
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_XDECREF(__pyx_t_5);
  __Pyx_XDECREF(__pyx_t_6);
  __Pyx_XDECREF(__pyx_t_7);
  __Pyx_XDECREF(__pyx_t_11);
  __Pyx_AddTraceback("bzrlib._annotator_pyx._apply_parent_annotations");
  __pyx_r = -1;
  __pyx_L0:;
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":193
 * 
 * 
 * cdef int _merge_annotations(this_annotation, annotations, parent_annotations,             # <<<<<<<<<<<<<<
 *                             matching_blocks, ann_cache) except -1:
 *     cdef Py_ssize_t parent_idx, ann_idx, lines_idx, match_len, idx
 */

static  int __pyx_f_6bzrlib_14_annotator_pyx__merge_annotations(PyObject *__pyx_v_this_annotation, PyObject *__pyx_v_annotations, PyObject *__pyx_v_parent_annotations, PyObject *__pyx_v_matching_blocks, PyObject *__pyx_v_ann_cache) {
  Py_ssize_t __pyx_v_parent_idx;
  Py_ssize_t __pyx_v_ann_idx;
  Py_ssize_t __pyx_v_lines_idx;
  Py_ssize_t __pyx_v_match_len;
  Py_ssize_t __pyx_v_idx;
  PyObject *__pyx_v_ann_temp;
  PyObject *__pyx_v_par_temp;
  PyObject *__pyx_v_last_ann;
  PyObject *__pyx_v_last_parent;
  PyObject *__pyx_v_last_res;
  PyObject *__pyx_v_par_ann;
  PyObject *__pyx_v_ann;
  PyObject *__pyx_v_new_ann;
  int __pyx_r;
  int __pyx_t_1;
  Py_ssize_t __pyx_t_2;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  PyObject *__pyx_t_5 = NULL;
  PyObject *__pyx_t_6 = NULL;
  PyObject *__pyx_t_7 = NULL;
  Py_ssize_t __pyx_t_8;
  Py_ssize_t __pyx_t_9;
  Py_ssize_t __pyx_t_10;
  PyObject *__pyx_t_11 = NULL;
  int __pyx_t_12;
  int __pyx_t_13;
  int __pyx_t_14;
  __Pyx_RefNannySetupContext("_merge_annotations");
  __pyx_v_last_ann = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_last_parent = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_last_res = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_par_ann = Py_None; __Pyx_INCREF(Py_None);
  __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.2-dev/bzrlib/_annotator_pyx.pyx":199
 *     cdef PyObject *ann_temp, *par_temp
 * 
 *     _check_annotations_are_lists(annotations, parent_annotations)             # <<<<<<<<<<<<<<
 *     last_ann = None
 *     last_parent = None
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":200
 * 
 *     _check_annotations_are_lists(annotations, parent_annotations)
 *     last_ann = None             # <<<<<<<<<<<<<<
 *     last_parent = None
 *     last_res = None
 */
  __Pyx_INCREF(Py_None);
  __Pyx_DECREF(__pyx_v_last_ann);
  __pyx_v_last_ann = Py_None;

  /* "/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             # <<<<<<<<<<<<<<
 *     last_res = None
 *     for parent_idx, lines_idx, match_len in matching_blocks:
 */
  __Pyx_INCREF(Py_None);
  __Pyx_DECREF(__pyx_v_last_parent);
  __pyx_v_last_parent = Py_None;

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":202
 *     last_ann = None
 *     last_parent = None
 *     last_res = None             # <<<<<<<<<<<<<<
 *     for parent_idx, lines_idx, match_len in matching_blocks:
 *         _check_match_ranges(parent_annotations, annotations,
 */
  __Pyx_INCREF(Py_None);
  __Pyx_DECREF(__pyx_v_last_res);
  __pyx_v_last_res = Py_None;

  /* "/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:             # <<<<<<<<<<<<<<
 *         _check_match_ranges(parent_annotations, annotations,
 *                             parent_idx, lines_idx, match_len)
 */
  if (PyList_CheckExact(__pyx_v_matching_blocks) || PyTuple_CheckExact(__pyx_v_matching_blocks)) {
    __pyx_t_2 = 0; __pyx_t_3 = __pyx_v_matching_blocks; __Pyx_INCREF(__pyx_t_3);
  } else {
    __pyx_t_2 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_matching_blocks); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
  }
  for (;;) {
    if (likely(PyList_CheckExact(__pyx_t_3))) {
      if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_3)) break;
      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++;
    } else if (likely(PyTuple_CheckExact(__pyx_t_3))) {
      if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_3)) break;
      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++;
    } else {
      __pyx_t_4 = PyIter_Next(__pyx_t_3);
      if (!__pyx_t_4) {
        if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        break;
      }
      __Pyx_GOTREF(__pyx_t_4);
    }
    if (PyTuple_CheckExact(__pyx_t_4) && likely(PyTuple_GET_SIZE(__pyx_t_4) == 3)) {
      PyObject* tuple = __pyx_t_4;
      __pyx_t_5 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_5);
      __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
      __pyx_t_6 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_6);
      __pyx_t_9 = __Pyx_PyIndex_AsSsize_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
      __pyx_t_7 = PyTuple_GET_ITEM(tuple, 2); __Pyx_INCREF(__pyx_t_7);
      __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_t_7); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
      __pyx_v_parent_idx = __pyx_t_8;
      __pyx_v_lines_idx = __pyx_t_9;
      __pyx_v_match_len = __pyx_t_10;
    } else {
      __pyx_t_11 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_11);
      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
      __pyx_t_5 = __Pyx_UnpackItem(__pyx_t_11, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_5);
      __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
      __pyx_t_6 = __Pyx_UnpackItem(__pyx_t_11, 1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_6);
      __pyx_t_9 = __Pyx_PyIndex_AsSsize_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
      __pyx_t_7 = __Pyx_UnpackItem(__pyx_t_11, 2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_7);
      __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
      if (__Pyx_EndUnpack(__pyx_t_11, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
      __pyx_v_parent_idx = __pyx_t_10;
      __pyx_v_lines_idx = __pyx_t_9;
      __pyx_v_match_len = __pyx_t_8;
    }

    /* "/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)             # <<<<<<<<<<<<<<
 *         # For lines which match this parent, we will now resolve whether
 *         # this parent wins over the current annotation
 */
    __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.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:             # <<<<<<<<<<<<<<
 *             ann_idx = lines_idx + idx
 *             ann_temp = PyList_GET_ITEM(annotations, ann_idx)
 */
    __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.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             # <<<<<<<<<<<<<<
 *             ann_temp = PyList_GET_ITEM(annotations, ann_idx)
 *             par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx)
 */
      __pyx_v_ann_idx = (__pyx_v_lines_idx + __pyx_v_idx);

      /* "/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)             # <<<<<<<<<<<<<<
 *             par_temp = PyList_GET_ITEM(parent_annotations, parent_idx + idx)
 *             if (ann_temp == par_temp):
 */
      __pyx_v_ann_temp = PyList_GET_ITEM(__pyx_v_annotations, __pyx_v_ann_idx);

      /* "/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)             # <<<<<<<<<<<<<<
 *             if (ann_temp == par_temp):
 *                 # This is parent, do nothing
 */
      __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.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):             # <<<<<<<<<<<<<<
 *                 # This is parent, do nothing
 *                 # Pointer comparison is fine here. Value comparison would
 */
      __pyx_t_12 = (__pyx_v_ann_temp == __pyx_v_par_temp);
      if (__pyx_t_12) {

        /* "/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             # <<<<<<<<<<<<<<
 *             par_ann = <object>par_temp
 *             ann = <object>ann_temp
 */
        goto __pyx_L5_continue;
        goto __pyx_L7;
      }
      __pyx_L7:;

      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":221
 *                 # timing from 215ms => 125ms
 *                 continue
 *             par_ann = <object>par_temp             # <<<<<<<<<<<<<<
 *             ann = <object>ann_temp
 *             if (ann is this_annotation):
 */
      __Pyx_INCREF(((PyObject *)__pyx_v_par_temp));
      __Pyx_DECREF(__pyx_v_par_ann);
      __pyx_v_par_ann = ((PyObject *)__pyx_v_par_temp);

      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":222
 *                 continue
 *             par_ann = <object>par_temp
 *             ann = <object>ann_temp             # <<<<<<<<<<<<<<
 *             if (ann is this_annotation):
 *                 # Originally claimed 'this', but it was really in this
 */
      __Pyx_INCREF(((PyObject *)__pyx_v_ann_temp));
      __Pyx_DECREF(__pyx_v_ann);
      __pyx_v_ann = ((PyObject *)__pyx_v_ann_temp);

      /* "/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):             # <<<<<<<<<<<<<<
 *                 # Originally claimed 'this', but it was really in this
 *                 # parent
 */
      __pyx_t_12 = (__pyx_v_ann == __pyx_v_this_annotation);
      if (__pyx_t_12) {

        /* "/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)             # <<<<<<<<<<<<<<
 *                 PyList_SetItem(annotations, ann_idx, par_ann)
 *                 continue
 */
        Py_INCREF(__pyx_v_par_ann);

        /* "/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)             # <<<<<<<<<<<<<<
 *                 continue
 *             # Resolve the fact that both sides have a different value for
 */
        __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.2-dev/bzrlib/_annotator_pyx.pyx":228
 *                 Py_INCREF(par_ann)
 *                 PyList_SetItem(annotations, ann_idx, par_ann)
 *                 continue             # <<<<<<<<<<<<<<
 *             # Resolve the fact that both sides have a different value for
 *             # last modified
 */
        goto __pyx_L5_continue;
        goto __pyx_L8;
      }
      __pyx_L8:;

      /* "/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):             # <<<<<<<<<<<<<<
 *                 Py_INCREF(last_res)
 *                 PyList_SetItem(annotations, ann_idx, last_res)
 */
      __pyx_t_12 = (__pyx_v_ann == __pyx_v_last_ann);
      if (__pyx_t_12) {
        __pyx_t_13 = (__pyx_v_par_ann == __pyx_v_last_parent);
        __pyx_t_14 = __pyx_t_13;
      } else {
        __pyx_t_14 = __pyx_t_12;
      }
      if (__pyx_t_14) {

        /* "/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)             # <<<<<<<<<<<<<<
 *                 PyList_SetItem(annotations, ann_idx, last_res)
 *             else:
 */
        Py_INCREF(__pyx_v_last_res);

        /* "/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)             # <<<<<<<<<<<<<<
 *             else:
 *                 new_ann = _combine_annotations(ann, par_ann, ann_cache)
 */
        __pyx_t_1 = PyList_SetItem(__pyx_v_annotations, __pyx_v_ann_idx, __pyx_v_last_res); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        goto __pyx_L9;
      }
      /*else*/ {

        /* "/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)             # <<<<<<<<<<<<<<
 *                 Py_INCREF(new_ann)
 *                 PyList_SetItem(annotations, ann_idx, new_ann)
 */
        __pyx_t_4 = __pyx_f_6bzrlib_14_annotator_pyx__combine_annotations(__pyx_v_ann, __pyx_v_par_ann, __pyx_v_ann_cache); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        __Pyx_GOTREF(__pyx_t_4);
        __Pyx_DECREF(__pyx_v_new_ann);
        __pyx_v_new_ann = __pyx_t_4;
        __pyx_t_4 = 0;

        /* "/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)             # <<<<<<<<<<<<<<
 *                 PyList_SetItem(annotations, ann_idx, new_ann)
 *                 last_ann = ann
 */
        Py_INCREF(__pyx_v_new_ann);

        /* "/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)             # <<<<<<<<<<<<<<
 *                 last_ann = ann
 *                 last_parent = par_ann
 */
        __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.2-dev/bzrlib/_annotator_pyx.pyx":238
 *                 Py_INCREF(new_ann)
 *                 PyList_SetItem(annotations, ann_idx, new_ann)
 *                 last_ann = ann             # <<<<<<<<<<<<<<
 *                 last_parent = par_ann
 *                 last_res = new_ann
 */
        __Pyx_INCREF(__pyx_v_ann);
        __Pyx_DECREF(__pyx_v_last_ann);
        __pyx_v_last_ann = __pyx_v_ann;

        /* "/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             # <<<<<<<<<<<<<<
 *                 last_res = new_ann
 *     return 0
 */
        __Pyx_INCREF(__pyx_v_par_ann);
        __Pyx_DECREF(__pyx_v_last_parent);
        __pyx_v_last_parent = __pyx_v_par_ann;

        /* "/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             # <<<<<<<<<<<<<<
 *     return 0
 * 
 */
        __Pyx_INCREF(__pyx_v_new_ann);
        __Pyx_DECREF(__pyx_v_last_res);
        __pyx_v_last_res = __pyx_v_new_ann;
      }
      __pyx_L9:;
      __pyx_L5_continue:;
    }
  }
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":241
 *                 last_parent = par_ann
 *                 last_res = new_ann
 *     return 0             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_r = 0;
  goto __pyx_L0;

  __pyx_r = 0;
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_XDECREF(__pyx_t_5);
  __Pyx_XDECREF(__pyx_t_6);
  __Pyx_XDECREF(__pyx_t_7);
  __Pyx_XDECREF(__pyx_t_11);
  __Pyx_AddTraceback("bzrlib._annotator_pyx._merge_annotations");
  __pyx_r = -1;
  __pyx_L0:;
  __Pyx_DECREF(__pyx_v_last_ann);
  __Pyx_DECREF(__pyx_v_last_parent);
  __Pyx_DECREF(__pyx_v_last_res);
  __Pyx_DECREF(__pyx_v_par_ann);
  __Pyx_DECREF(__pyx_v_ann);
  __Pyx_DECREF(__pyx_v_new_ann);
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/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):             # <<<<<<<<<<<<<<
 *         """Reannotate this text relative to its first parent."""
 *         (parent_annotations,
 */

static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent[] = "Reannotate this text relative to its first parent.";
static PyMethodDef __pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent = {__Pyx_NAMESTR("_update_from_first_parent"), (PyCFunction)__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent)};
static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
  PyObject *__pyx_v_self = 0;
  PyObject *__pyx_v_key = 0;
  PyObject *__pyx_v_annotations = 0;
  PyObject *__pyx_v_lines = 0;
  PyObject *__pyx_v_parent_key = 0;
  PyObject *__pyx_v_parent_annotations;
  PyObject *__pyx_v_matching_blocks;
  PyObject *__pyx_r = NULL;
  PyObject *__pyx_t_1 = NULL;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  int __pyx_t_5;
  static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__key,&__pyx_n_s__annotations,&__pyx_n_s__lines,&__pyx_n_s__parent_key,0};
  __Pyx_RefNannySetupContext("_update_from_first_parent");
  __pyx_self = __pyx_self;
  if (unlikely(__pyx_kwds)) {
    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
    PyObject* values[5] = {0,0,0,0,0};
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
      case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
      case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
      case  0: break;
      default: goto __pyx_L5_argtuple_error;
    }
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  0:
      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);
      if (likely(values[0])) kw_args--;
      else goto __pyx_L5_argtuple_error;
      case  1:
      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__key);
      if (likely(values[1])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_first_parent", 1, 5, 5, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  2:
      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__annotations);
      if (likely(values[2])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_first_parent", 1, 5, 5, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  3:
      values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lines);
      if (likely(values[3])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_first_parent", 1, 5, 5, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  4:
      values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__parent_key);
      if (likely(values[4])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_first_parent", 1, 5, 5, 4); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
    }
    if (unlikely(kw_args > 0)) {
      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "_update_from_first_parent") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
    }
    __pyx_v_self = values[0];
    __pyx_v_key = values[1];
    __pyx_v_annotations = values[2];
    __pyx_v_lines = values[3];
    __pyx_v_parent_key = values[4];
  } else if (PyTuple_GET_SIZE(__pyx_args) != 5) {
    goto __pyx_L5_argtuple_error;
  } else {
    __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);
    __pyx_v_key = PyTuple_GET_ITEM(__pyx_args, 1);
    __pyx_v_annotations = PyTuple_GET_ITEM(__pyx_args, 2);
    __pyx_v_lines = PyTuple_GET_ITEM(__pyx_args, 3);
    __pyx_v_parent_key = PyTuple_GET_ITEM(__pyx_args, 4);
  }
  goto __pyx_L4_argument_unpacking_done;
  __pyx_L5_argtuple_error:;
  __Pyx_RaiseArgtupleInvalid("_update_from_first_parent", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
  __pyx_L3_error:;
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator._update_from_first_parent");
  __Pyx_RefNannyFinishContext();
  return NULL;
  __pyx_L4_argument_unpacking_done:;
  __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.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(             # <<<<<<<<<<<<<<
 *                                 key, lines, parent_key)
 * 
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":251
 *         (parent_annotations,
 *          matching_blocks) = self._get_parent_annotations_and_matches(
 *                                 key, lines, parent_key)             # <<<<<<<<<<<<<<
 * 
 *         _apply_parent_annotations(annotations, parent_annotations,
 */
  __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_INCREF(__pyx_v_key);
  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_key);
  __Pyx_GIVEREF(__pyx_v_key);
  __Pyx_INCREF(__pyx_v_lines);
  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_lines);
  __Pyx_GIVEREF(__pyx_v_lines);
  __Pyx_INCREF(__pyx_v_parent_key);
  PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_v_parent_key);
  __Pyx_GIVEREF(__pyx_v_parent_key);
  __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
  if (PyTuple_CheckExact(__pyx_t_3) && likely(PyTuple_GET_SIZE(__pyx_t_3) == 2)) {
    PyObject* tuple = __pyx_t_3;
    __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.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,             # <<<<<<<<<<<<<<
 *          matching_blocks) = self._get_parent_annotations_and_matches(
 *                                 key, lines, parent_key)
 */
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __Pyx_DECREF(__pyx_v_parent_annotations);
    __pyx_v_parent_annotations = __pyx_t_2;
    __pyx_t_2 = 0;
    __Pyx_DECREF(__pyx_v_matching_blocks);
    __pyx_v_matching_blocks = __pyx_t_1;
    __pyx_t_1 = 0;
  } else {
    __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __pyx_t_2 = __Pyx_UnpackItem(__pyx_t_4, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __pyx_t_1 = __Pyx_UnpackItem(__pyx_t_4, 1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_1);
    if (__Pyx_EndUnpack(__pyx_t_4, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    __Pyx_DECREF(__pyx_v_parent_annotations);
    __pyx_v_parent_annotations = __pyx_t_2;
    __pyx_t_2 = 0;
    __Pyx_DECREF(__pyx_v_matching_blocks);
    __pyx_v_matching_blocks = __pyx_t_1;
    __pyx_t_1 = 0;
  }

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":254
 * 
 *         _apply_parent_annotations(annotations, parent_annotations,
 *                                   matching_blocks)             # <<<<<<<<<<<<<<
 * 
 *     def _update_from_other_parents(self, key, annotations, lines,
 */
  __pyx_t_5 = __pyx_f_6bzrlib_14_annotator_pyx__apply_parent_annotations(__pyx_v_annotations, __pyx_v_parent_annotations, __pyx_v_matching_blocks); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}

  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_1);
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator._update_from_first_parent");
  __pyx_r = NULL;
  __pyx_L0:;
  __Pyx_DECREF(__pyx_v_parent_annotations);
  __Pyx_DECREF(__pyx_v_matching_blocks);
  __Pyx_XGIVEREF(__pyx_r);
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/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,             # <<<<<<<<<<<<<<
 *                                    this_annotation, parent_key):
 *         """Reannotate this text relative to a second (or more) parent."""
 */

static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents[] = "Reannotate this text relative to a second (or more) parent.";
static PyMethodDef __pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents = {__Pyx_NAMESTR("_update_from_other_parents"), (PyCFunction)__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents)};
static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
  PyObject *__pyx_v_self = 0;
  PyObject *__pyx_v_key = 0;
  PyObject *__pyx_v_annotations = 0;
  PyObject *__pyx_v_lines = 0;
  PyObject *__pyx_v_this_annotation = 0;
  PyObject *__pyx_v_parent_key = 0;
  PyObject *__pyx_v_parent_annotations;
  PyObject *__pyx_v_matching_blocks;
  PyObject *__pyx_r = NULL;
  PyObject *__pyx_t_1 = NULL;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  int __pyx_t_5;
  static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__key,&__pyx_n_s__annotations,&__pyx_n_s__lines,&__pyx_n_s__this_annotation,&__pyx_n_s__parent_key,0};
  __Pyx_RefNannySetupContext("_update_from_other_parents");
  __pyx_self = __pyx_self;
  if (unlikely(__pyx_kwds)) {
    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
    PyObject* values[6] = {0,0,0,0,0,0};
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
      case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
      case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
      case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
      case  0: break;
      default: goto __pyx_L5_argtuple_error;
    }
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  0:
      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);
      if (likely(values[0])) kw_args--;
      else goto __pyx_L5_argtuple_error;
      case  1:
      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__key);
      if (likely(values[1])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  2:
      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__annotations);
      if (likely(values[2])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  3:
      values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lines);
      if (likely(values[3])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  4:
      values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__this_annotation);
      if (likely(values[4])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, 4); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
      case  5:
      values[5] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__parent_key);
      if (likely(values[5])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, 5); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
    }
    if (unlikely(kw_args > 0)) {
      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "_update_from_other_parents") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
    }
    __pyx_v_self = values[0];
    __pyx_v_key = values[1];
    __pyx_v_annotations = values[2];
    __pyx_v_lines = values[3];
    __pyx_v_this_annotation = values[4];
    __pyx_v_parent_key = values[5];
  } else if (PyTuple_GET_SIZE(__pyx_args) != 6) {
    goto __pyx_L5_argtuple_error;
  } else {
    __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);
    __pyx_v_key = PyTuple_GET_ITEM(__pyx_args, 1);
    __pyx_v_annotations = PyTuple_GET_ITEM(__pyx_args, 2);
    __pyx_v_lines = PyTuple_GET_ITEM(__pyx_args, 3);
    __pyx_v_this_annotation = PyTuple_GET_ITEM(__pyx_args, 4);
    __pyx_v_parent_key = PyTuple_GET_ITEM(__pyx_args, 5);
  }
  goto __pyx_L4_argument_unpacking_done;
  __pyx_L5_argtuple_error:;
  __Pyx_RaiseArgtupleInvalid("_update_from_other_parents", 1, 6, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
  __pyx_L3_error:;
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator._update_from_other_parents");
  __Pyx_RefNannyFinishContext();
  return NULL;
  __pyx_L4_argument_unpacking_done:;
  __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.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(             # <<<<<<<<<<<<<<
 *                                 key, lines, parent_key)
 *         _merge_annotations(this_annotation, annotations, parent_annotations,
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":261
 *         (parent_annotations,
 *          matching_blocks) = self._get_parent_annotations_and_matches(
 *                                 key, lines, parent_key)             # <<<<<<<<<<<<<<
 *         _merge_annotations(this_annotation, annotations, parent_annotations,
 *                            matching_blocks, self._ann_tuple_cache)
 */
  __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_INCREF(__pyx_v_key);
  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_key);
  __Pyx_GIVEREF(__pyx_v_key);
  __Pyx_INCREF(__pyx_v_lines);
  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_lines);
  __Pyx_GIVEREF(__pyx_v_lines);
  __Pyx_INCREF(__pyx_v_parent_key);
  PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_v_parent_key);
  __Pyx_GIVEREF(__pyx_v_parent_key);
  __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
  if (PyTuple_CheckExact(__pyx_t_3) && likely(PyTuple_GET_SIZE(__pyx_t_3) == 2)) {
    PyObject* tuple = __pyx_t_3;
    __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.2-dev/bzrlib/_annotator_pyx.pyx":259
 *                                    this_annotation, parent_key):
 *         """Reannotate this text relative to a second (or more) parent."""
 *         (parent_annotations,             # <<<<<<<<<<<<<<
 *          matching_blocks) = self._get_parent_annotations_and_matches(
 *                                 key, lines, parent_key)
 */
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __Pyx_DECREF(__pyx_v_parent_annotations);
    __pyx_v_parent_annotations = __pyx_t_2;
    __pyx_t_2 = 0;
    __Pyx_DECREF(__pyx_v_matching_blocks);
    __pyx_v_matching_blocks = __pyx_t_1;
    __pyx_t_1 = 0;
  } else {
    __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __pyx_t_2 = __Pyx_UnpackItem(__pyx_t_4, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    __pyx_t_1 = __Pyx_UnpackItem(__pyx_t_4, 1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_1);
    if (__Pyx_EndUnpack(__pyx_t_4, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    __Pyx_DECREF(__pyx_v_parent_annotations);
    __pyx_v_parent_annotations = __pyx_t_2;
    __pyx_t_2 = 0;
    __Pyx_DECREF(__pyx_v_matching_blocks);
    __pyx_v_matching_blocks = __pyx_t_1;
    __pyx_t_1 = 0;
  }

  /* "/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)             # <<<<<<<<<<<<<<
 * 
 *     def annotate_flat(self, key):
 */
  __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___ann_tuple_cache); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __pyx_t_5 = __pyx_f_6bzrlib_14_annotator_pyx__merge_annotations(__pyx_v_this_annotation, __pyx_v_annotations, __pyx_v_parent_annotations, __pyx_v_matching_blocks, __pyx_t_3); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;

  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_1);
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator._update_from_other_parents");
  __pyx_r = NULL;
  __pyx_L0:;
  __Pyx_DECREF(__pyx_v_parent_annotations);
  __Pyx_DECREF(__pyx_v_matching_blocks);
  __Pyx_XGIVEREF(__pyx_r);
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

/* "/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):             # <<<<<<<<<<<<<<
 *         """Determine the single-best-revision to source for each line.
 * 
 */

static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat[] = "Determine the single-best-revision to source for each line.\n\n        This is meant as a compatibility thunk to how annotate() used to work.\n        ";
static PyMethodDef __pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat = {__Pyx_NAMESTR("annotate_flat"), (PyCFunction)__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat)};
static PyObject *__pyx_pf_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
  PyObject *__pyx_v_self = 0;
  PyObject *__pyx_v_key = 0;
  Py_ssize_t __pyx_v_pos;
  Py_ssize_t __pyx_v_num_lines;
  PyObject *__pyx_v_annotate;
  PyObject *__pyx_v_custom_tiebreaker;
  PyObject *__pyx_v_annotations;
  PyObject *__pyx_v_lines;
  PyObject *__pyx_v_out;
  PyObject *__pyx_v_heads;
  PyObject *__pyx_v_annotation;
  PyObject *__pyx_v_line;
  PyObject *__pyx_v_head;
  PyObject *__pyx_v_the_heads;
  PyObject *__pyx_r = NULL;
  PyObject *__pyx_t_1 = NULL;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  Py_ssize_t __pyx_t_5;
  Py_ssize_t __pyx_t_6;
  int __pyx_t_7;
  int __pyx_t_8;
  static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__key,0};
  __Pyx_RefNannySetupContext("annotate_flat");
  __pyx_self = __pyx_self;
  if (unlikely(__pyx_kwds)) {
    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
    PyObject* values[2] = {0,0};
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
      case  0: break;
      default: goto __pyx_L5_argtuple_error;
    }
    switch (PyTuple_GET_SIZE(__pyx_args)) {
      case  0:
      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);
      if (likely(values[0])) kw_args--;
      else goto __pyx_L5_argtuple_error;
      case  1:
      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__key);
      if (likely(values[1])) kw_args--;
      else {
        __Pyx_RaiseArgtupleInvalid("annotate_flat", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
      }
    }
    if (unlikely(kw_args > 0)) {
      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "annotate_flat") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
    }
    __pyx_v_self = values[0];
    __pyx_v_key = values[1];
  } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
    goto __pyx_L5_argtuple_error;
  } else {
    __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);
    __pyx_v_key = PyTuple_GET_ITEM(__pyx_args, 1);
  }
  goto __pyx_L4_argument_unpacking_done;
  __pyx_L5_argtuple_error:;
  __Pyx_RaiseArgtupleInvalid("annotate_flat", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
  __pyx_L3_error:;
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator.annotate_flat");
  __Pyx_RefNannyFinishContext();
  return NULL;
  __pyx_L4_argument_unpacking_done:;
  __pyx_v_annotate = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_custom_tiebreaker = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_annotations = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_lines = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_out = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
  __pyx_v_heads = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_annotation = Py_None; __Pyx_INCREF(Py_None);
  __pyx_v_line = Py_None; __Pyx_INCREF(Py_None);
  __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.2-dev/bzrlib/_annotator_pyx.pyx":272
 *         cdef Py_ssize_t pos, num_lines
 * 
 *         from bzrlib import annotate             # <<<<<<<<<<<<<<
 * 
 *         custom_tiebreaker = annotate._break_annotation_tie
 */
  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
  __Pyx_INCREF(((PyObject *)__pyx_n_s__annotate));
  PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__annotate));
  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__annotate));
  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__bzrlib), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
  __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__annotate); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __Pyx_INCREF(__pyx_t_1);
  __Pyx_DECREF(__pyx_v_annotate);
  __pyx_v_annotate = __pyx_t_1;
  __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.2-dev/bzrlib/_annotator_pyx.pyx":274
 *         from bzrlib import annotate
 * 
 *         custom_tiebreaker = annotate._break_annotation_tie             # <<<<<<<<<<<<<<
 *         annotations, lines = self.annotate(key)
 *         num_lines = len(lines)
 */
  __pyx_t_2 = PyObject_GetAttr(__pyx_v_annotate, __pyx_n_s_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_DECREF(__pyx_v_custom_tiebreaker);
  __pyx_v_custom_tiebreaker = __pyx_t_2;
  __pyx_t_2 = 0;

  /* "/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)             # <<<<<<<<<<<<<<
 *         num_lines = len(lines)
 *         out = []
 */
  __pyx_t_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__annotate); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __Pyx_INCREF(__pyx_v_key);
  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_key);
  __Pyx_GIVEREF(__pyx_v_key);
  __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  if (PyTuple_CheckExact(__pyx_t_3) && likely(PyTuple_GET_SIZE(__pyx_t_3) == 2)) {
    PyObject* tuple = __pyx_t_3;
    __pyx_t_1 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_1);
    __pyx_t_2 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_2);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __Pyx_DECREF(__pyx_v_annotations);
    __pyx_v_annotations = __pyx_t_1;
    __pyx_t_1 = 0;
    __Pyx_DECREF(__pyx_v_lines);
    __pyx_v_lines = __pyx_t_2;
    __pyx_t_2 = 0;
  } else {
    __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_4);
    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
    __pyx_t_1 = __Pyx_UnpackItem(__pyx_t_4, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_1);
    __pyx_t_2 = __Pyx_UnpackItem(__pyx_t_4, 1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_2);
    if (__Pyx_EndUnpack(__pyx_t_4, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
    __Pyx_DECREF(__pyx_v_annotations);
    __pyx_v_annotations = __pyx_t_1;
    __pyx_t_1 = 0;
    __Pyx_DECREF(__pyx_v_lines);
    __pyx_v_lines = __pyx_t_2;
    __pyx_t_2 = 0;
  }

  /* "/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)             # <<<<<<<<<<<<<<
 *         out = []
 *         heads = self._get_heads_provider().heads
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":277
 *         annotations, lines = self.annotate(key)
 *         num_lines = len(lines)
 *         out = []             # <<<<<<<<<<<<<<
 *         heads = self._get_heads_provider().heads
 *         for pos from 0 <= pos < num_lines:
 */
  __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
  __Pyx_DECREF(((PyObject *)__pyx_v_out));
  __pyx_v_out = __pyx_t_3;
  __pyx_t_3 = 0;

  /* "/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             # <<<<<<<<<<<<<<
 *         for pos from 0 <= pos < num_lines:
 *             annotation = annotations[pos]
 */
  __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___get_heads_provider); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__heads); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
  __Pyx_DECREF(__pyx_v_heads);
  __pyx_v_heads = __pyx_t_3;
  __pyx_t_3 = 0;

  /* "/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:             # <<<<<<<<<<<<<<
 *             annotation = annotations[pos]
 *             line = lines[pos]
 */
  __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.2-dev/bzrlib/_annotator_pyx.pyx":280
 *         heads = self._get_heads_provider().heads
 *         for pos from 0 <= pos < num_lines:
 *             annotation = annotations[pos]             # <<<<<<<<<<<<<<
 *             line = lines[pos]
 *             if len(annotation) == 1:
 */
    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_annotations, __pyx_v_pos, sizeof(Py_ssize_t), PyInt_FromSsize_t); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __Pyx_DECREF(__pyx_v_annotation);
    __pyx_v_annotation = __pyx_t_3;
    __pyx_t_3 = 0;

    /* "/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]             # <<<<<<<<<<<<<<
 *             if len(annotation) == 1:
 *                 head = annotation[0]
 */
    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_lines, __pyx_v_pos, sizeof(Py_ssize_t), PyInt_FromSsize_t); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_3);
    __Pyx_DECREF(__pyx_v_line);
    __pyx_v_line = __pyx_t_3;
    __pyx_t_3 = 0;

    /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":282
 *             annotation = annotations[pos]
 *             line = lines[pos]
 *             if len(annotation) == 1:             # <<<<<<<<<<<<<<
 *                 head = annotation[0]
 *             else:
 */
    __pyx_t_6 = PyObject_Length(__pyx_v_annotation); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __pyx_t_7 = (__pyx_t_6 == 1);
    if (__pyx_t_7) {

      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":283
 *             line = lines[pos]
 *             if len(annotation) == 1:
 *                 head = annotation[0]             # <<<<<<<<<<<<<<
 *             else:
 *                 the_heads = heads(annotation)
 */
      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_annotation, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_3);
      __Pyx_DECREF(__pyx_v_head);
      __pyx_v_head = __pyx_t_3;
      __pyx_t_3 = 0;
      goto __pyx_L8;
    }
    /*else*/ {

      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":285
 *                 head = annotation[0]
 *             else:
 *                 the_heads = heads(annotation)             # <<<<<<<<<<<<<<
 *                 if len(the_heads) == 1:
 *                     for head in the_heads: break # get the item out of the set
 */
      __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_3);
      __Pyx_INCREF(__pyx_v_annotation);
      PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_annotation);
      __Pyx_GIVEREF(__pyx_v_annotation);
      __pyx_t_2 = PyObject_Call(__pyx_v_heads, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __Pyx_GOTREF(__pyx_t_2);
      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
      __Pyx_DECREF(__pyx_v_the_heads);
      __pyx_v_the_heads = __pyx_t_2;
      __pyx_t_2 = 0;

      /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":286
 *             else:
 *                 the_heads = heads(annotation)
 *                 if len(the_heads) == 1:             # <<<<<<<<<<<<<<
 *                     for head in the_heads: break # get the item out of the set
 *                 else:
 */
      __pyx_t_6 = PyObject_Length(__pyx_v_the_heads); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
      __pyx_t_7 = (__pyx_t_6 == 1);
      if (__pyx_t_7) {

        /* "/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             # <<<<<<<<<<<<<<
 *                 else:
 *                     # We need to resolve the ambiguity, for now just pick the
 */
        if (PyList_CheckExact(__pyx_v_the_heads) || PyTuple_CheckExact(__pyx_v_the_heads)) {
          __pyx_t_6 = 0; __pyx_t_2 = __pyx_v_the_heads; __Pyx_INCREF(__pyx_t_2);
        } else {
          __pyx_t_6 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_v_the_heads); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
          __Pyx_GOTREF(__pyx_t_2);
        }
        for (;;) {
          if (likely(PyList_CheckExact(__pyx_t_2))) {
            if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_2)) break;
            __pyx_t_3 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++;
          } else if (likely(PyTuple_CheckExact(__pyx_t_2))) {
            if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_2)) break;
            __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++;
          } else {
            __pyx_t_3 = PyIter_Next(__pyx_t_2);
            if (!__pyx_t_3) {
              if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
              break;
            }
            __Pyx_GOTREF(__pyx_t_3);
          }
          __Pyx_DECREF(__pyx_v_head);
          __pyx_v_head = __pyx_t_3;
          __pyx_t_3 = 0;
          goto __pyx_L11_break;
        }
        __pyx_L11_break:;
        __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
        goto __pyx_L9;
      }
      /*else*/ {

        /* "/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,             # <<<<<<<<<<<<<<
 *                                                         custom_tiebreaker)
 *             PyList_Append(out, (head, line))
 */
        __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.2-dev/bzrlib/_annotator_pyx.pyx":292
 *                     # sorted smallest
 *                     head = self._resolve_annotation_tie(the_heads, line,
 *                                                         custom_tiebreaker)             # <<<<<<<<<<<<<<
 *             PyList_Append(out, (head, line))
 *         return out
 */
        __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        __Pyx_GOTREF(__pyx_t_3);
        __Pyx_INCREF(__pyx_v_the_heads);
        PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_the_heads);
        __Pyx_GIVEREF(__pyx_v_the_heads);
        __Pyx_INCREF(__pyx_v_line);
        PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_line);
        __Pyx_GIVEREF(__pyx_v_line);
        __Pyx_INCREF(__pyx_v_custom_tiebreaker);
        PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_v_custom_tiebreaker);
        __Pyx_GIVEREF(__pyx_v_custom_tiebreaker);
        __pyx_t_1 = PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
        __Pyx_GOTREF(__pyx_t_1);
        __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
        __Pyx_DECREF(__pyx_v_head);
        __pyx_v_head = __pyx_t_1;
        __pyx_t_1 = 0;
      }
      __pyx_L9:;
    }
    __pyx_L8:;

    /* "/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))             # <<<<<<<<<<<<<<
 *         return out
 */
    __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_GOTREF(__pyx_t_1);
    __Pyx_INCREF(__pyx_v_head);
    PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_head);
    __Pyx_GIVEREF(__pyx_v_head);
    __Pyx_INCREF(__pyx_v_line);
    PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_line);
    __Pyx_GIVEREF(__pyx_v_line);
    __pyx_t_8 = PyList_Append(((PyObject *)__pyx_v_out), __pyx_t_1); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
    __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  }

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":294
 *                                                         custom_tiebreaker)
 *             PyList_Append(out, (head, line))
 *         return out             # <<<<<<<<<<<<<<
 */
  __Pyx_XDECREF(__pyx_r);
  __Pyx_INCREF(((PyObject *)__pyx_v_out));
  __pyx_r = ((PyObject *)__pyx_v_out);
  goto __pyx_L0;

  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_1);
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  __Pyx_AddTraceback("bzrlib._annotator_pyx.Annotator.annotate_flat");
  __pyx_r = NULL;
  __pyx_L0:;
  __Pyx_DECREF(__pyx_v_annotate);
  __Pyx_DECREF(__pyx_v_custom_tiebreaker);
  __Pyx_DECREF(__pyx_v_annotations);
  __Pyx_DECREF(__pyx_v_lines);
  __Pyx_DECREF(__pyx_v_out);
  __Pyx_DECREF(__pyx_v_heads);
  __Pyx_DECREF(__pyx_v_annotation);
  __Pyx_DECREF(__pyx_v_line);
  __Pyx_DECREF(__pyx_v_head);
  __Pyx_DECREF(__pyx_v_the_heads);
  __Pyx_XGIVEREF(__pyx_r);
  __Pyx_RefNannyFinishContext();
  return __pyx_r;
}

static PyMethodDef __pyx_methods[] = {
  {0, 0, 0, 0}
};

#if PY_MAJOR_VERSION >= 3
static struct PyModuleDef __pyx_moduledef = {
    PyModuleDef_HEAD_INIT,
    __Pyx_NAMESTR("_annotator_pyx"),
    __Pyx_DOCSTR(__pyx_k_9), /* m_doc */
    -1, /* m_size */
    __pyx_methods /* m_methods */,
    NULL, /* m_reload */
    NULL, /* m_traverse */
    NULL, /* m_clear */
    NULL /* m_free */
};
#endif

static __Pyx_StringTabEntry __pyx_string_tab[] = {
  {&__pyx_kp_s_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 1, 0},
  {&__pyx_kp_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 0},
  {&__pyx_n_s_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 0, 1, 1},
  {&__pyx_n_s_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 0, 1, 1},
  {&__pyx_kp_u_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 1, 0, 0},
  {&__pyx_kp_u_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 1, 0, 0},
  {&__pyx_kp_u_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 1, 0, 0},
  {&__pyx_kp_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 0},
  {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0},
  {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0},
  {&__pyx_kp_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 0},
  {&__pyx_n_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 1},
  {&__pyx_n_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 1},
  {&__pyx_n_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 1},
  {&__pyx_n_s__Annotator, __pyx_k__Annotator, sizeof(__pyx_k__Annotator), 0, 0, 1, 1},
  {&__pyx_n_s__TypeError, __pyx_k__TypeError, sizeof(__pyx_k__TypeError), 0, 0, 1, 1},
  {&__pyx_n_s__ValueError, __pyx_k__ValueError, sizeof(__pyx_k__ValueError), 0, 0, 1, 1},
  {&__pyx_n_s____main__, __pyx_k____main__, sizeof(__pyx_k____main__), 0, 0, 1, 1},
  {&__pyx_n_s____test__, __pyx_k____test__, sizeof(__pyx_k____test__), 0, 0, 1, 1},
  {&__pyx_n_s___ann_tuple_cache, __pyx_k___ann_tuple_cache, sizeof(__pyx_k___ann_tuple_cache), 0, 0, 1, 1},
  {&__pyx_n_s___annotator_py, __pyx_k___annotator_py, sizeof(__pyx_k___annotator_py), 0, 0, 1, 1},
  {&__pyx_n_s___get_heads_provider, __pyx_k___get_heads_provider, sizeof(__pyx_k___get_heads_provider), 0, 0, 1, 1},
  {&__pyx_n_s__annotate, __pyx_k__annotate, sizeof(__pyx_k__annotate), 0, 0, 1, 1},
  {&__pyx_n_s__annotate_flat, __pyx_k__annotate_flat, sizeof(__pyx_k__annotate_flat), 0, 0, 1, 1},
  {&__pyx_n_s__annotations, __pyx_k__annotations, sizeof(__pyx_k__annotations), 0, 0, 1, 1},
  {&__pyx_n_s__bzrlib, __pyx_k__bzrlib, sizeof(__pyx_k__bzrlib), 0, 0, 1, 1},
  {&__pyx_n_s__heads, __pyx_k__heads, sizeof(__pyx_k__heads), 0, 0, 1, 1},
  {&__pyx_n_s__key, __pyx_k__key, sizeof(__pyx_k__key), 0, 0, 1, 1},
  {&__pyx_n_s__lines, __pyx_k__lines, sizeof(__pyx_k__lines), 0, 0, 1, 1},
  {&__pyx_n_s__ob_item, __pyx_k__ob_item, sizeof(__pyx_k__ob_item), 0, 0, 1, 1},
  {&__pyx_n_s__parent_key, __pyx_k__parent_key, sizeof(__pyx_k__parent_key), 0, 0, 1, 1},
  {&__pyx_n_s__self, __pyx_k__self, sizeof(__pyx_k__self), 0, 0, 1, 1},
  {&__pyx_n_s__this_annotation, __pyx_k__this_annotation, sizeof(__pyx_k__this_annotation), 0, 0, 1, 1},
  {0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
  __pyx_builtin_TypeError = __Pyx_GetName(__pyx_b, __pyx_n_s__TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  return 0;
  __pyx_L1_error:;
  return -1;
}

static int __Pyx_InitGlobals(void) {
  if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
  return 0;
  __pyx_L1_error:;
  return -1;
}

#if PY_MAJOR_VERSION < 3
PyMODINIT_FUNC init_annotator_pyx(void); /*proto*/
PyMODINIT_FUNC init_annotator_pyx(void)
#else
PyMODINIT_FUNC PyInit__annotator_pyx(void); /*proto*/
PyMODINIT_FUNC PyInit__annotator_pyx(void)
#endif
{
  PyObject *__pyx_t_1 = NULL;
  PyObject *__pyx_t_2 = NULL;
  PyObject *__pyx_t_3 = NULL;
  PyObject *__pyx_t_4 = NULL;
  #if CYTHON_REFNANNY
  void* __pyx_refnanny = NULL;
  __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
  if (!__Pyx_RefNanny) {
      PyErr_Clear();
      __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny");
      if (!__Pyx_RefNanny)
          Py_FatalError("failed to import 'refnanny' module");
  }
  __pyx_refnanny = __Pyx_RefNanny->SetupContext("PyMODINIT_FUNC PyInit__annotator_pyx(void)", __LINE__, __FILE__);
  #endif
  __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  #ifdef __pyx_binding_PyCFunctionType_USED
  if (__pyx_binding_PyCFunctionType_init() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  #endif
  /*--- Library function declarations ---*/
  /*--- Threads initialization code ---*/
  #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
  #ifdef WITH_THREAD /* Python build with threading support? */
  PyEval_InitThreads();
  #endif
  #endif
  /*--- Module creation code ---*/
  #if PY_MAJOR_VERSION < 3
  __pyx_m = Py_InitModule4(__Pyx_NAMESTR("_annotator_pyx"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_9), 0, PYTHON_API_VERSION);
  #else
  __pyx_m = PyModule_Create(&__pyx_moduledef);
  #endif
  if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
  #if PY_MAJOR_VERSION < 3
  Py_INCREF(__pyx_m);
  #endif
  __pyx_b = PyImport_AddModule(__Pyx_NAMESTR(__Pyx_BUILTIN_MODULE_NAME));
  if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
  if (__Pyx_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
  /*--- Initialize various global constants etc. ---*/
  if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  if (__pyx_module_is_main_bzrlib___annotator_pyx) {
    if (__Pyx_SetAttrString(__pyx_m, "__name__", __pyx_n_s____main__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
  }
  /*--- Builtin init code ---*/
  if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  /*--- Global init code ---*/
  /*--- Function export code ---*/
  /*--- Type init code ---*/
  /*--- Type import code ---*/
  /*--- Function import code ---*/
  /*--- Execution code ---*/

  /* "/home/vila/src/bzr/integration/2.4.2-dev/bzrlib/_annotator_pyx.pyx":58
 * 
 * 
 * from bzrlib import _annotator_py             # <<<<<<<<<<<<<<
 * 
 * 
 */
  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
  __Pyx_INCREF(((PyObject *)__pyx_n_s___annotator_py));
  PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s___annotator_py));
  __Pyx_GIVEREF(((PyObject *)__pyx_n_s___annotator_py));
  __pyx_t_2 = __Pyx_Import(((PyObject *)__pyx_n_s__bzrlib), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_2);
  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
  __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s___annotator_py); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  if (PyObject_SetAttr(__pyx_m, __pyx_n_s___annotator_py, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __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.2-dev/bzrlib/_annotator_pyx.pyx":244
 * 
 * 
 * class Annotator(_annotator_py.Annotator):             # <<<<<<<<<<<<<<
 *     """Class that drives performing annotations."""
 * 
 */
  __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
  __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s___annotator_py); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__Annotator); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
  __Pyx_GIVEREF(__pyx_t_3);
  __pyx_t_3 = 0;
  if (PyDict_SetItemString(((PyObject *)__pyx_t_2), "__doc__", ((PyObject *)__pyx_kp_s_10)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __pyx_t_3 = __Pyx_CreateClass(__pyx_t_1, ((PyObject *)__pyx_t_2), __pyx_n_s__Annotator, "bzrlib._annotator_pyx"); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;

  /* "/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):             # <<<<<<<<<<<<<<
 *         """Reannotate this text relative to its first parent."""
 *         (parent_annotations,
 */
  __pyx_t_1 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __pyx_t_4 = PyMethod_New(__pyx_t_1, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  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.2-dev/bzrlib/_annotator_pyx.pyx":256
 *                                   matching_blocks)
 * 
 *     def _update_from_other_parents(self, key, annotations, lines,             # <<<<<<<<<<<<<<
 *                                    this_annotation, parent_key):
 *         """Reannotate this text relative to a second (or more) parent."""
 */
  __pyx_t_4 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __pyx_t_1 = PyMethod_New(__pyx_t_4, 0, __pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
  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.2-dev/bzrlib/_annotator_pyx.pyx":265
 *                            matching_blocks, self._ann_tuple_cache)
 * 
 *     def annotate_flat(self, key):             # <<<<<<<<<<<<<<
 *         """Determine the single-best-revision to source for each line.
 * 
 */
  __pyx_t_1 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_1);
  __pyx_t_4 = PyMethod_New(__pyx_t_1, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
  if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__annotate_flat, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
  if (PyObject_SetAttr(__pyx_m, __pyx_n_s__Annotator, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __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.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
 */
  __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
  __pyx_t_3 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Annotator); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s_11); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
  if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_13), __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Annotator); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s_12); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
  if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_14), __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = PyObject_GetAttr(__pyx_m, __pyx_n_s__Annotator); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__annotate_flat); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_4);
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  __pyx_t_3 = __Pyx_GetAttrString(__pyx_t_4, "__doc__"); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_GOTREF(__pyx_t_3);
  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
  if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_15), __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
  if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
  goto __pyx_L0;
  __pyx_L1_error:;
  __Pyx_XDECREF(__pyx_t_1);
  __Pyx_XDECREF(__pyx_t_2);
  __Pyx_XDECREF(__pyx_t_3);
  __Pyx_XDECREF(__pyx_t_4);
  if (__pyx_m) {
    __Pyx_AddTraceback("init bzrlib._annotator_pyx");
    Py_DECREF(__pyx_m); __pyx_m = 0;
  } else if (!PyErr_Occurred()) {
    PyErr_SetString(PyExc_ImportError, "init bzrlib._annotator_pyx");
  }
  __pyx_L0:;
  __Pyx_RefNannyFinishContext();
  #if PY_MAJOR_VERSION < 3
  return;
  #else
  return __pyx_m;
  #endif
}

/* Runtime support code */

static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
    PyObject *result;
    result = PyObject_GetAttr(dict, name);
    if (!result)
        PyErr_SetObject(PyExc_NameError, name);
    return result;
}

static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
    PyErr_Format(PyExc_ValueError,
        #if PY_VERSION_HEX < 0x02050000
                 "need more than %d value%s to unpack", (int)index,
        #else
                 "need more than %zd value%s to unpack", index,
        #endif
                 (index == 1) ? "" : "s");
}

static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {
    PyErr_Format(PyExc_ValueError,
        #if PY_VERSION_HEX < 0x02050000
            "too many values to unpack (expected %d)", (int)expected);
        #else
            "too many values to unpack (expected %zd)", expected);
        #endif
}

static PyObject *__Pyx_UnpackItem(PyObject *iter, Py_ssize_t index) {
    PyObject *item;
    if (!(item = PyIter_Next(iter))) {
        if (!PyErr_Occurred()) {
            __Pyx_RaiseNeedMoreValuesError(index);
        }
    }
    return item;
}

static int __Pyx_EndUnpack(PyObject *iter, Py_ssize_t expected) {
    PyObject *item;
    if ((item = PyIter_Next(iter))) {
        Py_DECREF(item);
        __Pyx_RaiseTooManyValuesError(expected);
        return -1;
    }
    else if (!PyErr_Occurred())
        return 0;
    else
        return -1;
}

static void __Pyx_RaiseDoubleKeywordsError(
    const char* func_name,
    PyObject* kw_name)
{
    PyErr_Format(PyExc_TypeError,
        #if PY_MAJOR_VERSION >= 3
        "%s() got multiple values for keyword argument '%U'", func_name, kw_name);
        #else
        "%s() got multiple values for keyword argument '%s'", func_name,
        PyString_AS_STRING(kw_name));
        #endif
}

static void __Pyx_RaiseArgtupleInvalid(
    const char* func_name,
    int exact,
    Py_ssize_t num_min,
    Py_ssize_t num_max,
    Py_ssize_t num_found)
{
    Py_ssize_t num_expected;
    const char *number, *more_or_less;

    if (num_found < num_min) {
        num_expected = num_min;
        more_or_less = "at least";
    } else {
        num_expected = num_max;
        more_or_less = "at most";
    }
    if (exact) {
        more_or_less = "exactly";
    }
    number = (num_expected == 1) ? "" : "s";
    PyErr_Format(PyExc_TypeError,
        #if PY_VERSION_HEX < 0x02050000
            "%s() takes %s %d positional argument%s (%d given)",
        #else
            "%s() takes %s %zd positional argument%s (%zd given)",
        #endif
        func_name, more_or_less, num_expected, number, num_found);
}

static int __Pyx_ParseOptionalKeywords(
    PyObject *kwds,
    PyObject **argnames[],
    PyObject *kwds2,
    PyObject *values[],
    Py_ssize_t num_pos_args,
    const char* function_name)
{
    PyObject *key = 0, *value = 0;
    Py_ssize_t pos = 0;
    PyObject*** name;
    PyObject*** first_kw_arg = argnames + num_pos_args;

    while (PyDict_Next(kwds, &pos, &key, &value)) {
        name = first_kw_arg;
        while (*name && (**name != key)) name++;
        if (*name) {
            values[name-argnames] = value;
        } else {
            #if PY_MAJOR_VERSION < 3
            if (unlikely(!PyString_CheckExact(key)) && unlikely(!PyString_Check(key))) {
            #else
            if (unlikely(!PyUnicode_CheckExact(key)) && unlikely(!PyUnicode_Check(key))) {
            #endif
                goto invalid_keyword_type;
            } else {
                for (name = first_kw_arg; *name; name++) {
                    #if PY_MAJOR_VERSION >= 3
                    if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&
                        PyUnicode_Compare(**name, key) == 0) break;
                    #else
                    if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&
                        _PyString_Eq(**name, key)) break;
                    #endif
                }
                if (*name) {
                    values[name-argnames] = value;
                } else {
                    /* unexpected keyword found */
                    for (name=argnames; name != first_kw_arg; name++) {
                        if (**name == key) goto arg_passed_twice;
                        #if PY_MAJOR_VERSION >= 3
                        if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&
                            PyUnicode_Compare(**name, key) == 0) goto arg_passed_twice;
                        #else
                        if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&
                            _PyString_Eq(**name, key)) goto arg_passed_twice;
                        #endif
                    }
                    if (kwds2) {
                        if (unlikely(PyDict_SetItem(kwds2, key, value))) goto bad;
                    } else {
                        goto invalid_keyword;
                    }
                }
            }
        }
    }
    return 0;
arg_passed_twice:
    __Pyx_RaiseDoubleKeywordsError(function_name, **name);
    goto bad;
invalid_keyword_type:
    PyErr_Format(PyExc_TypeError,
        "%s() keywords must be strings", function_name);
    goto bad;
invalid_keyword:
    PyErr_Format(PyExc_TypeError,
    #if PY_MAJOR_VERSION < 3
        "%s() got an unexpected keyword argument '%s'",
        function_name, PyString_AsString(key));
    #else
        "%s() got an unexpected keyword argument '%U'",
        function_name, key);
    #endif
bad:
    return -1;
}


static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
    PyObject *py_import = 0;
    PyObject *empty_list = 0;
    PyObject *module = 0;
    PyObject *global_dict = 0;
    PyObject *empty_dict = 0;
    PyObject *list;
    py_import = __Pyx_GetAttrString(__pyx_b, "__import__");
    if (!py_import)
        goto bad;
    if (from_list)
        list = from_list;
    else {
        empty_list = PyList_New(0);
        if (!empty_list)
            goto bad;
        list = empty_list;
    }
    global_dict = PyModule_GetDict(__pyx_m);
    if (!global_dict)
        goto bad;
    empty_dict = PyDict_New();
    if (!empty_dict)
        goto bad;
    module = PyObject_CallFunctionObjArgs(py_import,
        name, global_dict, empty_dict, list, NULL);
bad:
    Py_XDECREF(empty_list);
    Py_XDECREF(py_import);
    Py_XDECREF(empty_dict);
    return module;
}

static PyObject *__Pyx_CreateClass(
    PyObject *bases, PyObject *dict, PyObject *name, const char *modname)
{
    PyObject *py_modname;
    PyObject *result = 0;

    #if PY_MAJOR_VERSION < 3
    py_modname = PyString_FromString(modname);
    #else
    py_modname = PyUnicode_FromString(modname);
    #endif
    if (!py_modname)
        goto bad;
    if (PyDict_SetItemString(dict, "__module__", py_modname) < 0)
        goto bad;
    #if PY_MAJOR_VERSION < 3
    result = PyClass_New(bases, dict, name);
    #else
    result = PyObject_CallFunctionObjArgs((PyObject *)&PyType_Type, name, bases, dict, NULL);
    #endif
bad:
    Py_XDECREF(py_modname);
    return result;
}

static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
    PyObject *tmp_type, *tmp_value, *tmp_tb;
    PyThreadState *tstate = PyThreadState_GET();

    tmp_type = tstate->curexc_type;
    tmp_value = tstate->curexc_value;
    tmp_tb = tstate->curexc_traceback;
    tstate->curexc_type = type;
    tstate->curexc_value = value;
    tstate->curexc_traceback = tb;
    Py_XDECREF(tmp_type);
    Py_XDECREF(tmp_value);
    Py_XDECREF(tmp_tb);
}

static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
    PyThreadState *tstate = PyThreadState_GET();
    *type = tstate->curexc_type;
    *value = tstate->curexc_value;
    *tb = tstate->curexc_traceback;

    tstate->curexc_type = 0;
    tstate->curexc_value = 0;
    tstate->curexc_traceback = 0;
}


#if PY_MAJOR_VERSION < 3
static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
    Py_XINCREF(type);
    Py_XINCREF(value);
    Py_XINCREF(tb);
    /* First, check the traceback argument, replacing None with NULL. */
    if (tb == Py_None) {
        Py_DECREF(tb);
        tb = 0;
    }
    else if (tb != NULL && !PyTraceBack_Check(tb)) {
        PyErr_SetString(PyExc_TypeError,
            "raise: arg 3 must be a traceback or None");
        goto raise_error;
    }
    /* Next, replace a missing value with None */
    if (value == NULL) {
        value = Py_None;
        Py_INCREF(value);
    }
    #if PY_VERSION_HEX < 0x02050000
    if (!PyClass_Check(type))
    #else
    if (!PyType_Check(type))
    #endif
    {
        /* Raising an instance.  The value should be a dummy. */
        if (value != Py_None) {
            PyErr_SetString(PyExc_TypeError,
                "instance exception may not have a separate value");
            goto raise_error;
        }
        /* Normalize to raise <class>, <instance> */
        Py_DECREF(value);
        value = type;
        #if PY_VERSION_HEX < 0x02050000
            if (PyInstance_Check(type)) {
                type = (PyObject*) ((PyInstanceObject*)type)->in_class;
                Py_INCREF(type);
            }
            else {
                type = 0;
                PyErr_SetString(PyExc_TypeError,
                    "raise: exception must be an old-style class or instance");
                goto raise_error;
            }
        #else
            type = (PyObject*) Py_TYPE(type);
            Py_INCREF(type);
            if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
                PyErr_SetString(PyExc_TypeError,
                    "raise: exception class must be a subclass of BaseException");
                goto raise_error;
            }
        #endif
    }

    __Pyx_ErrRestore(type, value, tb);
    return;
raise_error:
    Py_XDECREF(value);
    Py_XDECREF(type);
    Py_XDECREF(tb);
    return;
}

#else /* Python 3+ */

static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
    if (tb == Py_None) {
        tb = 0;
    } else if (tb && !PyTraceBack_Check(tb)) {
        PyErr_SetString(PyExc_TypeError,
            "raise: arg 3 must be a traceback or None");
        goto bad;
    }
    if (value == Py_None)
        value = 0;

    if (PyExceptionInstance_Check(type)) {
        if (value) {
            PyErr_SetString(PyExc_TypeError,
                "instance exception may not have a separate value");
            goto bad;
        }
        value = type;
        type = (PyObject*) Py_TYPE(value);
    } else if (!PyExceptionClass_Check(type)) {
        PyErr_SetString(PyExc_TypeError,
            "raise: exception class must be a subclass of BaseException");
        goto bad;
    }

    PyErr_SetObject(type, value);

    if (tb) {
        PyThreadState *tstate = PyThreadState_GET();
        PyObject* tmp_tb = tstate->curexc_traceback;
        if (tb != tmp_tb) {
            Py_INCREF(tb);
            tstate->curexc_traceback = tb;
            Py_XDECREF(tmp_tb);
        }
    }

bad:
    return;
}
#endif

static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
    const unsigned char neg_one = (unsigned char)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(unsigned char) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(unsigned char)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to unsigned char" :
                    "value too large to convert to unsigned char");
            }
            return (unsigned char)-1;
        }
        return (unsigned char)val;
    }
    return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
}

static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
    const unsigned short neg_one = (unsigned short)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(unsigned short) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(unsigned short)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to unsigned short" :
                    "value too large to convert to unsigned short");
            }
            return (unsigned short)-1;
        }
        return (unsigned short)val;
    }
    return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
}

static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
    const unsigned int neg_one = (unsigned int)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(unsigned int) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(unsigned int)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to unsigned int" :
                    "value too large to convert to unsigned int");
            }
            return (unsigned int)-1;
        }
        return (unsigned int)val;
    }
    return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
}

static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
    const char neg_one = (char)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(char) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(char)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to char" :
                    "value too large to convert to char");
            }
            return (char)-1;
        }
        return (char)val;
    }
    return (char)__Pyx_PyInt_AsLong(x);
}

static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
    const short neg_one = (short)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(short) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(short)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to short" :
                    "value too large to convert to short");
            }
            return (short)-1;
        }
        return (short)val;
    }
    return (short)__Pyx_PyInt_AsLong(x);
}

static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
    const int neg_one = (int)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(int) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(int)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to int" :
                    "value too large to convert to int");
            }
            return (int)-1;
        }
        return (int)val;
    }
    return (int)__Pyx_PyInt_AsLong(x);
}

static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
    const signed char neg_one = (signed char)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(signed char) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(signed char)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to signed char" :
                    "value too large to convert to signed char");
            }
            return (signed char)-1;
        }
        return (signed char)val;
    }
    return (signed char)__Pyx_PyInt_AsSignedLong(x);
}

static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
    const signed short neg_one = (signed short)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(signed short) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(signed short)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to signed short" :
                    "value too large to convert to signed short");
            }
            return (signed short)-1;
        }
        return (signed short)val;
    }
    return (signed short)__Pyx_PyInt_AsSignedLong(x);
}

static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
    const signed int neg_one = (signed int)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(signed int) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(signed int)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to signed int" :
                    "value too large to convert to signed int");
            }
            return (signed int)-1;
        }
        return (signed int)val;
    }
    return (signed int)__Pyx_PyInt_AsSignedLong(x);
}

static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject* x) {
    const int neg_one = (int)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
    if (sizeof(int) < sizeof(long)) {
        long val = __Pyx_PyInt_AsLong(x);
        if (unlikely(val != (long)(int)val)) {
            if (!unlikely(val == -1 && PyErr_Occurred())) {
                PyErr_SetString(PyExc_OverflowError,
                    (is_unsigned && unlikely(val < 0)) ?
                    "can't convert negative value to int" :
                    "value too large to convert to int");
            }
            return (int)-1;
        }
        return (int)val;
    }
    return (int)__Pyx_PyInt_AsLong(x);
}

static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
    const unsigned long neg_one = (unsigned long)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to unsigned long");
            return (unsigned long)-1;
        }
        return (unsigned long)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to unsigned long");
                return (unsigned long)-1;
            }
            return PyLong_AsUnsignedLong(x);
        } else {
            return PyLong_AsLong(x);
        }
    } else {
        unsigned long val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (unsigned long)-1;
        val = __Pyx_PyInt_AsUnsignedLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
    const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to unsigned PY_LONG_LONG");
            return (unsigned PY_LONG_LONG)-1;
        }
        return (unsigned PY_LONG_LONG)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to unsigned PY_LONG_LONG");
                return (unsigned PY_LONG_LONG)-1;
            }
            return PyLong_AsUnsignedLongLong(x);
        } else {
            return PyLong_AsLongLong(x);
        }
    } else {
        unsigned PY_LONG_LONG val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (unsigned PY_LONG_LONG)-1;
        val = __Pyx_PyInt_AsUnsignedLongLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
    const long neg_one = (long)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to long");
            return (long)-1;
        }
        return (long)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to long");
                return (long)-1;
            }
            return PyLong_AsUnsignedLong(x);
        } else {
            return PyLong_AsLong(x);
        }
    } else {
        long val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (long)-1;
        val = __Pyx_PyInt_AsLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
    const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to PY_LONG_LONG");
            return (PY_LONG_LONG)-1;
        }
        return (PY_LONG_LONG)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to PY_LONG_LONG");
                return (PY_LONG_LONG)-1;
            }
            return PyLong_AsUnsignedLongLong(x);
        } else {
            return PyLong_AsLongLong(x);
        }
    } else {
        PY_LONG_LONG val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (PY_LONG_LONG)-1;
        val = __Pyx_PyInt_AsLongLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
    const signed long neg_one = (signed long)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to signed long");
            return (signed long)-1;
        }
        return (signed long)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to signed long");
                return (signed long)-1;
            }
            return PyLong_AsUnsignedLong(x);
        } else {
            return PyLong_AsLong(x);
        }
    } else {
        signed long val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (signed long)-1;
        val = __Pyx_PyInt_AsSignedLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
    const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;
    const int is_unsigned = neg_one > const_zero;
#if PY_VERSION_HEX < 0x03000000
    if (likely(PyInt_Check(x))) {
        long val = PyInt_AS_LONG(x);
        if (is_unsigned && unlikely(val < 0)) {
            PyErr_SetString(PyExc_OverflowError,
                            "can't convert negative value to signed PY_LONG_LONG");
            return (signed PY_LONG_LONG)-1;
        }
        return (signed PY_LONG_LONG)val;
    } else
#endif
    if (likely(PyLong_Check(x))) {
        if (is_unsigned) {
            if (unlikely(Py_SIZE(x) < 0)) {
                PyErr_SetString(PyExc_OverflowError,
                                "can't convert negative value to signed PY_LONG_LONG");
                return (signed PY_LONG_LONG)-1;
            }
            return PyLong_AsUnsignedLongLong(x);
        } else {
            return PyLong_AsLongLong(x);
        }
    } else {
        signed PY_LONG_LONG val;
        PyObject *tmp = __Pyx_PyNumber_Int(x);
        if (!tmp) return (signed PY_LONG_LONG)-1;
        val = __Pyx_PyInt_AsSignedLongLong(tmp);
        Py_DECREF(tmp);
        return val;
    }
}

#include "compile.h"
#include "frameobject.h"
#include "traceback.h"

static void __Pyx_AddTraceback(const char *funcname) {
    PyObject *py_srcfile = 0;
    PyObject *py_funcname = 0;
    PyObject *py_globals = 0;
    PyCodeObject *py_code = 0;
    PyFrameObject *py_frame = 0;

    #if PY_MAJOR_VERSION < 3
    py_srcfile = PyString_FromString(__pyx_filename);
    #else
    py_srcfile = PyUnicode_FromString(__pyx_filename);
    #endif
    if (!py_srcfile) goto bad;
    if (__pyx_clineno) {
        #if PY_MAJOR_VERSION < 3
        py_funcname = PyString_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, __pyx_clineno);
        #else
        py_funcname = PyUnicode_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, __pyx_clineno);
        #endif
    }
    else {
        #if PY_MAJOR_VERSION < 3
        py_funcname = PyString_FromString(funcname);
        #else
        py_funcname = PyUnicode_FromString(funcname);
        #endif
    }
    if (!py_funcname) goto bad;
    py_globals = PyModule_GetDict(__pyx_m);
    if (!py_globals) goto bad;
    py_code = PyCode_New(
        0,            /*int argcount,*/
        #if PY_MAJOR_VERSION >= 3
        0,            /*int kwonlyargcount,*/
        #endif
        0,            /*int nlocals,*/
        0,            /*int stacksize,*/
        0,            /*int flags,*/
        __pyx_empty_bytes, /*PyObject *code,*/
        __pyx_empty_tuple,  /*PyObject *consts,*/
        __pyx_empty_tuple,  /*PyObject *names,*/
        __pyx_empty_tuple,  /*PyObject *varnames,*/
        __pyx_empty_tuple,  /*PyObject *freevars,*/
        __pyx_empty_tuple,  /*PyObject *cellvars,*/
        py_srcfile,   /*PyObject *filename,*/
        py_funcname,  /*PyObject *name,*/
        __pyx_lineno,   /*int firstlineno,*/
        __pyx_empty_bytes  /*PyObject *lnotab*/
    );
    if (!py_code) goto bad;
    py_frame = PyFrame_New(
        PyThreadState_GET(), /*PyThreadState *tstate,*/
        py_code,             /*PyCodeObject *code,*/
        py_globals,          /*PyObject *globals,*/
        0                    /*PyObject *locals*/
    );
    if (!py_frame) goto bad;
    py_frame->f_lineno = __pyx_lineno;
    PyTraceBack_Here(py_frame);
bad:
    Py_XDECREF(py_srcfile);
    Py_XDECREF(py_funcname);
    Py_XDECREF(py_code);
    Py_XDECREF(py_frame);
}

static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
    while (t->p) {
        #if PY_MAJOR_VERSION < 3
        if (t->is_unicode) {
            *t->p = PyUnicode_DecodeUTF8(t->s, t->n - 1, NULL);
        } else if (t->intern) {
            *t->p = PyString_InternFromString(t->s);
        } else {
            *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
        }
        #else  /* Python 3+ has unicode identifiers */
        if (t->is_unicode | t->is_str) {
            if (t->intern) {
                *t->p = PyUnicode_InternFromString(t->s);
            } else if (t->encoding) {
                *t->p = PyUnicode_Decode(t->s, t->n - 1, t->encoding, NULL);
            } else {
                *t->p = PyUnicode_FromStringAndSize(t->s, t->n - 1);
            }
        } else {
            *t->p = PyBytes_FromStringAndSize(t->s, t->n - 1);
        }
        #endif
        if (!*t->p)
            return -1;
        ++t;
    }
    return 0;
}

/* Type Conversion Functions */

static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
   int is_true = x == Py_True;
   if (is_true | (x == Py_False) | (x == Py_None)) return is_true;
   else return PyObject_IsTrue(x);
}

static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
  PyNumberMethods *m;
  const char *name = NULL;
  PyObject *res = NULL;
#if PY_VERSION_HEX < 0x03000000
  if (PyInt_Check(x) || PyLong_Check(x))
#else
  if (PyLong_Check(x))
#endif
    return Py_INCREF(x), x;
  m = Py_TYPE(x)->tp_as_number;
#if PY_VERSION_HEX < 0x03000000
  if (m && m->nb_int) {
    name = "int";
    res = PyNumber_Int(x);
  }
  else if (m && m->nb_long) {
    name = "long";
    res = PyNumber_Long(x);
  }
#else
  if (m && m->nb_int) {
    name = "int";
    res = PyNumber_Long(x);
  }
#endif
  if (res) {
#if PY_VERSION_HEX < 0x03000000
    if (!PyInt_Check(res) && !PyLong_Check(res)) {
#else
    if (!PyLong_Check(res)) {
#endif
      PyErr_Format(PyExc_TypeError,
                   "__%s__ returned non-%s (type %.200s)",
                   name, name, Py_TYPE(res)->tp_name);
      Py_DECREF(res);
      return NULL;
    }
  }
  else if (!PyErr_Occurred()) {
    PyErr_SetString(PyExc_TypeError,
                    "an integer is required");
  }
  return res;
}

static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
  Py_ssize_t ival;
  PyObject* x = PyNumber_Index(b);
  if (!x) return -1;
  ival = PyInt_AsSsize_t(x);
  Py_DECREF(x);
  return ival;
}

static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
#if PY_VERSION_HEX < 0x02050000
   if (ival <= LONG_MAX)
       return PyInt_FromLong((long)ival);
   else {
       unsigned char *bytes = (unsigned char *) &ival;
       int one = 1; int little = (int)*(unsigned char*)&one;
       return _PyLong_FromByteArray(bytes, sizeof(size_t), little, 0);
   }
#else
   return PyInt_FromSize_t(ival);
#endif
}

static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
   unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
   if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {
       return (size_t)-1;
   } else if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {
       PyErr_SetString(PyExc_OverflowError,
                       "value too large to convert to size_t");
       return (size_t)-1;
   }
   return (size_t)val;
}


#endif /* Py_PYTHON_H */
