Rev 6089: (jelmer) Use get_transport_from_path and get_transport_from_url in more in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Aug 20 22:42:39 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6089 [merge]
revision-id: pqm at pqm.ubuntu.com-20110820224234-l0c0cmesdnfp2srq
parent: pqm at pqm.ubuntu.com-20110820144112-k4tz334t1ga9yzrw
parent: jelmer at samba.org-20110820184815-orrch1nm7zgr7n9x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-08-20 22:42:34 +0000
message:
(jelmer) Use get_transport_from_path and get_transport_from_url in more
places. (Jelmer Vernooij)
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/doc/api/transport.txt transport.txt-20051224020744-66b4fb564d98a5a5
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/per_controldir/test_controldir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_transport.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
bzrlib/tests/per_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_server.py test_server.py-20100209163834-im1ozfuenfmqaa2m-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2011-08-18 15:06:51 +0000
+++ b/bzrlib/branch.py 2011-08-19 22:34:02 +0000
@@ -16,7 +16,6 @@
from cStringIO import StringIO
-import sys
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
=== modified file 'bzrlib/btree_index.py'
--- a/bzrlib/btree_index.py 2011-05-19 09:32:38 +0000
+++ b/bzrlib/btree_index.py 2011-08-19 22:34:02 +0000
@@ -197,7 +197,7 @@
new_backing_file, size = self._spill_mem_keys_without_combining()
# Note: The transport here isn't strictly needed, because we will use
# direct access to the new_backing._file object
- new_backing = BTreeGraphIndex(transport.get_transport('.'),
+ new_backing = BTreeGraphIndex(transport.get_transport_from_path('.'),
'<temp>', size)
# GC will clean up the file
new_backing._file = new_backing_file
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py 2011-08-20 05:22:49 +0000
+++ b/bzrlib/config.py 2011-08-20 22:42:34 +0000
@@ -1025,7 +1025,7 @@
# local transports are not shared. But if/when we start using
# LockableConfig for other kind of transports, we will need to reuse
# whatever connection is already established -- vila 20100929
- self.transport = transport.get_transport(self.dir)
+ self.transport = transport.get_transport_from_path(self.dir)
self._lock = lockdir.LockDir(self.transport, self.lock_name)
def _create_from_string(self, unicode_bytes, save):
=== modified file 'bzrlib/doc/api/transport.txt'
--- a/bzrlib/doc/api/transport.txt 2006-06-30 21:22:07 +0000
+++ b/bzrlib/doc/api/transport.txt 2011-08-19 22:34:02 +0000
@@ -6,14 +6,14 @@
>>> from bzrlib.urlutils import local_path_from_url
>>> import bzrlib.transport as transport
>>> if sys.platform == 'win32':
- ... root = transport.get_transport('file:///C:/')
+ ... root = transport.get_transport_from_url('file:///C:/')
... else:
- ... root = transport.get_transport('file:///')
+ ... root = transport.get_transport_from_url('file:///')
>>>
Each Transport instance represents a single logical directory.
- >>> dir = transport.get_transport(".")
+ >>> dir = transport.get_transport_from_path(".")
>>> local_path_from_url(dir.base) == getcwd() + '/'
True
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2011-08-19 16:39:25 +0000
+++ b/bzrlib/tests/__init__.py 2011-08-20 22:42:34 +0000
@@ -2433,7 +2433,8 @@
:param relpath: a path relative to the base url.
"""
- t = _mod_transport.get_transport(self.get_readonly_url(relpath))
+ t = _mod_transport.get_transport_from_url(
+ self.get_readonly_url(relpath))
self.assertTrue(t.is_readonly())
return t
@@ -2573,7 +2574,7 @@
propagating. This method ensures than a test did not leaked.
"""
root = TestCaseWithMemoryTransport.TEST_ROOT
- t = _mod_transport.get_transport(root)
+ t = _mod_transport.get_transport_from_path(root)
self.permit_url(t.base)
if (t.get_bytes('.bzr/checkout/dirstate') !=
TestCaseWithMemoryTransport._SAFETY_NET_PRISTINE_DIRSTATE):
@@ -2824,7 +2825,7 @@
"a list or a tuple. Got %r instead" % (shape,))
# It's OK to just create them using forward slashes on windows.
if transport is None or transport.is_readonly():
- transport = _mod_transport.get_transport(".")
+ transport = _mod_transport.get_transport_from_path(".")
for name in shape:
self.assertIsInstance(name, basestring)
if name[-1] == '/':
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2011-05-29 15:42:32 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2011-08-19 22:34:02 +0000
@@ -224,7 +224,7 @@
def test_bzr_serve_port_readonly(self):
"""bzr server should provide a read only filesystem by default."""
process, url = self.start_server_port()
- t = transport.get_transport(url)
+ t = transport.get_transport_from_url(url)
self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
self.assertServerFinishesCleanly(process)
=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- a/bzrlib/tests/per_controldir/test_controldir.py 2011-08-15 13:26:00 +0000
+++ b/bzrlib/tests/per_controldir/test_controldir.py 2011-08-20 18:48:15 +0000
@@ -1120,7 +1120,7 @@
# test the formats specific behaviour for no-content or similar dirs.
self.assertRaises(errors.NotBranchError,
self.bzrdir_format.open,
- transport.get_transport(self.get_readonly_url()))
+ transport.get_transport_from_url(self.get_readonly_url()))
def test_create_branch(self):
# a bzrdir can construct a branch and repository for itself.
@@ -1637,7 +1637,7 @@
# - do the vfs initialisation over the basic vfs transport
# XXX: TODO this should become a 'bzrdirlocation' api call.
url = self.get_vfs_only_url('subdir')
- transport.get_transport(self.get_vfs_only_url()).mkdir('subdir')
+ transport.get_transport_from_url(self.get_vfs_only_url()).mkdir('subdir')
made_control = self.bzrdir_format.initialize(self.get_url('subdir'))
try:
repo = made_control.open_repository()
=== modified file 'bzrlib/tests/per_pack_repository.py'
--- a/bzrlib/tests/per_pack_repository.py 2011-01-26 19:34:58 +0000
+++ b/bzrlib/tests/per_pack_repository.py 2011-08-19 22:34:02 +0000
@@ -266,7 +266,7 @@
format = self.get_format()
server = test_server.FakeNFSServer()
self.start_server(server)
- t = transport.get_transport(server.get_url())
+ t = transport.get_transport_from_url(server.get_url())
bzrdir = self.get_format().initialize_on_transport(t)
repo = bzrdir.create_repository()
repo_transport = bzrdir.get_repository_transport(None)
=== modified file 'bzrlib/tests/per_repository/test_has_same_location.py'
--- a/bzrlib/tests/per_repository/test_has_same_location.py 2011-05-13 12:51:05 +0000
+++ b/bzrlib/tests/per_repository/test_has_same_location.py 2011-08-19 22:34:02 +0000
@@ -115,8 +115,8 @@
if repo._format == other_repo._format:
# We're testing the default format! So we have to use a non-default
# format for other_repo.
- transport.get_transport(self.get_vfs_only_url()
- ).delete_tree('other')
+ transport.get_transport_from_url(
+ self.get_vfs_only_url()).delete_tree('other')
other_repo = self.make_repository('other', format='knit')
# Make sure the other_repo is not a RemoteRepository.
other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2011-08-04 00:17:53 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2011-08-19 22:34:02 +0000
@@ -604,7 +604,7 @@
repo = self.make_repository(path, shared=shared)
smart_server = test_server.SmartTCPServer_for_testing()
self.start_server(smart_server, self.get_server())
- remote_transport = transport.get_transport(
+ remote_transport = transport.get_transport_from_url(
smart_server.get_url()).clone(path)
remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
remote_repo = remote_bzrdir.open_repository()
=== modified file 'bzrlib/tests/per_transport.py'
--- a/bzrlib/tests/per_transport.py 2011-08-15 11:19:03 +0000
+++ b/bzrlib/tests/per_transport.py 2011-08-19 22:34:02 +0000
@@ -1050,7 +1050,7 @@
except NotImplementedError:
raise TestSkipped("Transport %s has no bogus URL support." %
self._server.__class__)
- t = _mod_transport.get_transport(url)
+ t = _mod_transport.get_transport_from_url(url)
self.assertRaises((ConnectionError, NoSuchFile), t.get, '.bzr/branch')
def test_stat(self):
@@ -1418,11 +1418,11 @@
# smoke test for abspath on win32.
# a transport based on 'file:///' never fully qualifies the drive.
- transport = _mod_transport.get_transport("file:///")
+ transport = _mod_transport.get_transport_from_url("file:///")
self.assertEqual(transport.abspath("/"), "file:///")
# but a transport that starts with a drive spec must keep it.
- transport = _mod_transport.get_transport("file:///C:/")
+ transport = _mod_transport.get_transport_from_url("file:///C:/")
self.assertEqual(transport.abspath("/"), "file:///C:/")
def test_local_abspath(self):
@@ -1788,7 +1788,7 @@
base_url = self._server.get_url()
parameters = {"key1": "val1", "key2": "val2"}
url = urlutils.join_segment_parameters(base_url, parameters)
- transport = _mod_transport.get_transport(url)
+ transport = _mod_transport.get_transport_from_url(url)
self.assertEquals(parameters, transport.get_segment_parameters())
def test_stat_symlink(self):
=== modified file 'bzrlib/tests/per_uifactory/__init__.py'
--- a/bzrlib/tests/per_uifactory/__init__.py 2011-05-16 14:02:27 +0000
+++ b/bzrlib/tests/per_uifactory/__init__.py 2011-08-19 22:34:02 +0000
@@ -101,7 +101,7 @@
def test_transport_activity(self):
# It doesn't matter what the implementation does, we just want to make
# sure the interface is there
- t = transport.get_transport('memory:///')
+ t = transport.get_transport_from_url('memory:///')
self.factory.report_transport_activity(t, 1000, 'write')
self.factory.report_transport_activity(t, 2000, 'read')
self.factory.report_transport_activity(t, 4000, None)
@@ -112,7 +112,7 @@
def test_no_transport_activity(self):
# No activity to report
- t = transport.get_transport('memory:///')
+ t = transport.get_transport_from_url('memory:///')
self.factory.log_transport_activity(display=True)
self._check_log_transport_activity_display_no_bytes()
=== modified file 'bzrlib/tests/per_versionedfile.py'
--- a/bzrlib/tests/per_versionedfile.py 2011-05-04 02:40:34 +0000
+++ b/bzrlib/tests/per_versionedfile.py 2011-08-19 22:34:02 +0000
@@ -904,8 +904,8 @@
# we should be able to read from http with a versioned file.
vf = self.get_file()
# try an empty file access
- readonly_vf = self.get_factory()('foo', transport.get_transport(
- self.get_readonly_url('.')))
+ readonly_vf = self.get_factory()('foo',
+ transport.get_transport_from_url(self.get_readonly_url('.')))
self.assertEqual([], readonly_vf.versions())
def test_readonly_http_works_with_feeling(self):
@@ -914,8 +914,8 @@
# now with feeling.
vf.add_lines('1', [], ['a\n'])
vf.add_lines('2', ['1'], ['b\n', 'a\n'])
- readonly_vf = self.get_factory()('foo', transport.get_transport(
- self.get_readonly_url('.')))
+ readonly_vf = self.get_factory()('foo',
+ transport.get_transport_from_url(self.get_readonly_url('.')))
self.assertEqual(['1', '2'], vf.versions())
self.assertEqual(['1', '2'], readonly_vf.versions())
for version in readonly_vf.versions():
=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py 2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/test_btree_index.py 2011-08-19 22:34:02 +0000
@@ -281,7 +281,7 @@
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', self.time(builder.finish))
del builder
index = btree_index.BTreeGraphIndex(t, 'index', size)
@@ -608,7 +608,7 @@
for key, value, references in nodes:
builder.add_node(key, value, references)
stream = builder.finish()
- trans = transport.get_transport('trace+' + self.get_url())
+ trans = transport.get_transport_from_url('trace+' + self.get_url())
size = trans.put_file('index', stream)
return btree_index.BTreeGraphIndex(trans, 'index', size)
@@ -649,20 +649,20 @@
self.assertEqual(0, len(index._leaf_node_cache))
def test_trivial_constructor(self):
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
index = btree_index.BTreeGraphIndex(t, 'index', None)
# Checks the page size at load, but that isn't logged yet.
self.assertEqual([], t._activity)
def test_with_size_constructor(self):
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
index = btree_index.BTreeGraphIndex(t, 'index', 1)
# Checks the page size at load, but that isn't logged yet.
self.assertEqual([], t._activity)
def test_empty_key_count_no_size(self):
builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
t.put_file('index', builder.finish())
index = btree_index.BTreeGraphIndex(t, 'index', None)
del t._activity[:]
@@ -675,7 +675,7 @@
def test_empty_key_count(self):
builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
self.assertEqual(72, size)
index = btree_index.BTreeGraphIndex(t, 'index', size)
@@ -691,7 +691,7 @@
nodes = self.make_nodes(35, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
index = btree_index.BTreeGraphIndex(t, 'index', size)
del t._activity[:]
@@ -723,7 +723,7 @@
def test__read_nodes_no_size_one_page_reads_once(self):
self.make_index(nodes=[(('key',), 'value', ())])
- trans = transport.get_transport('trace+' + self.get_url())
+ trans = transport.get_transport_from_url('trace+' + self.get_url())
index = btree_index.BTreeGraphIndex(trans, 'index', None)
del trans._activity[:]
nodes = dict(index._read_nodes([0]))
@@ -737,7 +737,7 @@
index.key_count()
num_pages = index._row_offsets[-1]
# Reopen with a traced transport and no size
- trans = transport.get_transport('trace+' + self.get_url())
+ trans = transport.get_transport_from_url('trace+' + self.get_url())
index = btree_index.BTreeGraphIndex(trans, 'index', None)
del trans._activity[:]
nodes = dict(index._read_nodes([0]))
@@ -748,7 +748,7 @@
nodes = self.make_nodes(160, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
self.assertEqual(17692, size)
index = btree_index.BTreeGraphIndex(t, 'index', size)
@@ -764,7 +764,7 @@
nodes = self.make_nodes(45, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
index = btree_index.BTreeGraphIndex(t, 'index', size)
del t._activity[:]
@@ -780,7 +780,7 @@
nodes = self.make_nodes(80, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
# Root page, 2 leaf pages
self.assertEqual(9339, size)
@@ -798,7 +798,7 @@
def test_eq_ne(self):
# two indices are equal when constructed with the same parameters:
- t1 = transport.get_transport('trace+' + self.get_url(''))
+ t1 = transport.get_transport_from_url('trace+' + self.get_url(''))
t2 = self.get_transport()
self.assertTrue(
btree_index.BTreeGraphIndex(t1, 'index', None) ==
@@ -833,7 +833,7 @@
def test_iter_all_only_root_no_size(self):
self.make_index(nodes=[(('key',), 'value', ())])
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
index = btree_index.BTreeGraphIndex(t, 'index', None)
del t._activity[:]
self.assertEqual([(('key',), 'value')],
@@ -850,7 +850,7 @@
nodes = self.make_nodes(10000, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
self.assertEqual(1303220, size, 'number of expected bytes in the'
' output changed')
@@ -905,7 +905,7 @@
nodes = self.make_nodes(160, 2, 2)
for node in nodes:
builder.add_node(*node)
- t = transport.get_transport('trace+' + self.get_url(''))
+ t = transport.get_transport_from_url('trace+' + self.get_url(''))
size = t.put_file('index', builder.finish())
del builder
index = btree_index.BTreeGraphIndex(t, 'index', size)
@@ -1354,7 +1354,8 @@
BTreeGraphIndex with the recommended information.
"""
index = btree_index.BTreeGraphIndex(
- transport.get_transport('memory:///'), 'test-index', size=size)
+ transport.get_transport_from_url('memory:///'),
+ 'test-index', size=size)
if recommended_pages is not None:
index._recommended_pages = recommended_pages
return index
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2011-08-10 14:02:04 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2011-08-19 22:34:02 +0000
@@ -286,7 +286,7 @@
self.build_tree(["foo/", "bar/"], transport=t)
def check_format(format, url):
format.initialize(url)
- t = _mod_transport.get_transport(url)
+ t = _mod_transport.get_transport_from_path(url)
found_format = bzrdir.BzrDirFormat.find_format(t)
self.assertIsInstance(found_format, format.__class__)
check_format(BzrDirFormatTest1(), "foo")
@@ -295,7 +295,7 @@
def test_find_format_nothing_there(self):
self.assertRaises(NotBranchError,
bzrdir.BzrDirFormat.find_format,
- _mod_transport.get_transport('.'))
+ _mod_transport.get_transport_from_path('.'))
def test_find_format_unknown_format(self):
t = self.get_transport()
@@ -303,7 +303,7 @@
t.put_bytes('.bzr/branch-format', '')
self.assertRaises(UnknownFormatError,
bzrdir.BzrDirFormat.find_format,
- _mod_transport.get_transport('.'))
+ _mod_transport.get_transport_from_path('.'))
def test_register_unregister_format(self):
format = SampleBzrDirFormat()
@@ -317,7 +317,7 @@
# which bzrdir.open_containing will refuse (not supported)
self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url)
# but open_downlevel will work
- t = _mod_transport.get_transport(url)
+ t = _mod_transport.get_transport_from_url(url)
self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
# unregister the format
bzrdir.BzrProber.formats.remove(format.get_format_string())
@@ -711,16 +711,19 @@
def test_open_containing_from_transport(self):
self.assertRaises(NotBranchError,
bzrdir.BzrDir.open_containing_from_transport,
- _mod_transport.get_transport(self.get_readonly_url('')))
+ _mod_transport.get_transport_from_url(self.get_readonly_url('')))
self.assertRaises(NotBranchError,
bzrdir.BzrDir.open_containing_from_transport,
- _mod_transport.get_transport(self.get_readonly_url('g/p/q')))
+ _mod_transport.get_transport_from_url(
+ self.get_readonly_url('g/p/q')))
control = bzrdir.BzrDir.create(self.get_url())
branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
- _mod_transport.get_transport(self.get_readonly_url('')))
+ _mod_transport.get_transport_from_url(
+ self.get_readonly_url('')))
self.assertEqual('', relpath)
branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
- _mod_transport.get_transport(self.get_readonly_url('g/p/q')))
+ _mod_transport.get_transport_from_url(
+ self.get_readonly_url('g/p/q')))
self.assertEqual('g/p/q', relpath)
def test_open_containing_tree_or_branch(self):
@@ -899,7 +902,7 @@
def evaluate(bzrdir):
try:
repo = bzrdir.open_repository()
- except NoRepositoryPresent:
+ except errors.NoRepositoryPresent:
return True, bzrdir.root_transport.base
else:
return False, bzrdir.root_transport.base
=== modified file 'bzrlib/tests/test_ftp_transport.py'
--- a/bzrlib/tests/test_ftp_transport.py 2011-08-15 12:26:33 +0000
+++ b/bzrlib/tests/test_ftp_transport.py 2011-08-19 22:34:02 +0000
@@ -44,7 +44,7 @@
"""Test aftp transport."""
def test_aftp_degrade(self):
- t = transport.get_transport('aftp://host/path')
+ t = transport.get_transport_from_url('aftp://host/path')
self.assertTrue(t.is_active)
parent = t.clone('..')
self.assertTrue(parent.is_active)
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2011-08-08 17:52:59 +0000
+++ b/bzrlib/tests/test_http.py 2011-08-19 22:34:02 +0000
@@ -533,7 +533,8 @@
scenarios = vary_by_http_client_implementation()
def test_http_registered(self):
- t = transport.get_transport('%s://foo.com/' % self._url_protocol)
+ t = transport.get_transport_from_url(
+ '%s://foo.com/' % self._url_protocol)
self.assertIsInstance(t, transport.Transport)
self.assertIsInstance(t, self._transport)
@@ -551,7 +552,7 @@
self.start_server(server)
url = server.get_url()
# FIXME: needs a cleanup -- vila 20100611
- http_transport = transport.get_transport(url)
+ http_transport = transport.get_transport_from_url(url)
code, response = http_transport._post('abc def end-of-body')
self.assertTrue(
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
@@ -1635,7 +1636,8 @@
return url
def get_user_transport(self, user, password):
- t = transport.get_transport(self.get_user_url(user, password))
+ t = transport.get_transport_from_url(
+ self.get_user_url(user, password))
return t
def test_no_user(self):
@@ -1915,7 +1917,8 @@
# The 'readv' command in the smart protocol both sends and receives
# bulk data, so we use that.
self.build_tree(['data-file'])
- http_transport = transport.get_transport(self.http_server.get_url())
+ http_transport = transport.get_transport_from_url(
+ self.http_server.get_url())
medium = http_transport.get_smart_medium()
# Since we provide the medium, the url below will be mostly ignored
# during the test, as long as the path is '/'.
@@ -1929,7 +1932,8 @@
post_body = 'hello\n'
expected_reply_body = 'ok\x012\n'
- http_transport = transport.get_transport(self.http_server.get_url())
+ http_transport = transport.get_transport_from_url(
+ self.http_server.get_url())
medium = http_transport.get_smart_medium()
response = medium.send_http_smart_request(post_body)
reply_body = response.read()
=== modified file 'bzrlib/tests/test_index.py'
--- a/bzrlib/tests/test_index.py 2011-01-27 14:27:18 +0000
+++ b/bzrlib/tests/test_index.py 2011-08-19 22:34:02 +0000
@@ -389,7 +389,7 @@
for key, value, references in nodes:
builder.add_node(key, value, references)
stream = builder.finish()
- trans = transport.get_transport('trace+' + self.get_url())
+ trans = transport.get_transport_from_url('trace+' + self.get_url())
size = trans.put_file('index', stream)
return index.GraphIndex(trans, 'index', size)
=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py 2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/test_knit.py 2011-08-19 22:34:02 +0000
@@ -1603,13 +1603,13 @@
# could leave an empty .kndx file, which bzr would later claim was a
# corrupted file since the header was not present. In reality, the file
# just wasn't created, so it should be ignored.
- t = transport.get_transport('.')
+ t = transport.get_transport_from_path('.')
t.put_bytes('test.kndx', '')
knit = self.make_test_knit()
def test_knit_index_checks_header(self):
- t = transport.get_transport('.')
+ t = transport.get_transport_from_path('.')
t.put_bytes('test.kndx', '# not really a knit header\n\n')
k = self.make_test_knit()
self.assertRaises(KnitHeaderError, k.keys)
=== modified file 'bzrlib/tests/test_lockable_files.py'
--- a/bzrlib/tests/test_lockable_files.py 2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_lockable_files.py 2011-08-19 22:34:02 +0000
@@ -273,7 +273,7 @@
def setUp(self):
TestCaseInTempDir.setUp(self)
- t = transport.get_transport('.')
+ t = transport.get_transport_from_path('.')
t.mkdir('.bzr')
self.sub_transport = t.clone('.bzr')
self.lockable = self.get_lockable()
@@ -298,7 +298,7 @@
def setUp(self):
TestCaseInTempDir.setUp(self)
- self.transport = transport.get_transport('.')
+ self.transport = transport.get_transport_from_path('.')
self.lockable = self.get_lockable()
# the lock creation here sets mode - test_permissions on branch
# tests that implicitly, but it might be a good idea to factor
@@ -341,7 +341,7 @@
# in test_remote and test_smart as usual.
b = self.make_branch('foo')
self.addCleanup(b.bzrdir.transport.disconnect)
- self.transport = transport.get_transport('.')
+ self.transport = transport.get_transport_from_path('.')
self.lockable = self.get_lockable()
def get_lockable(self):
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py 2011-08-15 16:37:57 +0000
+++ b/bzrlib/tests/test_lockdir.py 2011-08-19 22:34:02 +0000
@@ -463,7 +463,8 @@
def test_lock_with_buggy_rename(self):
# test that lock acquisition handles servers which pretend they
# renamed correctly but that actually fail
- t = transport.get_transport('brokenrename+' + self.get_url())
+ t = transport.get_transport_from_url(
+ 'brokenrename+' + self.get_url())
ld1 = LockDir(t, 'test_lock')
ld1.create()
ld1.attempt_lock()
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2011-05-26 08:05:45 +0000
+++ b/bzrlib/tests/test_repository.py 2011-08-19 22:34:02 +0000
@@ -136,7 +136,7 @@
def check_format(format, url):
dir = format._matchingbzrdir.initialize(url)
format.initialize(dir)
- t = transport.get_transport(url)
+ t = transport.get_transport_from_path(url)
found_format = repository.RepositoryFormat.find_format(dir)
self.assertIsInstance(found_format, format.__class__)
check_format(repository.format_registry.get_default(), "bar")
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2011-08-11 10:33:51 +0000
+++ b/bzrlib/tests/test_selftest.py 2011-08-19 22:34:02 +0000
@@ -619,7 +619,7 @@
def test_dangling_locks_cause_failures(self):
class TestDanglingLock(tests.TestCaseWithMemoryTransport):
def test_function(self):
- t = self.get_transport('.')
+ t = self.get_transport_from_path('.')
l = lockdir.LockDir(t, 'lock')
l.create()
l.attempt_lock()
@@ -645,8 +645,8 @@
# for the server
url = self.get_readonly_url()
url2 = self.get_readonly_url('foo/bar')
- t = transport.get_transport(url)
- t2 = transport.get_transport(url2)
+ t = transport.get_transport_from_url(url)
+ t2 = transport.get_transport_from_url(url2)
self.assertIsInstance(t, ReadonlyTransportDecorator)
self.assertIsInstance(t2, ReadonlyTransportDecorator)
self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
@@ -660,8 +660,8 @@
url = self.get_readonly_url()
url2 = self.get_readonly_url('foo/bar')
# the transport returned may be any HttpTransportBase subclass
- t = transport.get_transport(url)
- t2 = transport.get_transport(url2)
+ t = transport.get_transport_from_url(url)
+ t2 = transport.get_transport_from_url(url2)
self.assertIsInstance(t, HttpTransportBase)
self.assertIsInstance(t2, HttpTransportBase)
self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
@@ -705,7 +705,7 @@
class TestChrootedTest(tests.ChrootedTestCase):
def test_root_is_root(self):
- t = transport.get_transport(self.get_readonly_url())
+ t = transport.get_transport_from_url(self.get_readonly_url())
url = t.base
self.assertEqual(url, t.clone('..').base)
@@ -1490,7 +1490,7 @@
transport_server = memory.MemoryServer()
transport_server.start_server()
self.addCleanup(transport_server.stop_server)
- t = transport.get_transport(transport_server.get_url())
+ t = transport.get_transport_from_url(transport_server.get_url())
bzrdir.BzrDir.create(t.base)
self.assertRaises(errors.BzrError,
bzrdir.BzrDir.open_from_transport, t)
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py 2011-02-10 12:37:27 +0000
+++ b/bzrlib/tests/test_server.py 2011-08-19 22:34:02 +0000
@@ -212,10 +212,10 @@
def start_server(self, backing_server=None):
"""Setup the Chroot on backing_server."""
if backing_server is not None:
- self.backing_transport = transport.get_transport(
+ self.backing_transport = transport.get_transport_from_url(
backing_server.get_url())
else:
- self.backing_transport = transport.get_transport('.')
+ self.backing_transport = transport.get_transport_from_path('.')
self.backing_transport.clone('added-by-filter').ensure_base()
self.filter_func = lambda x: 'added-by-filter/' + x
super(TestingPathFilteringServer, self).start_server()
@@ -233,10 +233,10 @@
def start_server(self, backing_server=None):
"""Setup the Chroot on backing_server."""
if backing_server is not None:
- self.backing_transport = transport.get_transport(
+ self.backing_transport = transport.get_transport_from_url(
backing_server.get_url())
else:
- self.backing_transport = transport.get_transport('.')
+ self.backing_transport = transport.get_transport_from_path('.')
super(TestingChrootServer, self).start_server()
def get_bogus_url(self):
@@ -665,7 +665,7 @@
self.chroot_server = ChrootServer(
self.get_backing_transport(backing_transport_server))
self.chroot_server.start_server()
- self.backing_transport = transport.get_transport(
+ self.backing_transport = transport.get_transport_from_url(
self.chroot_server.get_url())
super(SmartTCPServer_for_testing, self).start_server()
@@ -677,7 +677,8 @@
def get_backing_transport(self, backing_transport_server):
"""Get a backing transport from a server we are decorating."""
- return transport.get_transport(backing_transport_server.get_url())
+ return transport.get_transport_from_url(
+ backing_transport_server.get_url())
def get_url(self):
url = self.server.get_url()
@@ -694,7 +695,7 @@
def get_backing_transport(self, backing_transport_server):
"""Get a backing transport from a server we are decorating."""
url = 'readonly+' + backing_transport_server.get_url()
- return transport.get_transport(url)
+ return transport.get_transport_from_url(url)
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
@@ -715,4 +716,4 @@
def get_backing_transport(self, backing_transport_server):
"""Get a backing transport from a server we are decorating."""
url = 'readonly+' + backing_transport_server.get_url()
- return transport.get_transport(url)
+ return transport.get_transport_from_url(url)
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2011-08-08 17:52:59 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2011-08-19 22:34:02 +0000
@@ -180,7 +180,7 @@
server.start_server()
self.addCleanup(server.stop_server)
- transport = _mod_transport.get_transport(server.get_url())
+ transport = _mod_transport.get_transport_from_url(server.get_url())
self.assertFalse(transport.abspath('/').endswith('/~/'))
self.assertTrue(transport.abspath('/').endswith('/'))
del transport
@@ -287,7 +287,7 @@
"""Test that a real connection attempt raises the right error"""
from bzrlib.transport import ssh
self.set_vendor(ssh.ParamikoVendor())
- t = _mod_transport.get_transport(self.bogus_url)
+ t = _mod_transport.get_transport_from_url(self.bogus_url)
self.assertRaises(errors.ConnectionError, t.get, 'foobar')
def test_bad_connection_ssh(self):
@@ -488,7 +488,8 @@
conf._get_config().update(
{'sftptest': {'scheme': 'ssh', 'port': port, 'user': 'bar'}})
conf._save()
- t = _mod_transport.get_transport('sftp://localhost:%d' % port)
+ t = _mod_transport.get_transport_from_url(
+ 'sftp://localhost:%d' % port)
# force a connection to be performed.
t.has('foo')
return t
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2011-05-26 08:05:45 +0000
+++ b/bzrlib/tests/test_smart.py 2011-08-19 22:34:02 +0000
@@ -85,7 +85,7 @@
backing_transport = tests.TestCaseWithTransport.get_transport(self)
self._chroot_server = chroot.ChrootServer(backing_transport)
self.start_server(self._chroot_server)
- t = transport.get_transport(self._chroot_server.get_url())
+ t = transport.get_transport_from_url(self._chroot_server.get_url())
if relpath is not None:
t = t.clone(relpath)
return t
=== modified file 'bzrlib/tests/test_smart_request.py'
--- a/bzrlib/tests/test_smart_request.py 2011-03-02 21:04:00 +0000
+++ b/bzrlib/tests/test_smart_request.py 2011-08-19 22:34:02 +0000
@@ -240,7 +240,7 @@
self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..'))
# A completely unrelated transport is not allowed
self.assertRaises(errors.JailBreak, _pre_open_hook,
- transport.get_transport('http://host/'))
+ transport.get_transport_from_url('http://host/'))
def test_open_bzrdir_in_non_main_thread(self):
"""Opening a bzrdir in a non-main thread should work ok.
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py 2011-08-12 15:34:53 +0000
+++ b/bzrlib/tests/test_smart_transport.py 2011-08-19 22:34:02 +0000
@@ -1015,13 +1015,13 @@
mem_server.start_server()
self.addCleanup(mem_server.stop_server)
self.permit_url(mem_server.get_url())
- self.backing_transport = transport.get_transport(
+ self.backing_transport = transport.get_transport_from_url(
mem_server.get_url())
else:
self.backing_transport = backing_transport
if readonly:
self.real_backing_transport = self.backing_transport
- self.backing_transport = transport.get_transport(
+ self.backing_transport = transport.get_transport_from_url(
"readonly+" + self.backing_transport.abspath('.'))
self.server = server.SmartTCPServer(self.backing_transport)
self.server.start_server('127.0.0.1', 0)
@@ -1179,7 +1179,8 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_started',
self.capture_server_call, None)
- self.start_server(backing_transport=transport.get_transport("."))
+ self.start_server(
+ backing_transport=transport.get_transport_from_path("."))
# at this point, the server will be starting a thread up.
# there is no indicator at the moment, so bodge it by doing a request.
self.transport.has('.')
@@ -1212,7 +1213,8 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_stopped',
self.capture_server_call, None)
- self.start_server(backing_transport=transport.get_transport("."))
+ self.start_server(
+ backing_transport=transport.get_transport_from_path("."))
result = [(
[self.backing_transport.base, self.backing_transport.external_url()]
, self.transport.base)]
@@ -1354,13 +1356,13 @@
class RemoteTransportRegistration(tests.TestCase):
def test_registration(self):
- t = transport.get_transport('bzr+ssh://example.com/path')
+ t = transport.get_transport_from_url('bzr+ssh://example.com/path')
self.assertIsInstance(t, remote.RemoteSSHTransport)
self.assertEqual('example.com', t._parsed_url.host)
def test_bzr_https(self):
# https://bugs.launchpad.net/bzr/+bug/128456
- t = transport.get_transport('bzr+https://example.com/path')
+ t = transport.get_transport_from_url('bzr+https://example.com/path')
self.assertIsInstance(t, remote.RemoteHTTPTransport)
self.assertStartsWith(
t._http_transport.base,
=== modified file 'bzrlib/tests/test_store.py'
--- a/bzrlib/tests/test_store.py 2011-05-13 12:51:05 +0000
+++ b/bzrlib/tests/test_store.py 2011-08-19 22:34:02 +0000
@@ -82,7 +82,7 @@
class TestCompressedTextStore(TestCaseInTempDir, TestStores):
def get_store(self, path=u'.'):
- t = transport.get_transport(path)
+ t = transport.get_transport_from_path(path)
return TextStore(t, compressed=True)
def test_total_size(self):
@@ -139,7 +139,7 @@
class TestTextStore(TestCaseInTempDir, TestStores):
def get_store(self, path=u'.'):
- t = transport.get_transport(path)
+ t = transport.get_transport_from_path(path)
return TextStore(t, compressed=False)
def test_total_size(self):
@@ -157,7 +157,7 @@
class TestMixedTextStore(TestCaseInTempDir, TestStores):
def get_store(self, path=u'.', compressed=True):
- t = transport.get_transport(path)
+ t = transport.get_transport_from_path(path)
return TextStore(t, compressed=compressed)
def test_get_mixed(self):
=== modified file 'bzrlib/tests/transport_util.py'
--- a/bzrlib/tests/transport_util.py 2011-08-15 12:27:36 +0000
+++ b/bzrlib/tests/transport_util.py 2011-08-19 22:34:02 +0000
@@ -108,7 +108,7 @@
# standard test support code will work and permit the server url
# correctly.
url = self.get_url()
- t = transport.get_transport(url)
+ t = transport.get_transport_from_url(url)
if t.base.endswith('work/'):
t = t.clone('../..')
self.permit_url(t.base)
=== modified file 'bzrlib/transport/decorator.py'
--- a/bzrlib/transport/decorator.py 2011-03-17 10:52:31 +0000
+++ b/bzrlib/transport/decorator.py 2011-08-19 22:34:02 +0000
@@ -50,7 +50,8 @@
(url, prefix))
not_decorated_url = url[len(prefix):]
if _decorated is None:
- self._decorated = transport.get_transport(not_decorated_url)
+ self._decorated = transport.get_transport(
+ not_decorated_url)
else:
self._decorated = _decorated
super(TransportDecorator, self).__init__(prefix + self._decorated.base)
=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py 2011-08-15 12:32:05 +0000
+++ b/bzrlib/transport/http/__init__.py 2011-08-19 22:34:02 +0000
@@ -566,14 +566,16 @@
self._parsed_url.password,
parsed_url.host, parsed_url.port,
base_path)
- new_transport = transport.get_transport(new_url)
+ new_transport = transport.get_transport_from_url(
+ new_url)
else:
# Redirected to a different protocol
new_url = self._unsplit_url(parsed_url.scheme,
parsed_url.user, parsed_url.password,
parsed_url.host, parsed_url.port,
base_path)
- new_transport = transport.get_transport(new_url)
+ new_transport = transport.get_transport_from_url(
+ new_url)
return new_transport
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2011-08-11 14:08:05 +0000
+++ b/bzrlib/transport/remote.py 2011-08-19 22:34:02 +0000
@@ -541,7 +541,7 @@
# url only for an intial construction (when the url came from the
# command-line).
http_url = base[len('bzr+'):]
- self._http_transport = transport.get_transport(http_url)
+ self._http_transport = transport.get_transport_from_url(http_url)
else:
self._http_transport = http_transport
super(RemoteHTTPTransport, self).__init__(
More information about the bazaar-commits
mailing list