Rev 6384: (jelmer) Always import bzrlib.bzrdir in bzrlib.workingtree. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6384 [merge]
revision-id: pqm at pqm.ubuntu.com-20111219111738-g3ldsov4alx2jalx
parent: pqm at pqm.ubuntu.com-20111219015641-k7fyhyf6rfgk93m2
parent: jelmer at samba.org-20111216161805-162jpe4iw4bowf75
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-12-19 11:17:38 +0000
message:
  (jelmer) Always import bzrlib.bzrdir in bzrlib.workingtree. (Jelmer Vernooij)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-12-14 23:43:20 +0000
+++ b/bzrlib/branch.py	2011-12-16 16:18:05 +0000
@@ -14,8 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import bzrlib.bzrdir
-
 from cStringIO import StringIO
 
 from bzrlib.lazy_import import lazy_import
@@ -46,6 +44,10 @@
 from bzrlib.i18n import gettext, ngettext
 """)
 
+# Explicitly import bzrlib.bzrdir so that the BzrProber
+# is guaranteed to be registered.
+import bzrlib.bzrdir
+
 from bzrlib import (
     controldir,
     )

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2011-12-14 14:09:47 +0000
+++ b/bzrlib/repository.py	2011-12-16 16:18:05 +0000
@@ -20,7 +20,6 @@
 import time
 
 from bzrlib import (
-    bzrdir,
     config,
     controldir,
     debug,
@@ -39,6 +38,7 @@
 """)
 
 from bzrlib import (
+    bzrdir,
     errors,
     registry,
     symbol_versioning,

=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2011-12-14 15:53:59 +0000
+++ b/bzrlib/workingtree.py	2011-12-16 16:18:05 +0000
@@ -69,6 +69,10 @@
     )
 """)
 
+# Explicitly import bzrlib.bzrdir so that the BzrProber
+# is guaranteed to be registered.
+import bzrlib.bzrdir
+
 from bzrlib import symbol_versioning
 from bzrlib.decorators import needs_read_lock, needs_write_lock
 from bzrlib.i18n import gettext

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-12-18 20:47:47 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-12-19 11:17:38 +0000
@@ -67,6 +67,9 @@
 * Properly ignore '\n' in an option reference since this cannot be part of a
   config option identifier. (Vincent Ladeuil, #902125)
 
+* Make sure that the bzr probers are always registered when
+  bzrlib.workingtree is imported. (Jelmer Vernooij, #905218)
+
 * Report mistake trying to move a removed file with a non-ascii name without
   UnicodeEncodeError being raised. (Martin Packman, #898541)