/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 bzrlib/_annotator_pyx.pyx

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_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
 
 
22
19
cdef extern from "python-compat.h":
23
20
    pass
24
21
 
58
55
        PyObject *, PyObject *, int opid)
59
56
 
60
57
 
61
 
from . import _annotator_py
 
58
from bzrlib import _annotator_py
62
59
 
63
60
 
64
61
cdef int _check_annotations_are_lists(annotations,
177
174
    _check_annotations_are_lists(annotations, parent_annotations)
178
175
    par_list = <PyListObject *>parent_annotations
179
176
    ann_list = <PyListObject *>annotations
180
 
    # For NEWS and breezy/builtins.py, over 99% of the lines are simply copied
 
177
    # For NEWS and bzrlib/builtins.py, over 99% of the lines are simply copied
181
178
    # across from the parent entry. So this routine is heavily optimized for
182
179
    # that. Would be interesting if we could use memcpy() but we have to incref
183
180
    # and decref
272
269
        """
273
270
        cdef Py_ssize_t pos, num_lines
274
271
 
275
 
        from . import annotate
 
272
        from bzrlib import annotate
276
273
 
277
274
        custom_tiebreaker = annotate._break_annotation_tie
278
275
        annotations, lines = self.annotate(key)