Rev 3180: (andrew) Calculate remote path relative to the shared medium in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jan 15 00:34:16 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3180
revision-id:pqm at pqm.ubuntu.com-20080115003405-jfuumkpctmvl2e4r
parent: pqm at pqm.ubuntu.com-20080114043207-f16sqhrqcrd3fsj0
parent: andrew.bennetts at canonical.com-20080114224924-cnl9akjk0lrlrrp8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-01-15 00:34:05 +0000
message:
(andrew) Calculate remote path relative to the shared medium in
_SmartClient.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3104.4.7
revision-id:andrew.bennetts at canonical.com-20080114224924-cnl9akjk0lrlrrp8
parent: andrew.bennetts at canonical.com-20080114224515-izp51fxci3hhopap
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Tue 2008-01-15 09:49:24 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3104.4.6
revision-id:andrew.bennetts at canonical.com-20080114224515-izp51fxci3hhopap
parent: andrew.bennetts at canonical.com-20080104012144-8u5ldkoixmoqgyog
parent: pqm at pqm.ubuntu.com-20080114043207-f16sqhrqcrd3fsj0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Tue 2008-01-15 09:45:15 +1100
message:
Merge from bzr.dev.
added:
bzrlib/tests/repository_implementations/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
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/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3104.4.5
revision-id:andrew.bennetts at canonical.com-20080104012144-8u5ldkoixmoqgyog
parent: andrew.bennetts at canonical.com-20071214010545-8eowyez0zh32uu4s
parent: pqm at pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Fri 2008-01-04 12:21:44 +1100
message:
Merge from bzr.dev.
added:
bzrlib/help_topics/ help_topics-20071211013603-qz0sojhgxhiujm6a-1
bzrlib/help_topics/en/ bzrlibhelp-20071209214431-xzg3moksichjwyts-1
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-reference/readme.txt readme.txt-20071211133352-guencaey6fpesv4j-1
index.txt index.txt-20071121073725-0corxykv5irjal00-1
renamed:
bzrlib/help_topics.py => bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
doc/en/user-guide/authentication_conf.txt => bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/configuration.txt => bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt => bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-reference/hooks.txt => bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-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/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 3104.4.4
revision-id:andrew.bennetts at canonical.com-20071214010545-8eowyez0zh32uu4s
parent: andrew.bennetts at canonical.com-20071213062954-fdfycply8ev1jbq8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Fri 2007-12-14 12:05:45 +1100
message:
Rename parameter to _SmartClient.__init__ to be less confusing.
modified:
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
------------------------------------------------------------
revno: 3104.4.3
revision-id:andrew.bennetts at canonical.com-20071213062954-fdfycply8ev1jbq8
parent: andrew.bennetts at canonical.com-20071213062449-as036xyryeoz1rqv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Thu 2007-12-13 17:29:54 +1100
message:
Remove some debugging cruft.
modified:
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3104.4.2
revision-id:andrew.bennetts at canonical.com-20071213062449-as036xyryeoz1rqv
parent: andrew.bennetts at canonical.com-20071212015740-ggp1xnbdsd8z3dgs
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Thu 2007-12-13 17:24:49 +1100
message:
All tests passing.
modified:
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3104.4.1
revision-id:andrew.bennetts at canonical.com-20071212015740-ggp1xnbdsd8z3dgs
parent: pqm at pqm.ubuntu.com-20071211175118-s94sizduj201hrs5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-http-client
timestamp: Wed 2007-12-12 12:57:40 +1100
message:
Fix paths sent by bzr+http client to correctly adjust for shared medium.
modified:
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
=== modified file 'NEWS'
--- a/NEWS 2008-01-11 17:59:20 +0000
+++ b/NEWS 2008-01-14 22:49:24 +0000
@@ -81,6 +81,9 @@
* build_tree acceleration uses the correct path when a file has been moved.
(Aaron Bentley)
+ * Calculate remote path relative to the shared medium in _SmartClient. This
+ is related to the problem in bug #124089. (Andrew Bennetts)
+
* ``commit`` now succeeds when a checkout and its master branch share a
repository. (Aaron Bentley, #177592)
=== modified file 'bzrlib/smart/client.py'
--- a/bzrlib/smart/client.py 2007-08-30 14:56:51 +0000
+++ b/bzrlib/smart/client.py 2008-01-14 22:45:15 +0000
@@ -17,16 +17,20 @@
from urlparse import urlparse
from bzrlib.smart import protocol
-from bzrlib.urlutils import unescape
+from bzrlib import urlutils
class _SmartClient(object):
- def __init__(self, shared_medium):
- self._shared_medium = shared_medium
+ def __init__(self, shared_connection):
+ """Constructor.
+
+ :param shared_connection: a bzrlib.transport._SharedConnection
+ """
+ self._shared_connection = shared_connection
def get_smart_medium(self):
- return self._shared_medium.connection
+ return self._shared_connection.connection
def call(self, method, *args):
"""Call a method on the remote server."""
@@ -68,4 +72,9 @@
anything but path, so it is only safe to use it in requests sent over
the medium from the matching transport.
"""
- return unescape(urlparse(transport.base)[2]).encode('utf8')
+ if self._shared_connection.base.startswith('bzr+http://'):
+ medium_base = self._shared_connection.base
+ else:
+ medium_base = urlutils.join(self._shared_connection.base, '/')
+
+ return urlutils.relative_url(medium_base, transport.base).encode('utf8')
=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py 2007-11-10 15:10:05 +0000
+++ b/bzrlib/smart/protocol.py 2008-01-14 22:45:15 +0000
@@ -471,6 +471,8 @@
def call(self, *args):
if 'hpss' in debug.debug_flags:
mutter('hpss call: %s', repr(args)[1:-1])
+ if getattr(self._request._medium, 'base', None) is not None:
+ mutter(' (to %s)', self._request._medium.base)
self._request_start_time = time.time()
self._write_args(args)
self._request.finished_writing()
@@ -482,6 +484,8 @@
"""
if 'hpss' in debug.debug_flags:
mutter('hpss call w/body: %s (%r...)', repr(args)[1:-1], body[:20])
+ if getattr(self._request._medium, '_path', None) is not None:
+ mutter(' (to %s)', self._request._medium._path)
mutter(' %d bytes', len(body))
self._request_start_time = time.time()
self._write_args(args)
@@ -497,6 +501,8 @@
"""
if 'hpss' in debug.debug_flags:
mutter('hpss call w/readv: %s', repr(args)[1:-1])
+ if getattr(self._request._medium, '_path', None) is not None:
+ mutter(' (to %s)', self._request._medium._path)
self._request_start_time = time.time()
self._write_args(args)
readv_bytes = self._serialise_offsets(body)
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2008-01-11 05:46:54 +0000
+++ b/bzrlib/tests/test_remote.py 2008-01-14 22:45:15 +0000
@@ -130,16 +130,16 @@
class FakeClient(_SmartClient):
"""Lookalike for _SmartClient allowing testing."""
- def __init__(self, responses):
- # We don't call the super init because there is no medium.
+ def __init__(self, responses, fake_medium_base='fake base'):
"""Create a FakeClient.
- :param respones: A list of response-tuple, body-data pairs to be sent
+ :param responses: A list of response-tuple, body-data pairs to be sent
back to callers.
"""
self.responses = responses
self._calls = []
self.expecting_body = False
+ _SmartClient.__init__(self, FakeMedium(fake_medium_base))
def call(self, method, *args):
self._calls.append(('call', method, args))
@@ -152,34 +152,44 @@
return result[0], FakeProtocol(result[1], self)
+class FakeMedium(object):
+
+ def __init__(self, base):
+ self.base = base
+
+
class TestBzrDirOpenBranch(tests.TestCase):
def test_branch_present(self):
- client = FakeClient([(('ok', ''), ), (('ok', '', 'no', 'no'), )])
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
+ client = FakeClient([(('ok', ''), ), (('ok', '', 'no', 'no'), )],
+ transport.base)
bzrdir = RemoteBzrDir(transport, _client=client)
result = bzrdir.open_branch()
self.assertEqual(
- [('call', 'BzrDir.open_branch', ('///quack/',)),
- ('call', 'BzrDir.find_repository', ('///quack/',))],
+ [('call', 'BzrDir.open_branch', ('quack/',)),
+ ('call', 'BzrDir.find_repository', ('quack/',))],
client._calls)
self.assertIsInstance(result, RemoteBranch)
self.assertEqual(bzrdir, result.bzrdir)
def test_branch_missing(self):
- client = FakeClient([(('nobranch',), )])
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
+ client = FakeClient([(('nobranch',), )], transport.base)
bzrdir = RemoteBzrDir(transport, _client=client)
self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
self.assertEqual(
- [('call', 'BzrDir.open_branch', ('///quack/',))],
+ [('call', 'BzrDir.open_branch', ('quack/',))],
client._calls)
def check_open_repository(self, rich_root, subtrees):
+ transport = MemoryTransport()
+ transport.mkdir('quack')
+ transport = transport.clone('quack')
if rich_root:
rich_response = 'yes'
else:
@@ -188,14 +198,12 @@
subtree_response = 'yes'
else:
subtree_response = 'no'
- client = FakeClient([(('ok', '', rich_response, subtree_response), ),])
- transport = MemoryTransport()
- transport.mkdir('quack')
- transport = transport.clone('quack')
+ client = FakeClient([(('ok', '', rich_response, subtree_response), ),],
+ transport.base)
bzrdir = RemoteBzrDir(transport, _client=client)
result = bzrdir.open_repository()
self.assertEqual(
- [('call', 'BzrDir.find_repository', ('///quack/',))],
+ [('call', 'BzrDir.find_repository', ('quack/',))],
client._calls)
self.assertIsInstance(result, RemoteRepository)
self.assertEqual(bzrdir, result.bzrdir)
@@ -245,8 +253,8 @@
def test_empty_branch(self):
# in an empty branch we decode the response properly
- client = FakeClient([(('ok', '0', 'null:'), )])
transport = MemoryTransport()
+ client = FakeClient([(('ok', '0', 'null:'), )], transport.base)
transport.mkdir('quack')
transport = transport.clone('quack')
# we do not want bzrdir to make any remote calls
@@ -255,15 +263,15 @@
result = branch.last_revision_info()
self.assertEqual(
- [('call', 'Branch.last_revision_info', ('///quack/',))],
+ [('call', 'Branch.last_revision_info', ('quack/',))],
client._calls)
self.assertEqual((0, NULL_REVISION), result)
def test_non_empty_branch(self):
# in a non-empty branch we also decode the response properly
revid = u'\xc8'.encode('utf8')
- client = FakeClient([(('ok', '2', revid), )])
transport = MemoryTransport()
+ client = FakeClient([(('ok', '2', revid), )], transport.base)
transport.mkdir('kwaak')
transport = transport.clone('kwaak')
# we do not want bzrdir to make any remote calls
@@ -272,7 +280,7 @@
result = branch.last_revision_info()
self.assertEqual(
- [('call', 'Branch.last_revision_info', ('///kwaak/',))],
+ [('call', 'Branch.last_revision_info', ('kwaak/',))],
client._calls)
self.assertEqual((2, revid), result)
@@ -282,17 +290,18 @@
def test_set_empty(self):
# set_revision_history([]) is translated to calling
# Branch.set_last_revision(path, '') on the wire.
+ transport = MemoryTransport()
+ transport.mkdir('branch')
+ transport = transport.clone('branch')
+
client = FakeClient([
# lock_write
(('ok', 'branch token', 'repo token'), ),
# set_last_revision
(('ok',), ),
# unlock
- (('ok',), )])
- transport = MemoryTransport()
- transport.mkdir('branch')
- transport = transport.clone('branch')
-
+ (('ok',), )],
+ transport.base)
bzrdir = RemoteBzrDir(transport, _client=False)
branch = RemoteBranch(bzrdir, None, _client=client)
# This is a hack to work around the problem that RemoteBranch currently
@@ -303,7 +312,7 @@
result = branch.set_revision_history([])
self.assertEqual(
[('call', 'Branch.set_last_revision',
- ('///branch/', 'branch token', 'repo token', 'null:'))],
+ ('branch/', 'branch token', 'repo token', 'null:'))],
client._calls)
branch.unlock()
self.assertEqual(None, result)
@@ -311,17 +320,18 @@
def test_set_nonempty(self):
# set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
# Branch.set_last_revision(path, rev-idN) on the wire.
+ transport = MemoryTransport()
+ transport.mkdir('branch')
+ transport = transport.clone('branch')
+
client = FakeClient([
# lock_write
(('ok', 'branch token', 'repo token'), ),
# set_last_revision
(('ok',), ),
# unlock
- (('ok',), )])
- transport = MemoryTransport()
- transport.mkdir('branch')
- transport = transport.clone('branch')
-
+ (('ok',), )],
+ transport.base)
bzrdir = RemoteBzrDir(transport, _client=False)
branch = RemoteBranch(bzrdir, None, _client=client)
# This is a hack to work around the problem that RemoteBranch currently
@@ -334,7 +344,7 @@
result = branch.set_revision_history(['rev-id1', 'rev-id2'])
self.assertEqual(
[('call', 'Branch.set_last_revision',
- ('///branch/', 'branch token', 'repo token', 'rev-id2'))],
+ ('branch/', 'branch token', 'repo token', 'rev-id2'))],
client._calls)
branch.unlock()
self.assertEqual(None, result)
@@ -374,7 +384,7 @@
def test_get_branch_conf(self):
# in an empty branch we decode the response properly
- client = FakeClient([(('ok', ), 'config file body')])
+ client = FakeClient([(('ok', ), 'config file body')], self.get_url())
# we need to make a real branch because the remote_branch.control_files
# will trigger _ensure_real.
branch = self.make_branch('quack')
@@ -384,7 +394,7 @@
branch = RemoteBranch(bzrdir, None, _client=client)
result = branch.control_files.get('branch.conf')
self.assertEqual(
- [('call_expecting_body', 'Branch.get_config_file', ('///quack/',))],
+ [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
client._calls)
self.assertEqual('config file body', result.read())
@@ -392,8 +402,8 @@
class TestBranchLockWrite(tests.TestCase):
def test_lock_write_unlockable(self):
- client = FakeClient([(('UnlockableTransport', ), '')])
transport = MemoryTransport()
+ client = FakeClient([(('UnlockableTransport', ), '')], transport.base)
transport.mkdir('quack')
transport = transport.clone('quack')
# we do not want bzrdir to make any remote calls
@@ -401,7 +411,7 @@
branch = RemoteBranch(bzrdir, None, _client=client)
self.assertRaises(errors.UnlockableTransport, branch.lock_write)
self.assertEqual(
- [('call', 'Branch.lock_write', ('///quack/', '', ''))],
+ [('call', 'Branch.lock_write', ('quack/', '', ''))],
client._calls)
@@ -474,9 +484,9 @@
:param transport_path: Path below the root of the MemoryTransport
where the repository will be created.
"""
- client = FakeClient(responses)
transport = MemoryTransport()
transport.mkdir(transport_path)
+ client = FakeClient(responses, transport.base)
transport = transport.clone(transport_path)
# we do not want bzrdir to make any remote calls
bzrdir = RemoteBzrDir(transport, _client=False)
@@ -495,7 +505,7 @@
result = repo.gather_stats(None)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
- ('///quack/','','no'))],
+ ('quack/','','no'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18}, result)
@@ -513,7 +523,7 @@
result = repo.gather_stats(revid)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
- ('///quick/', revid, 'no'))],
+ ('quick/', revid, 'no'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18,
'firstrev': (123456.300, 3600),
@@ -535,7 +545,7 @@
result = repo.gather_stats(revid, True)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
- ('///buick/', revid, 'yes'))],
+ ('buick/', revid, 'yes'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18,
'committers': 128,
@@ -571,7 +581,7 @@
result = repo.get_revision_graph()
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
- ('///sinhala/', ''))],
+ ('sinhala/', ''))],
client._calls)
self.assertEqual({r1: (), r2: (r1, )}, result)
@@ -591,7 +601,7 @@
result = repo.get_revision_graph(r2)
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
- ('///sinhala/', r2))],
+ ('sinhala/', r2))],
client._calls)
self.assertEqual({r11: (), r12: (), r2: (r11, r12), }, result)
@@ -606,7 +616,7 @@
repo.get_revision_graph, revid)
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
- ('///sinhala/', revid))],
+ ('sinhala/', revid))],
client._calls)
@@ -620,7 +630,7 @@
responses, transport_path)
result = repo.is_shared()
self.assertEqual(
- [('call', 'Repository.is_shared', ('///quack/',))],
+ [('call', 'Repository.is_shared', ('quack/',))],
client._calls)
self.assertEqual(True, result)
@@ -632,7 +642,7 @@
responses, transport_path)
result = repo.is_shared()
self.assertEqual(
- [('call', 'Repository.is_shared', ('///qwack/',))],
+ [('call', 'Repository.is_shared', ('qwack/',))],
client._calls)
self.assertEqual(False, result)
@@ -646,7 +656,7 @@
responses, transport_path)
result = repo.lock_write()
self.assertEqual(
- [('call', 'Repository.lock_write', ('///quack/', ''))],
+ [('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
self.assertEqual('a token', result)
@@ -657,7 +667,7 @@
responses, transport_path)
self.assertRaises(errors.LockContention, repo.lock_write)
self.assertEqual(
- [('call', 'Repository.lock_write', ('///quack/', ''))],
+ [('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
def test_lock_write_unlockable(self):
@@ -667,7 +677,7 @@
responses, transport_path)
self.assertRaises(errors.UnlockableTransport, repo.lock_write)
self.assertEqual(
- [('call', 'Repository.lock_write', ('///quack/', ''))],
+ [('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
@@ -682,8 +692,8 @@
repo.lock_write()
repo.unlock()
self.assertEqual(
- [('call', 'Repository.lock_write', ('///quack/', '')),
- ('call', 'Repository.unlock', ('///quack/', 'a token'))],
+ [('call', 'Repository.lock_write', ('quack/', '')),
+ ('call', 'Repository.unlock', ('quack/', 'a token'))],
client._calls)
def test_unlock_wrong_token(self):
@@ -737,7 +747,7 @@
expected_responses = [(('ok',), self.tarball_content),
]
expected_calls = [('call_expecting_body', 'Repository.tarball',
- ('///repo/', 'bz2',),),
+ ('repo/', 'bz2',),),
]
remote_repo, client = self.setup_fake_client_and_repository(
expected_responses, transport_path)
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py 2008-01-11 05:08:20 +0000
+++ b/bzrlib/tests/test_smart_transport.py 2008-01-14 22:45:15 +0000
@@ -2358,20 +2358,6 @@
new_transport._http_transport)
self.assertEqual('child_dir/foo', new_transport._remote_path('foo'))
- def test_remote_path_after_clone_parent(self):
- # However, accessing a parent directory should go direct to the parent's
- # URL. We don't send relpaths like "../foo" in smart requests.
- base_transport = remote.RemoteHTTPTransport('bzr+http://host/path1/path2')
- new_transport = base_transport.clone('..')
- self.assertEqual('foo', new_transport._remote_path('foo'))
- new_transport = base_transport.clone('../')
- self.assertEqual('foo', new_transport._remote_path('foo'))
- new_transport = base_transport.clone('../abc')
- self.assertEqual('foo', new_transport._remote_path('foo'))
- # "abc/../.." should be equivalent to ".."
- new_transport = base_transport.clone('abc/../..')
- self.assertEqual('foo', new_transport._remote_path('foo'))
-
def test_remote_path_unnormal_base(self):
# If the transport's base isn't normalised, the _remote_path should
# still be calculated correctly.
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2007-12-29 18:23:50 +0000
+++ b/bzrlib/transport/__init__.py 2008-01-04 01:21:44 +0000
@@ -1262,7 +1262,7 @@
class _SharedConnection(object):
"""A connection shared between several transports."""
- def __init__(self, connection=None, credentials=None):
+ def __init__(self, connection=None, credentials=None, base=None):
"""Constructor.
:param connection: An opaque object specific to each transport.
@@ -1272,6 +1272,7 @@
"""
self.connection = connection
self.credentials = credentials
+ self.base = base
class ConnectedTransport(Transport):
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2007-12-29 22:34:44 +0000
+++ b/bzrlib/transport/remote.py 2008-01-04 01:21:44 +0000
@@ -102,7 +102,8 @@
trace.mutter('hpss: Built a new medium: %s',
medium.__class__.__name__)
self._shared_connection = transport._SharedConnection(medium,
- credentials)
+ credentials,
+ self.base)
if _client is None:
self._client = client._SmartClient(self.get_shared_medium())
@@ -502,7 +503,7 @@
"""After connecting, HTTP Transport only deals in relative URLs."""
# Adjust the relpath based on which URL this smart transport is
# connected to.
- http_base = urlutils.normalize_url(self._http_transport.base)
+ http_base = urlutils.normalize_url(self.get_smart_medium().base)
url = urlutils.join(self.base[len('bzr+'):], relpath)
url = urlutils.normalize_url(url)
return urlutils.relative_url(http_base, url)
@@ -519,26 +520,14 @@
smart requests may be different). This is so that the server doesn't
have to handle .bzr/smart requests at arbitrary places inside .bzr
directories, just at the initial URL the user uses.
-
- The exception is parent paths (i.e. relative_url of "..").
"""
if relative_url:
abs_url = self.abspath(relative_url)
else:
abs_url = self.base
- # We either use the exact same http_transport (for child locations), or
- # a clone of the underlying http_transport (for parent locations). This
- # means we share the connection.
- norm_base = urlutils.normalize_url(self.base)
- norm_abs_url = urlutils.normalize_url(abs_url)
- normalized_rel_url = urlutils.relative_url(norm_base, norm_abs_url)
- if normalized_rel_url == ".." or normalized_rel_url.startswith("../"):
- http_transport = self._http_transport.clone(normalized_rel_url)
- else:
- http_transport = self._http_transport
return RemoteHTTPTransport(abs_url,
_from_transport=self,
- http_transport=http_transport)
+ http_transport=self._http_transport)
def get_test_permutations():
More information about the bazaar-commits
mailing list