/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-09-09 15:06:00 UTC
  • mto: (4634.37.2 prepare-2.0)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: ian.clatworthy@canonical.com-20090909150600-931um5vqvrqjev2j
Fix the broken links in the User Guide

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
317
312
 
318
313
 
319
314
def _get_matching_blocks(old, new):
320
 
    matcher = patiencediff.PatienceSequenceMatcher(None, old, new)
 
315
    matcher = patiencediff.PatienceSequenceMatcher(None,
 
316
        old, new)
321
317
    return matcher.get_matching_blocks()
322
318
 
323
319
 
462
458
 
463
459
try:
464
460
    from bzrlib._annotator_pyx import Annotator
465
 
except ImportError, e:
466
 
    osutils.failed_to_load_extension(e)
 
461
except ImportError:
467
462
    from bzrlib._annotator_py import Annotator