Rev 2299: (Jonathan Lange) Change the import order for plugins, to prefer user dirs. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 2299
revision-id: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-02-26 12:33:28 -0600
message:
  (Jonathan Lange) Change the import order for plugins, to prefer user dirs.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
    ------------------------------------------------------------
    revno: 2298.1.1
    merged: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
    parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
    committer: jml at canonical.com
    branch nick: bzr.plugin-path
    timestamp: Fri 2007-02-23 17:06:54 +1100
    message:
      Make set_plugins_path search user-specified directories (BZR_PLUGIN_PATH 
      or get_default_plugin_path()) before searching in site-wide directories
      (dirname(bzrlib.plugins.__file__)).
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-02-22 14:28:19 +0000
+++ b/NEWS	2007-02-26 18:33:28 +0000
@@ -52,6 +52,9 @@
       "bzr unbind", you can "bzr bind" to bind to the previously-selected
       bind location.
 
+    * Bazaar now looks for user-installed plugins before looking for site-wide
+      plugins. (Jonathan Lange)
+
   INTERNALS:
 
     * Internally revision ids and file ids are now passed around as utf-8
@@ -116,7 +119,7 @@
       (John Arbash Meinel, #30576, #45504)
 
     * Fix http proxy authentication when user and an optional
-      password appears in the *_proxy vars. (Vincent Ladeuil,
+      password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
       #83954).
 
     * ``bzr log branch/file`` works for local treeless branches

=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py	2007-02-02 20:27:53 +0000
+++ b/bzrlib/plugin.py	2007-02-23 06:06:54 +0000
@@ -84,8 +84,8 @@
     """Set the path for plugins to be loaded from."""
     path = os.environ.get('BZR_PLUGIN_PATH',
                           get_default_plugin_path()).split(os.pathsep)
-    # search the bzrlib installed dir before anything else.
-    path.insert(0, os.path.dirname(plugins.__file__))
+    # search the plugin path before the bzrlib installed dir
+    path.append(os.path.dirname(plugins.__file__))
     plugins.__path__ = path
     return path