/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/weave.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/weave.py
69
69
from copy import copy
70
70
from cStringIO import StringIO
71
71
import os
 
72
import time
 
73
import warnings
72
74
 
73
75
from bzrlib.lazy_import import lazy_import
74
76
lazy_import(globals(), """
77
79
from bzrlib import (
78
80
    errors,
79
81
    osutils,
 
82
    progress,
80
83
    )
81
84
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
85
        RevisionAlreadyPresent,
83
86
        RevisionNotPresent,
84
87
        UnavailableRepresentation,
 
88
        WeaveRevisionAlreadyPresent,
 
89
        WeaveRevisionNotPresent,
85
90
        )
86
91
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
92
import bzrlib.patiencediff