/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/annotate.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:58:49 UTC
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713065849-n7g2rsjyl6dt1mgv
Apply review feedback

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
28
28
import sys
29
29
import time
30
30
 
31
 
from bzrlib.lazy_import import lazy_import
32
 
lazy_import(globals(), """
33
31
from bzrlib import (
 
32
    errors,
 
33
    osutils,
34
34
    patiencediff,
35
35
    tsort,
36
36
    )
37
 
""")
38
 
from bzrlib import (
39
 
    errors,
40
 
    osutils,
41
 
    )
42
37
from bzrlib.config import extract_email_address
43
38
from bzrlib.repository import _strip_NULL_ghosts
44
39
from bzrlib.revision import CURRENT_REVISION, Revision
193
188
        # or something.
194
189
        last_revision = current_rev.revision_id
195
190
        # XXX: Partially Cloned from branch, uses the old_get_graph, eep.
196
 
        # XXX: The main difficulty is that we need to inject a single new node
197
 
        #      (current_rev) into the graph before it gets numbered, etc.
198
 
        #      Once KnownGraph gets an 'add_node()' function, we can use
199
 
        #      VF.get_known_graph_ancestry().
200
191
        graph = repository.get_graph()
201
192
        revision_graph = dict(((key, value) for key, value in
202
193
            graph.iter_ancestry(current_rev.parent_ids) if value is not None))
317
308
 
318
309
 
319
310
def _get_matching_blocks(old, new):
320
 
    matcher = patiencediff.PatienceSequenceMatcher(None, old, new)
 
311
    matcher = patiencediff.PatienceSequenceMatcher(None,
 
312
        old, new)
321
313
    return matcher.get_matching_blocks()
322
314
 
323
315
 
462
454
 
463
455
try:
464
456
    from bzrlib._annotator_pyx import Annotator
465
 
except ImportError, e:
466
 
    osutils.failed_to_load_extension(e)
 
457
except ImportError:
467
458
    from bzrlib._annotator_py import Annotator