← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« 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
188
188
        # or something.
189
189
        last_revision = current_rev.revision_id
190
190
        # XXX: Partially Cloned from branch, uses the old_get_graph, eep.
 
191
        # XXX: The main difficulty is that we need to inject a single new node
 
192
        #      (current_rev) into the graph before it gets numbered, etc.
 
193
        #      Once KnownGraph gets an 'add_node()' function, we can use
 
194
        #      VF.get_known_graph_ancestry().
191
195
        graph = repository.get_graph()
192
196
        revision_graph = dict(((key, value) for key, value in
193
197
            graph.iter_ancestry(current_rev.parent_ids) if value is not None))
454
458
 
455
459
try:
456
460
    from bzrlib._annotator_pyx import Annotator
457
 
except ImportError:
 
461
except ImportError, e:
 
462
    osutils.failed_to_load_extension(e)
458
463
    from bzrlib._annotator_py import Annotator