/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: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
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 bzrlib import _annotator_py
 
61
from . import _annotator_py
59
62
 
60
63
 
61
64
cdef int _check_annotations_are_lists(annotations,
174
177
    _check_annotations_are_lists(annotations, parent_annotations)
175
178
    par_list = <PyListObject *>parent_annotations
176
179
    ann_list = <PyListObject *>annotations
177
 
    # For NEWS and bzrlib/builtins.py, over 99% of the lines are simply copied
 
180
    # For NEWS and breezy/builtins.py, over 99% of the lines are simply copied
178
181
    # across from the parent entry. So this routine is heavily optimized for
179
182
    # that. Would be interesting if we could use memcpy() but we have to incref
180
183
    # and decref
269
272
        """
270
273
        cdef Py_ssize_t pos, num_lines
271
274
 
272
 
        from bzrlib import annotate
 
275
        from . import annotate
273
276
 
274
277
        custom_tiebreaker = annotate._break_annotation_tie
275
278
        annotations, lines = self.annotate(key)