/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: Vincent Ladeuil
  • Date: 2009-08-20 13:26:36 UTC
  • mto: (4672.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4673.
  • Revision ID: v.ladeuil+lp@free.fr-20090820132636-i3rs1vf3d3fn46hq
Update doc and add NEWS entry.

* bzrlib/tests/test_plugins.py:
(TestEnvPluginPath.test_disable_core,
TestEnvPluginPath.test_disable_site,
TestEnvPluginPath.test_override_site,
TestEnvPluginPath.test_override_core):

* bzrlib/plugin.py:
(get_standard_plugins_path): Give a better explanantion and don't
break compatibility.

* bzrlib/help_topics/en/configuration.txt: 
(BZR_PLUGIN_PATH): Update doc.

* doc/en/user-guide/plugins.txt: 
Fix doc.

* doc/en/user-guide/writing_a_plugin.txt: 
Fix doc.

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