Rev 3309: Move smart protocol version query logic into the medium, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Mar 27 02:21:47 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3309
revision-id:pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
parent: andrew.bennetts at canonical.com-20080326221509-ggzura2egh8msa3z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-03-27 02:21:36 +0000
message:
Move smart protocol version query logic into the medium,
so that we no longer make redundant version queries. (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3241.1.8
revision-id:andrew.bennetts at canonical.com-20080326221509-ggzura2egh8msa3z
parent: andrew.bennetts at canonical.com-20080326220305-4cur6a0c9kmyyn6c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Thu 2008-03-27 09:15:09 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3241.1.7
revision-id:andrew.bennetts at canonical.com-20080326220305-4cur6a0c9kmyyn6c
parent: andrew.bennetts at canonical.com-20080326220030-91y3ze0721oix2bz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Thu 2008-03-27 09:03:05 +1100
message:
Remove unused imports from bzrlib/transport/__init__.py.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3241.1.6
revision-id:andrew.bennetts at canonical.com-20080326220030-91y3ze0721oix2bz
parent: andrew.bennetts at canonical.com-20080326214402-cpdwd79w1uu2c8un
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Thu 2008-03-27 09:00:30 +1100
message:
Deprecate Transport.get_smart_client and errors.NoSmartServer, as these are now unused.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3241.1.5
revision-id:andrew.bennetts at canonical.com-20080326214402-cpdwd79w1uu2c8un
parent: andrew.bennetts at canonical.com-20080326095048-8eo3qp3w4rhamtt4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Thu 2008-03-27 08:44:02 +1100
message:
Add comment suggested by Robert.
modified:
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3241.1.4
revision-id:andrew.bennetts at canonical.com-20080326095048-8eo3qp3w4rhamtt4
parent: andrew.bennetts at canonical.com-20080326064904-3ja75n1zbggmgx5w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Wed 2008-03-26 20:50:48 +1100
message:
Use get_smart_medium as suggested by Robert, and deal with the fallout.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3241.1.3
revision-id:andrew.bennetts at canonical.com-20080326064904-3ja75n1zbggmgx5w
parent: andrew.bennetts at canonical.com-20080228142120-0kxund2mhm7ne5sh
parent: pqm at pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-logic-into-medium
timestamp: Wed 2008-03-26 17:49:04 +1100
message:
Merge bzr.dev.
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_uncommit.py test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3241.1.2
revision-id:andrew.bennetts at canonical.com-20080228142120-0kxund2mhm7ne5sh
parent: andrew.bennetts at canonical.com-20080228140605-kj7oeq417cxk2l9b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-api
timestamp: Fri 2008-02-29 01:21:20 +1100
message:
Tidy comments.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
------------------------------------------------------------
revno: 3241.1.1
revision-id:andrew.bennetts at canonical.com-20080228140605-kj7oeq417cxk2l9b
parent: pqm at pqm.ubuntu.com-20080228032258-4mdmqlx603ak6x2w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-versioning-api
timestamp: Fri 2008-02-29 01:06:05 +1100
message:
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
=== modified file 'NEWS'
--- a/NEWS 2008-03-26 10:12:45 +0000
+++ b/NEWS 2008-03-27 02:21:36 +0000
@@ -37,6 +37,11 @@
* Merge is faster. We no longer check a file's existence unnecessarily
when merging the execute bit. (Aaron Bentley)
+ * The smart protocol client is slightly faster, because it now only queries
+ the server for the protocol version once per connection. Also, the HTTP
+ transport will now automatically use a smart server if one is present.
+ (Andrew Bennetts)
+
BUGFIXES:
* ``bzr mv a b`` can be now used also to rename previously renamed
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-03-12 01:06:03 +0000
+++ b/bzrlib/bzrdir.py 2008-03-26 09:50:48 +0000
@@ -2394,18 +2394,20 @@
def probe_transport(klass, transport):
"""Return a RemoteBzrDirFormat object if it looks possible."""
try:
- client = transport.get_smart_client()
+ medium = transport.get_smart_medium()
except (NotImplementedError, AttributeError,
- errors.TransportNotPossible):
+ errors.TransportNotPossible, errors.NoSmartMedium):
# no smart server, so not a branch for this format type.
raise errors.NotBranchError(path=transport.base)
else:
- # Send a 'hello' request in protocol version one, and decline to
- # open it if the server doesn't support our required version (2) so
- # that the VFS-based transport will do it.
- request = client.get_request()
- smart_protocol = protocol.SmartClientRequestProtocolOne(request)
- server_version = smart_protocol.query_version()
+ # Decline to open it if the server doesn't support our required
+ # version (2) so that the VFS-based transport will do it.
+ try:
+ server_version = medium.protocol_version()
+ except errors.SmartProtocolError:
+ # Apparently there's no usable smart server there, even though
+ # the medium supports the smart protocol.
+ raise errors.NotBranchError(path=transport.base)
if server_version != 2:
raise errors.NotBranchError(path=transport.base)
return klass()
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-03-17 22:16:52 +0000
+++ b/bzrlib/errors.py 2008-03-26 22:00:30 +0000
@@ -2182,6 +2182,7 @@
_fmt = "No smart server available at %(url)s"
+ @symbol_versioning.deprecated_method(symbol_versioning.one_four)
def __init__(self, url):
self.url = url
=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py 2008-02-06 03:52:25 +0000
+++ b/bzrlib/smart/medium.py 2008-03-26 09:50:48 +0000
@@ -35,6 +35,7 @@
)
from bzrlib.smart.protocol import (
REQUEST_VERSION_TWO,
+ SmartClientRequestProtocolOne,
SmartServerRequestProtocolOne,
SmartServerRequestProtocolTwo,
)
@@ -368,6 +369,29 @@
class SmartClientMedium(object):
"""Smart client is a medium for sending smart protocol requests over."""
+ def __init__(self):
+ super(SmartClientMedium, self).__init__()
+ self._protocol_version_error = None
+ self._protocol_version = None
+
+ def protocol_version(self):
+ """Find out the best protocol version to use."""
+ if self._protocol_version_error is not None:
+ raise self._protocol_version_error
+ if self._protocol_version is None:
+ try:
+ medium_request = self.get_request()
+ # Send a 'hello' request in protocol version one, for maximum
+ # backwards compatibility.
+ client_protocol = SmartClientRequestProtocolOne(medium_request)
+ self._protocol_version = client_protocol.query_version()
+ except errors.SmartProtocolError, e:
+ # Cache the error, just like we would cache a successful
+ # result.
+ self._protocol_version_error = e
+ raise
+ return self._protocol_version
+
def disconnect(self):
"""If this medium maintains a persistent connection, close it.
@@ -385,6 +409,7 @@
"""
def __init__(self):
+ SmartClientMedium.__init__(self)
self._current_request = None
# Be optimistic: we assume the remote end can accept new remote
# requests until we get an error saying otherwise. (1.2 adds some
=== modified file 'bzrlib/tests/test_fetch.py'
--- a/bzrlib/tests/test_fetch.py 2007-12-11 14:26:18 +0000
+++ b/bzrlib/tests/test_fetch.py 2008-03-26 21:44:02 +0000
@@ -296,8 +296,14 @@
http_logs))
# FIXME naughty poking in there.
self.get_readonly_server().logs = []
- # check there is nothing more to fetch
- source = Branch.open(self.get_readonly_url("source/"))
+ # check there is nothing more to fetch. We take care to re-use the
+ # existing transport so that the request logs we're about to examine
+ # aren't cluttered with redundant probes for a smart server.
+ # XXX: Perhaps this further parameterisation: test http with smart
+ # server, and test http without smart server?
+ source = Branch.open(
+ self.get_readonly_url("source/"),
+ possible_transports=[source.bzrdir.root_transport])
self.assertEqual(target.fetch(source), (0, []))
# should make just two requests
http_logs = self.get_readonly_server().logs
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2008-02-12 05:17:25 +0000
+++ b/bzrlib/tests/test_remote.py 2008-03-26 22:00:30 +0000
@@ -55,7 +55,6 @@
self.transport_server = server.SmartTCPServer_for_testing
super(BasicRemoteObjectTests, self).setUp()
self.transport = self.get_transport()
- self.client = self.transport.get_smart_client()
# make a branch that can be opened over the smart transport
self.local_wt = BzrDir.create_standalone_workingtree('.')
@@ -301,6 +300,9 @@
input_file, output_file)
return medium.SmartClientStreamMediumRequest(client_medium)
+ def protocol_version(self):
+ return 1
+
class OldServerTransport(object):
"""A fake transport for test_old_server that reports it's smart server
=== modified file 'bzrlib/tests/test_transport_implementations.py'
--- a/bzrlib/tests/test_transport_implementations.py 2008-02-25 07:28:29 +0000
+++ b/bzrlib/tests/test_transport_implementations.py 2008-03-26 22:00:30 +0000
@@ -38,7 +38,6 @@
FileExists,
InvalidURL,
LockError,
- NoSmartServer,
NoSuchFile,
NotLocalUrl,
PathError,
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2008-03-06 14:12:45 +0000
+++ b/bzrlib/transport/__init__.py 2008-03-26 22:03:05 +0000
@@ -33,14 +33,10 @@
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import errno
-from collections import deque
from stat import S_ISDIR
-import unittest
import urllib
import urlparse
-import warnings
-import bzrlib
from bzrlib import (
errors,
osutils,
@@ -50,18 +46,14 @@
""")
from bzrlib.symbol_versioning import (
- deprecated_passed,
deprecated_method,
deprecated_function,
DEPRECATED_PARAMETER,
- zero_eight,
- zero_eleven,
+ one_four,
zero_ninety,
)
from bzrlib.trace import (
- note,
mutter,
- warning,
)
from bzrlib import registry
@@ -613,6 +605,7 @@
"""
return self.get(relpath).read()
+ @deprecated_method(one_four)
def get_smart_client(self):
"""Return a smart client for this transport if possible.
=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py 2008-01-02 14:13:55 +0000
+++ b/bzrlib/transport/http/__init__.py 2008-03-26 09:50:48 +0000
@@ -514,8 +514,14 @@
return ','.join(strings)
def send_http_smart_request(self, bytes):
- code, body_filelike = self._post(bytes)
- assert code == 200, 'unexpected HTTP response code %r' % (code,)
+ try:
+ code, body_filelike = self._post(bytes)
+ if code != 200:
+ raise InvalidHttpResponse(
+ self._remote_path('.bzr/smart'),
+ 'Expected 200 response code, got %r' % (code,))
+ except errors.InvalidHttpResponse, e:
+ raise errors.SmartProtocolError(str(e))
return body_filelike
More information about the bazaar-commits
mailing list