Rev 5754: (jelmer) Use public Repository.control_transport rather than in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5754 [merge]
revision-id: pqm at pqm.ubuntu.com-20110405103130-b8da764vupjyqpb0
parent: pqm at pqm.ubuntu.com-20110404125817-naj731lqwfvo6u2g
parent: jelmer at samba.org-20110402225152-r2ces5lw5oh16ah7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-04-05 10:31:30 +0000
message:
  (jelmer) Use public Repository.control_transport rather than
   Repository._transport where possible. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
  bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
=== modified file 'bzrlib/tests/per_repository/test_has_same_location.py'
--- a/bzrlib/tests/per_repository/test_has_same_location.py	2011-03-11 21:06:09 +0000
+++ b/bzrlib/tests/per_repository/test_has_same_location.py	2011-04-02 22:51:52 +0000
@@ -20,6 +20,9 @@
     bzrdir,
     transport,
     )
+from bzrlib.remote import (
+    RemoteRepositoryFormat,
+    )
 from bzrlib.tests import (
     TestNotApplicable,
     )
@@ -84,21 +87,19 @@
         CopyConverter creates a second repository in one bzrdir.
         """
         repo = self.make_repository('repo')
-        try:
-            control_transport = repo._transport
-        except AttributeError:
-            raise TestNotApplicable(
-                "%r has no transport" % (repo,))
-        if control_transport.base == repo.bzrdir.transport.base:
+        if repo.control_transport.base == repo.bzrdir.control_transport.base:
             raise TestNotApplicable(
                 "%r has repository files directly in the bzrdir"
                 % (repo,))
             # This test only applies to repository formats where the repo
             # control_files are separate from other bzrdir files, i.e. metadir
             # formats.
-        control_transport.copy_tree('.', '../repository.backup')
-        backup_transport = control_transport.clone('../repository.backup')
-        backup_repo = repo._format.open(repo.bzrdir, _found=True,
+        repo.control_transport.copy_tree('.', '../repository.backup')
+        backup_transport = repo.control_transport.clone('../repository.backup')
+        if isinstance(repo._format, RemoteRepositoryFormat):
+            raise TestNotApplicable("remote repositories don't support overriding "
+                                    "transport")
+        backup_repo = repo._format.open(repo.bzrdir,
                                         _override_transport=backup_transport)
         self.assertDifferentRepo(repo, backup_repo)
 

=== modified file 'bzrlib/tests/per_repository/test_reconcile.py'
--- a/bzrlib/tests/per_repository/test_reconcile.py	2011-01-27 14:27:18 +0000
+++ b/bzrlib/tests/per_repository/test_reconcile.py	2011-04-02 22:51:52 +0000
@@ -49,11 +49,8 @@
     def checkNoBackupInventory(self, aBzrDir):
         """Check that there is no backup inventory in aBzrDir."""
         repo = aBzrDir.open_repository()
-        # Remote repository, and possibly others, do not have
-        # _transport.
-        if getattr(repo, '_transport', None) is not None:
-            for path in repo._transport.list_dir('.'):
-                self.assertFalse('inventory.backup' in path)
+        for path in repo.control_transport.list_dir('.'):
+            self.assertFalse('inventory.backup' in path)
 
 
 class TestsNeedingReweave(TestReconcile):
@@ -197,7 +194,7 @@
     def check_missing_was_removed(self, repo):
         if repo._reconcile_backsup_inventory:
             backed_up = False
-            for path in repo._transport.list_dir('.'):
+            for path in repo.control_transport.list_dir('.'):
                 if 'inventory.backup' in path:
                     backed_up = True
             self.assertTrue(backed_up)