← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-16 07:10:45 UTC
  • mto: This revision was merged to the branch mainline in revision 4542.
  • Revision ID: andrew.bennetts@canonical.com-20090716071045-xdve2is0ydw65gu0
Improve error message in osutils.file_relpath.

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().
195
191
        graph = repository.get_graph()
196
192
        revision_graph = dict(((key, value) for key, value in
197
193
            graph.iter_ancestry(current_rev.parent_ids) if value is not None))
458
454
 
459
455
try:
460
456
    from bzrlib._annotator_pyx import Annotator
461
 
except ImportError, e:
462
 
    osutils.failed_to_load_extension(e)
 
457
except ImportError:
463
458
    from bzrlib._annotator_py import Annotator