/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/_annotator_pyx.pyx

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 01:43:31 UTC
  • mfrom: (6676 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610014331-1xalwmij33imwidq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/_annotator_pyx.pyx
16
16
 
17
17
"""Functionality for doing annotations in the 'optimal' way"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
 
21
 
19
22
cdef extern from "python-compat.h":
20
23
    pass
21
24
 
55
58
        PyObject *, PyObject *, int opid)
56
59
 
57
60
 
58
 
from breezy import _annotator_py
 
61
from . import _annotator_py
59
62
 
60
63
 
61
64
cdef int _check_annotations_are_lists(annotations,
269
272
        """
270
273
        cdef Py_ssize_t pos, num_lines
271
274
 
272
 
        from breezy import annotate
 
275
        from . import annotate
273
276
 
274
277
        custom_tiebreaker = annotate._break_annotation_tie
275
278
        annotations, lines = self.annotate(key)