/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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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