← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
 
17
18
"""bzr python plugin support.
18
19
 
19
20
When load_plugins() is invoked, any python module in any directory in
29
30
called.
30
31
"""
31
32
 
32
 
from __future__ import absolute_import
33
 
 
34
33
import os
35
34
import sys
36
35
 
49
48
    errors,
50
49
    trace,
51
50
    )
52
 
from bzrlib.i18n import gettext
53
51
from bzrlib import plugins as _mod_plugins
54
52
""")
55
53
 
139
137
        try:
140
138
            name, path = spec.split('@')
141
139
        except ValueError:
142
 
            raise errors.BzrCommandError(gettext(
143
 
                '"%s" is not a valid <plugin_name>@<plugin_path> description ')
 
140
            raise errors.BzrCommandError(
 
141
                '"%s" is not a valid <plugin_name>@<plugin_path> description '
144
142
                % spec)
145
143
        specs.append((name, path))
146
144
    return specs
632
630
        return None
633
631
 
634
632
    def load_module(self, fullname):
635
 
        """Load a plugin from a specific directory (or file)."""
 
633
        """Load a plugin from a specific directory."""
636
634
        # We are called only for specific paths
637
635
        plugin_path = self.specific_paths[fullname]
638
636
        loading_path = None