Rev 3179: Merge iter_inventories. in http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled
Robert Collins
robertc at robertcollins.net
Mon Jan 7 03:00:17 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled
------------------------------------------------------------
revno: 3179
revision-id:robertc at robertcollins.net-20080107025955-6xb183leqq2eais7
parent: robertc at robertcollins.net-20080106233119-rci5iui4sqkp3288
parent: robertc at robertcollins.net-20080107012738-p74oqa65zc0z2xrr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inventory.journalled
timestamp: Mon 2008-01-07 13:59:55 +1100
message:
Merge iter_inventories.
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
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/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3152.2.18
revision-id:robertc at robertcollins.net-20080107012738-p74oqa65zc0z2xrr
parent: pqm at pqm.ubuntu.com-20080105015401-67wgbytv81394cl1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: iter_inventories
timestamp: Mon 2008-01-07 12:27:38 +1100
message:
New method ``iter_inventories`` on Repository for access to many
inventories. This is primarily used by the ``revision_trees`` method, as
direct access to inventories is discouraged. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3152.2.17
revision-id:pqm at pqm.ubuntu.com-20080105015401-67wgbytv81394cl1
parent: pqm at pqm.ubuntu.com-20080105005447-knh8rur0s7k5xfcl
parent: mbp at sourcefrog.net-20080104005818-1928g4frcjkxkhw3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-01-05 01:54:01 +0000
message:
RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3152.2.11.1.3
revision-id:mbp at sourcefrog.net-20080104005818-1928g4frcjkxkhw3
parent: mbp at sourcefrog.net-20080104005635-hbb6fitg6il7c6bs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2008-01-04 11:58:18 +1100
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3152.2.11.1.2
revision-id:mbp at sourcefrog.net-20080104005635-hbb6fitg6il7c6bs
parent: mbp at sourcefrog.net-20080104004206-vsi8oyind9rkfd96
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2008-01-04 11:56:35 +1100
message:
RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3152.2.11.1.1
revision-id:mbp at sourcefrog.net-20080104004206-vsi8oyind9rkfd96
parent: pqm at pqm.ubuntu.com-20080103220910-yajpwrwzbuyafqcg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2008-01-04 11:42:06 +1100
message:
README ReST syntax fix
modified:
README README-20050309040720-8f368abf9f346b9d
------------------------------------------------------------
revno: 3152.2.16
revision-id:pqm at pqm.ubuntu.com-20080105005447-knh8rur0s7k5xfcl
parent: pqm at pqm.ubuntu.com-20080104045747-v647p21t9f2iicow
parent: mbp at sourcefrog.net-20080104080642-0som1my1v6qnf3ti
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-01-05 00:54:47 +0000
message:
Move ReleaseChecklist into the developer guide
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3092.4.4
revision-id:mbp at sourcefrog.net-20080104080642-0som1my1v6qnf3ti
parent: mbp at sourcefrog.net-20080104073834-fr423eq30m2f3onv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2008-01-04 19:06:42 +1100
message:
Move ReleaseChecklist into the developer guide
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3092.4.3
revision-id:mbp at sourcefrog.net-20080104073834-fr423eq30m2f3onv
parent: mbp at sourcefrog.net-20071207065637-yb7s7nzmm984fo5t
parent: pqm at pqm.ubuntu.com-20080104045747-v647p21t9f2iicow
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2008-01-04 18:38:34 +1100
message:
Merge trunk
removed:
doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
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
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-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
README README-20050309040720-8f368abf9f346b9d
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/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/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/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
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_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
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_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
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_errors.py test_errors.py-20060210110251-41aba2deddf936a8
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_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
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_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-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
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: 3092.4.2
revision-id:mbp at sourcefrog.net-20071207065637-yb7s7nzmm984fo5t
parent: mbp at sourcefrog.net-20071207065413-l9lnnl6q0tnx8qga
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2007-12-07 17:56:37 +1100
message:
Remove dead comment
modified:
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3152.2.15
revision-id:pqm at pqm.ubuntu.com-20080104045747-v647p21t9f2iicow
parent: pqm at pqm.ubuntu.com-20080104035252-47tqschd3kbq66vc
parent: aaron.bentley at utoronto.ca-20071230182015-wnqwi7okgkuu6asy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-01-04 04:57:47 +0000
message:
InterDifferingSerializer shows a progress bar (abentley)
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3146.6.1
revision-id:aaron.bentley at utoronto.ca-20071230182015-wnqwi7okgkuu6asy
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: pb-inter-differing
timestamp: Sun 2007-12-30 13:20:15 -0500
message:
InterDifferingSerializer shows a progress bar
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3152.2.14
revision-id:pqm at pqm.ubuntu.com-20080104035252-47tqschd3kbq66vc
parent: pqm at pqm.ubuntu.com-20080104024907-k4ld11wri0m0tvxq
parent: ian.clatworthy at internode.on.net-20080104015635-ripc56yorn0f4v4a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-01-04 03:52:52 +0000
message:
diff current tree, not directory, by default (Ian Clatworthy, #178591)
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
------------------------------------------------------------
revno: 3152.2.12.1.1
revision-id:ian.clatworthy at internode.on.net-20080104015635-ripc56yorn0f4v4a
parent: pqm at pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
parent: ian.clatworthy at internode.on.net-20080104002605-wusiuhvzkpt8ovcd
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2008-01-04 11:56:35 +1000
message:
diff current tree, not directory, by default (Ian Clatworthy, #178591)
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
------------------------------------------------------------
revno: 3152.2.12.2.1
revision-id:ian.clatworthy at internode.on.net-20080104002605-wusiuhvzkpt8ovcd
parent: pqm at pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.diff-fulltree
timestamp: Fri 2008-01-04 10:26:05 +1000
message:
diff without arguments means the current tree, not the current directory
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
------------------------------------------------------------
revno: 3152.2.13
revision-id:pqm at pqm.ubuntu.com-20080104024907-k4ld11wri0m0tvxq
parent: pqm at pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
parent: john at arbash-meinel.com-20080104014832-1xwbcbueft0cyqtc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-01-04 02:49:07 +0000
message:
(Balint Aradi) Add contrib/bzr_access to allow some access control
via a single user based on ssh-keys.
added:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3112.1.5
revision-id:john at arbash-meinel.com-20080104014832-1xwbcbueft0cyqtc
parent: aradi at bccms.uni-bremen.de-20071214233159-ott7hpnq3jwblr3o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Thu 2008-01-03 19:48:32 -0600
message:
a small bit of cleanup.
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3112.1.4
revision-id:aradi at bccms.uni-bremen.de-20071214233159-ott7hpnq3jwblr3o
parent: aradi at bccms.uni-bremen.de-20071214231005-2b2guucng6z5vidx
committer: Balint Aradi <aradi at bccms.uni-bremen.de>
branch nick: bzr_access
timestamp: Sat 2007-12-15 00:31:59 +0100
message:
Changing example to show comma separated user names.
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3112.1.3
revision-id:aradi at bccms.uni-bremen.de-20071214231005-2b2guucng6z5vidx
parent: aradi at bccms.uni-bremen.de-20071214223842-ktu2id82afv0sqk2
committer: Balint Aradi <aradi at bccms.uni-bremen.de>
branch nick: bzr_access
timestamp: Sat 2007-12-15 00:10:05 +0100
message:
Tiny changes for more readable code and better compliance with bzr style.
modified:
contrib/bzr_access* bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3112.1.2
revision-id:aradi at bccms.uni-bremen.de-20071214223842-ktu2id82afv0sqk2
parent: aradi at bccms.uni-bremen.de-20071214221155-1d4cn0qh6xtoca3z
parent: john at arbash-meinel.com-20071211144709-t4q1mofuropktm7p
committer: Balint Aradi <aradi at bccms.uni-bremen.de>
branch nick: bzr_access
timestamp: Fri 2007-12-14 23:38:42 +0100
message:
Applying John Arbash Meinel's changes.
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.7
revision-id:john at arbash-meinel.com-20071211144709-t4q1mofuropktm7p
parent: john at arbash-meinel.com-20071211143929-qvyl5apn5d8hs139
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Tue 2007-12-11 08:47:09 -0600
message:
Add a comment about using configobj instead of ConfigParser
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.6
revision-id:john at arbash-meinel.com-20071211143929-qvyl5apn5d8hs139
parent: john at arbash-meinel.com-20071210165508-u2osnibvzvkb3zxp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Tue 2007-12-11 08:39:29 -0600
message:
Add GPL license to bzr_access script
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3112.1.1
revision-id:aradi at bccms.uni-bremen.de-20071214221155-1d4cn0qh6xtoca3z
parent: pqm at pqm.ubuntu.com-20071214143021-aus9m0gqj1u9gr7n
parent: john at arbash-meinel.com-20071210165508-u2osnibvzvkb3zxp
committer: Balint Aradi <aradi at bccms.uni-bremen.de>
branch nick: bzr_access
timestamp: Fri 2007-12-14 23:11:55 +0100
message:
Applying John Arbash Meinel's changes
added:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.5
revision-id:john at arbash-meinel.com-20071210165508-u2osnibvzvkb3zxp
parent: john at arbash-meinel.com-20071210165036-0b7x8wdc9rjyfxhp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Mon 2007-12-10 10:55:08 -0600
message:
A bit more documentation cleanup
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.4
revision-id:john at arbash-meinel.com-20071210165036-0b7x8wdc9rjyfxhp
parent: john at arbash-meinel.com-20071210164600-xcvl9fto3gn5aqtj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Mon 2007-12-10 10:50:36 -0600
message:
Change initial comment into the docstring, and update snippets to be proper ReST
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.3
revision-id:john at arbash-meinel.com-20071210164600-xcvl9fto3gn5aqtj
parent: john at arbash-meinel.com-20071210164221-3hulymrjzcd9hso5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Mon 2007-12-10 10:46:00 -0600
message:
Change the indentation to 4 spaces according to Bazaar style guidelines.
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.2
revision-id:john at arbash-meinel.com-20071210164221-3hulymrjzcd9hso5
parent: john at arbash-meinel.com-20071210163156-lr415galj8b1670t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Mon 2007-12-10 10:42:21 -0600
message:
Some simple spelling fixes, and switch to using subprocess since that is space-in-filename safe
modified:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3099.4.1
revision-id:john at arbash-meinel.com-20071210163156-lr415galj8b1670t
parent: pqm at pqm.ubuntu.com-20071210120611-a3j02d26cbzvlyju
author: Bálint Aradi <aradi at bccms.uni-bremen.de>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: contrib_bzr_access
timestamp: Mon 2007-12-10 10:31:56 -0600
message:
Add a bzr_access script for allowing custom access control over bzr+ssh
added:
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
------------------------------------------------------------
revno: 3152.2.12
revision-id:pqm at pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
parent: pqm at pqm.ubuntu.com-20080103220910-yajpwrwzbuyafqcg
parent: abentley at panoramicfeedback.com-20080103221635-i0f4co2btuyjnqbf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 23:18:14 +0000
message:
Make merge --uncommitted work with merge-type weave/lca (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3146.5.4
revision-id:abentley at panoramicfeedback.com-20080103221635-i0f4co2btuyjnqbf
parent: aaron.bentley at utoronto.ca-20071230203245-hq8euyd3bu9qshck
parent: pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: test-merge-uncommitted
timestamp: Thu 2008-01-03 17:16:35 -0500
message:
Merge bzr.dev
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-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
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
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_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
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_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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
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/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3146.5.3
revision-id:aaron.bentley at utoronto.ca-20071230203245-hq8euyd3bu9qshck
parent: aaron.bentley at utoronto.ca-20071230200959-21ms4szwf591q3cv
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: test-merge-uncommitted
timestamp: Sun 2007-12-30 15:32:45 -0500
message:
Avoid retrieving revision graph twice
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 3146.5.2
revision-id:aaron.bentley at utoronto.ca-20071230200959-21ms4szwf591q3cv
parent: aaron.bentley at utoronto.ca-20071230200825-fghiumyk7wux7olv
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: test-merge-uncommitted
timestamp: Sun 2007-12-30 15:09:59 -0500
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3146.5.1
revision-id:aaron.bentley at utoronto.ca-20071230200825-fghiumyk7wux7olv
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: test-merge-uncommitted
timestamp: Sun 2007-12-30 15:08:25 -0500
message:
Make merge --uncommitted work with merge-type weave
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3152.2.11
revision-id:pqm at pqm.ubuntu.com-20080103220910-yajpwrwzbuyafqcg
parent: pqm at pqm.ubuntu.com-20080103191230-baidarqql3lct685
parent: robertc at robertcollins.net-20080103210206-eqvta89m37jgjjfi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 22:09:10 +0000
message:
(robertc) Clean up inventory test module and add basic inventory
documentation. (Robert Collins)
added:
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
modified:
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3154.1.1
revision-id:robertc at robertcollins.net-20080103210206-eqvta89m37jgjjfi
parent: robertc at robertcollins.net-20080103014016-7o8mxov3jxx0tuwo
parent: pqm at pqm.ubuntu.com-20080103191230-baidarqql3lct685
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2008-01-04 08:02:06 +1100
message:
Resolve conflicts with bzr.dev.
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
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/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3152.2.10
revision-id:pqm at pqm.ubuntu.com-20080103191230-baidarqql3lct685
parent: pqm at pqm.ubuntu.com-20080103180901-w987y1ftqoh02qbm
parent: abentley at panoramicfeedback.com-20080103163108-iop8r47447ybdteo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 19:12:30 +0000
message:
Misc cleanups for win32, especially tests (abentley)
modified:
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3146.4.12
revision-id:abentley at panoramicfeedback.com-20080103163108-iop8r47447ybdteo
parent: aaron.bentley at utoronto.ca-20071229224251-lasicaddozmcf3as
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: win32fixes
timestamp: Thu 2008-01-03 11:31:08 -0500
message:
Add needed write lock to test
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3146.4.11
revision-id:aaron.bentley at utoronto.ca-20071229224251-lasicaddozmcf3as
parent: aaron.bentley at utoronto.ca-20071229223444-26tzfkl9vz5pnt79
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 17:42:51 -0500
message:
Fix lock errors in bundle tests
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3146.4.10
revision-id:aaron.bentley at utoronto.ca-20071229223444-26tzfkl9vz5pnt79
parent: aaron.bentley at utoronto.ca-20071229220547-fi8mxlg9fv9ivq68
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 17:34:44 -0500
message:
Add handling of PermissionDenied errors to smart protocol VFS layer
modified:
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3146.4.9
revision-id:aaron.bentley at utoronto.ca-20071229220547-fi8mxlg9fv9ivq68
parent: aaron.bentley at utoronto.ca-20071229215903-hmlfjwdqg5mb93bn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 17:05:47 -0500
message:
do case-insensitive comparision of iexplore filename
modified:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
------------------------------------------------------------
revno: 3146.4.8
revision-id:aaron.bentley at utoronto.ca-20071229215903-hmlfjwdqg5mb93bn
parent: aaron.bentley at utoronto.ca-20071229215120-a47jvvzj5zphj3x9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:59:03 -0500
message:
Add missing symlink requirement
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3146.4.7
revision-id:aaron.bentley at utoronto.ca-20071229215120-a47jvvzj5zphj3x9
parent: aaron.bentley at utoronto.ca-20071229214344-f24le3b1p943rywx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:51:20 -0500
message:
Remove UNIX path assumption
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3146.4.6
revision-id:aaron.bentley at utoronto.ca-20071229214344-f24le3b1p943rywx
parent: aaron.bentley at utoronto.ca-20071229212832-3cxifqmbz2yfy50g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:43:44 -0500
message:
Fix locking issues in revert tests
modified:
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
------------------------------------------------------------
revno: 3146.4.5
revision-id:aaron.bentley at utoronto.ca-20071229212832-3cxifqmbz2yfy50g
parent: aaron.bentley at utoronto.ca-20071229212526-d8xatqs93g0m6l6q
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:28:32 -0500
message:
Require a read lock in POSIX is_exectuable implementations, matching win32
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3146.4.4
revision-id:aaron.bentley at utoronto.ca-20071229212526-d8xatqs93g0m6l6q
parent: aaron.bentley at utoronto.ca-20071229210815-12tkxjm6njj3xn8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:25:26 -0500
message:
Add write lock, so merge_inner works properly
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3146.4.3
revision-id:aaron.bentley at utoronto.ca-20071229210815-12tkxjm6njj3xn8b
parent: aaron.bentley at utoronto.ca-20071229210402-nj1p3ho3xko9u56q
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:08:15 -0500
message:
Add missing Symlink requirement
modified:
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3146.4.2
revision-id:aaron.bentley at utoronto.ca-20071229210402-nj1p3ho3xko9u56q
parent: aaron.bentley at utoronto.ca-20071229182350-f7wd95zied8e8vt7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 16:04:02 -0500
message:
Avoid assuming unix newline on output
modified:
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3146.4.1
revision-id:aaron.bentley at utoronto.ca-20071229182350-f7wd95zied8e8vt7
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Sat 2007-12-29 13:23:50 -0500
message:
Python 2.5 on win32 can emit errno.EINVAL when listing a non-directory
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3152.2.9
revision-id:pqm at pqm.ubuntu.com-20080103180901-w987y1ftqoh02qbm
parent: pqm at pqm.ubuntu.com-20080103170805-t22jan69n4n5kkub
parent: v.ladeuil+lp at free.fr-20080103162917-soe75ph78vaojyk3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 18:09:01 +0000
message:
(vila) Fix #179368 by keeping the current range hint on
ShortReadvErrors
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3152.2.7.1.1
revision-id:v.ladeuil+lp at free.fr-20080103162917-soe75ph78vaojyk3
parent: pqm at pqm.ubuntu.com-20080103160106-v6qfwv4ta8sorx1q
parent: v.ladeuil+lp at free.fr-20080103162632-6a0mxvbq22hd1pvo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2008-01-03 17:29:17 +0100
message:
Fix #179368 by keeping the current range hint on ShortReadvErrors
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3146.3.4
revision-id:v.ladeuil+lp at free.fr-20080103162632-6a0mxvbq22hd1pvo
parent: v.ladeuil+lp at free.fr-20080103151258-idpzfox078f80vhe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 179368
timestamp: Thu 2008-01-03 17:26:32 +0100
message:
Review feedback, simpler loops.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3146.3.3
revision-id:v.ladeuil+lp at free.fr-20080103151258-idpzfox078f80vhe
parent: v.ladeuil+lp at free.fr-20080102141355-k20yfjo6i1dasuny
parent: pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 179368
timestamp: Thu 2008-01-03 16:12:58 +0100
message:
merge bzr.dev
added:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3146.3.2
revision-id:v.ladeuil+lp at free.fr-20080102141355-k20yfjo6i1dasuny
parent: v.ladeuil+lp at free.fr-20071230124033-gk9iv67553aq5kw2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 179368
timestamp: Wed 2008-01-02 15:13:55 +0100
message:
Fix #179368 by keeping the current range hint on ShortReadvErrors.
* response.py:
(RangeFile._checked_read): Avoid huge buffering when huge seeks
are required.
* _urllib2_wrappers.py:
(Response.finish): Check for end-of-file or we'll loop if the
server lied about Content-Length.
* __init__.py:
(HttpTransportBase._readv): When a ShortReadvError occurs, try
again, staying in multiple range mode and degrades only if the
error occurs again for the same offset.
* test_http_response.py:
(TestRangeFileMultipleRanges): Add a test to exercise the buffer
overflow protection code.
* test_http.py:
(TestMultipleRangeWithoutContentLengthServer): Emulate lighttpd
behavior regarding bug #179368.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3146.3.1
revision-id:v.ladeuil+lp at free.fr-20071230124033-gk9iv67553aq5kw2
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
parent: v.ladeuil+lp at free.fr-20071228165130-iv5p12lfc2fmbb7u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 179368
timestamp: Sun 2007-12-30 13:40:33 +0100
message:
merge fixes for #175524 first
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3152.2.8
revision-id:pqm at pqm.ubuntu.com-20080103170805-t22jan69n4n5kkub
parent: pqm at pqm.ubuntu.com-20080103160106-v6qfwv4ta8sorx1q
parent: aaron.bentley at utoronto.ca-20071225041750-t6chr3pmgnebvqcz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 17:08:05 +0000
message:
Handle conflicts in parent file kind gracefully (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3144.4.2
revision-id:aaron.bentley at utoronto.ca-20071225041750-t6chr3pmgnebvqcz
parent: aaron.bentley at utoronto.ca-20071224231849-iig4ougav7ybldzj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: resolve-parent-kind
timestamp: Mon 2007-12-24 23:17:50 -0500
message:
Handle non-directory parent conflicts (abentley, #177390)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3144.4.1
revision-id:aaron.bentley at utoronto.ca-20071224231849-iig4ougav7ybldzj
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: resolve-parent-kind
timestamp: Mon 2007-12-24 18:18:49 -0500
message:
Handle trying to list parents of a non-directory
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3152.2.7
revision-id:pqm at pqm.ubuntu.com-20080103160106-v6qfwv4ta8sorx1q
parent: pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
parent: abentley at panoramicfeedback.com-20071227153722-elvg2skfwd3vorbq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 16:01:06 +0000
message:
diff --using uses symlinks if possible,
marks temp files read-only (abentley)
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3123.4.1.1.8
revision-id:abentley at panoramicfeedback.com-20071227153722-elvg2skfwd3vorbq
parent: abentley at panoramicfeedback.com-20071227153207-h4wh0zkuwlhjhnl8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory2
timestamp: Thu 2007-12-27 10:37:22 -0500
message:
Us osutils.rmtree instead of shutil.rmtree, now that some files are readonly
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3123.4.1.1.7
revision-id:abentley at panoramicfeedback.com-20071227153207-h4wh0zkuwlhjhnl8
parent: abentley at panoramicfeedback.com-20071227152145-sg5pv77kbulraxve
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory2
timestamp: Thu 2007-12-27 10:32:07 -0500
message:
Mark temporary files read-only
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3123.4.1.1.6
revision-id:abentley at panoramicfeedback.com-20071227152145-sg5pv77kbulraxve
parent: abentley at panoramicfeedback.com-20071227151103-s6vuss3n63b6933a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory2
timestamp: Thu 2007-12-27 10:21:45 -0500
message:
Use relpath for get_file
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3123.4.1.1.5
revision-id:abentley at panoramicfeedback.com-20071227151103-s6vuss3n63b6933a
parent: abentley at panoramicfeedback.com-20071227144939-ubtewvnji522xtxk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory2
timestamp: Thu 2007-12-27 10:11:03 -0500
message:
Symlink to real files if possible
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3123.4.1.1.4
revision-id:abentley at panoramicfeedback.com-20071227144939-ubtewvnji522xtxk
parent: aaron.bentley at utoronto.ca-20071227022814-e1ance6116xmbmqk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory2
timestamp: Thu 2007-12-27 09:49:39 -0500
message:
Set mtime (and atime) on files for --using
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3152.2.6
revision-id:pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
parent: pqm at pqm.ubuntu.com-20080103093833-5bwfhwbkrke2b0cb
parent: v.ladeuil+lp at free.fr-20080103084938-7kvurk5uvde2ui54
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 10:38:22 +0000
message:
(vila) Fix bug #175524, http test servers are 1.1 compliant
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3152.2.4.2.1
revision-id:v.ladeuil+lp at free.fr-20080103084938-7kvurk5uvde2ui54
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: v.ladeuil+lp at free.fr-20080103084412-5bjr40bt0hbqorbk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2008-01-03 09:49:38 +0100
message:
Fix bug #175524, http test servers are 1.1 compliant
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.31
revision-id:v.ladeuil+lp at free.fr-20080103084412-5bjr40bt0hbqorbk
parent: v.ladeuil+lp at free.fr-20071228165130-iv5p12lfc2fmbb7u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2008-01-03 09:44:12 +0100
message:
Review feeback.
* bzrlib/tests/test_http.py:
(TestSpecificRequestHandler): Typo in doc string.
* bzrlib/tests/http_server.py:
(TestingHTTPServerMixin.tearDown): Mentioned by Aaron for win32.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.30
revision-id:v.ladeuil+lp at free.fr-20071228165130-iv5p12lfc2fmbb7u
parent: v.ladeuil+lp at free.fr-20071228153347-k84pqeepvol23tj5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-28 17:51:30 +0100
message:
Update NEWS. Some cosmetic changes.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3111.1.29
revision-id:v.ladeuil+lp at free.fr-20071228153347-k84pqeepvol23tj5
parent: v.ladeuil+lp at free.fr-20071228152844-r64au9m40wem2tuf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-28 16:33:47 +0100
message:
Cancel RecordingServer move, that was useless.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.28
revision-id:v.ladeuil+lp at free.fr-20071228152844-r64au9m40wem2tuf
parent: v.ladeuil+lp at free.fr-20071224154228-gmtwk6qixarl9hyb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-28 16:28:44 +0100
message:
Fix the multi-ranges http server and add tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response.finish): Fix the mutter message.
* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_complete_readv_leave_pipe_clean,
TestRangeRequestServer.test_incomplete_readv_leave_pipe_clean):
Add tests checking http pipe after readv.
(TestMultipleRangeWithoutContentLengthServer): Keep the buggy
get_multiple_ranges version as a test.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler.get_multiple_ranges): Calculate the
body length and add a Content-Length header.
(HttpServer.tearDown): Stop joining the server thread since it is
garbage collected.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3111.1.27
revision-id:v.ladeuil+lp at free.fr-20071224154228-gmtwk6qixarl9hyb
parent: v.ladeuil+lp at free.fr-20071224154008-3epy24f8ysx9k4dp
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 16:42:28 +0100
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3111.1.26
revision-id:v.ladeuil+lp at free.fr-20071224154008-3epy24f8ysx9k4dp
parent: v.ladeuil+lp at free.fr-20071224152910-mcym6zmmzt9x2es2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 16:40:08 +0100
message:
Re-add a test lost in refactoring.
* bzrlib/tests/test_http.py:
(TestAuth.test_changing_nonce): This one was lost during one
refactoring.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.25
revision-id:v.ladeuil+lp at free.fr-20071224152910-mcym6zmmzt9x2es2
parent: v.ladeuil+lp at free.fr-20071224132930-on2606aabyvv5mjj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 16:29:10 +0100
message:
Fix the smart server failing test and use it against protocol combinations.
* bzrlib/tests/test_smart_transport.py:
(HTTPTunnellingSmokeTest): Some tests transferred to
test_http (including the previously failing one).
* bzrlib/tests/test_http.py:
(SmartHTTPTunnellingTest): Transferred from test_smart_tranport
since most of the infrastucture for parametrized test is available
here and some combinations were not tested.
* bzrlib/tests/http_utils.py:
(HTTPServerWithSmarts.__init__): Add the protocol_version
parameter.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3111.1.24
revision-id:v.ladeuil+lp at free.fr-20071224132930-on2606aabyvv5mjj
parent: v.ladeuil+lp at free.fr-20071224103124-oojmi9jenve9irat
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 14:29:30 +0100
message:
Cleanups.
* bzrlib/tests/test_http.py:
(load_tests): Make it clearer that we are using test classes.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3111.1.23
revision-id:v.ladeuil+lp at free.fr-20071224103124-oojmi9jenve9irat
parent: v.ladeuil+lp at free.fr-20071223174827-sepgat9fxmpnax0f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-24 11:31:24 +0100
message:
Make HTTP/1.1 the default implementation reveals one more bug.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler): Make 1.1 the default protocol
version.
(TestingHTTPRequestHandler.send_head): Fix python2.5
implementation bug (specify Content-Length).
modified:
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
------------------------------------------------------------
revno: 3111.1.22
revision-id:v.ladeuil+lp at free.fr-20071223174827-sepgat9fxmpnax0f
parent: v.ladeuil+lp at free.fr-20071221221252-hqz3g08cxp2mlku0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Sun 2007-12-23 18:48:27 +0100
message:
Rework TestingHTTPServer classes, fix test bug.
* bzrlib/tests/test_http.py:
(TestRanges.create_transport_readonly_server): Take test
parameters into account !
* bzrlib/tests/http_server.py:
(TestingHTTPServerMixin): Replace the wrapper hack.
(TestingHTTPServerMixin.tearDown): The final explanation about
request handlers termination.
(HttpServer.tearDown): Stop messing around trying to find the
right method name, use tearDown and delegate to server classes.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.21
revision-id:v.ladeuil+lp at free.fr-20071221221252-hqz3g08cxp2mlku0
parent: v.ladeuil+lp at free.fr-20071221215806-c2kdsnqsi3tvqjr4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 23:12:52 +0100
message:
Add some comments.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.20
revision-id:v.ladeuil+lp at free.fr-20071221215806-c2kdsnqsi3tvqjr4
parent: v.ladeuil+lp at free.fr-20071221122033-42bc21re0zj4kqbg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 22:58:06 +0100
message:
Make all the test pass. Looks like we are HTTP/1.1 compliant.
* bzrlib/transport/http/_urllib2_wrappers.py:
Review the debug prints and layered them.
(AbstractAuthHandler.auth_required): Clean up the http pipe before
issuing the new request after a 401 or 407 auth required error.
* bzrlib/tests/test_http.py:
Fix the remaining imports.
(BadStatusRequestHandler.parse_request): Simplified. Close
connection.
(TestInvalidStatusServer.test_http_has,
TestInvalidStatusServer.test_http_get): Document pycurl
limitations.
* bzrlib/tests/http_utils.py:
(RedirectRequestHandler.parse_request, AuthRequestHandler.do_GET):
Add a Content-Length header.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler.get_multiple_ranges): Close the
connection since we didnt specify a Content-Length header.
* bzrlib/tests/http_utils.py:
(RedirectRequestHandler.parse_request): Add a Content-Length
header.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler.handle_one_request): Any socket error
close the connection.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3111.1.19
revision-id:v.ladeuil+lp at free.fr-20071221122033-42bc21re0zj4kqbg
parent: v.ladeuil+lp at free.fr-20071221114115-357b0nvt3uq5v55h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 13:20:33 +0100
message:
Merge back test_http_implementations.pc into test_http.py.
* bzrlib/tests/test_http.py:
Merge test_http_implementations.py now that we have rewritten
load_tests. That should reduce the noise in the final proposed
patch.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler.log_message): Ghaaa, don't over spell-check.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.18
revision-id:v.ladeuil+lp at free.fr-20071221114115-357b0nvt3uq5v55h
parent: v.ladeuil+lp at free.fr-20071221094604-tw5le3agd94l5p0h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 12:41:15 +0100
message:
Test parametrization for protocol versions achieved. Tests are failing :)
* bzrlib/tests/test_http_implementations.py:
(TransportAdapter, TransportProtocolAdapter,
TransportProtocolAuthenticationAdapter): Adpaters for the
combinations we care about.
(load_tests): List the classes that needs to be adpated and apply
the associated parametrization.
(TestPost.test_post_body_is_received): Don't use
transport.get_transport since we already know the transport class
we want to test.
(TestSpecificRequestHandler.create_transport_readonly_server,
LimitedRangeHTTPServer.__init__,
TestLimitedRangeRequestServer.create_transport_readonly_server,
TestProxyHttpServer.create_transport_secondary_server,
TestHTTPRedirections.create_transport_secondary_server,
TestHTTPSilentRedirections.create_transport_secondary_server,
TestAuth.create_transport_readonly_server,
TestAuth.create_transport_readonly_server): Add protocol_version
parameter to constructors.
* bzrlib/tests/http_utils.py:
(HTTPServerRedirecting, AuthServer, DigestAuthServer,
HTTPBasicAuthServer, HTTPDigestAuthServer, ProxyBasicAuthServer,
ProxyDigestAuthServer): Add protocol_version parameter to
constructors.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.17
revision-id:v.ladeuil+lp at free.fr-20071221094604-tw5le3agd94l5p0h
parent: v.ladeuil+lp at free.fr-20071221094407-hkt3d5nt1lfzt8im
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 10:46:04 +0100
message:
Add tests for the protocol version parameter.
* bzrlib/tests/test_http.py:
(TestHTTPServer): Add tests for the protocol version
parameter. Use addCleanup instead of try/finally.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.16
revision-id:v.ladeuil+lp at free.fr-20071221094407-hkt3d5nt1lfzt8im
parent: v.ladeuil+lp at free.fr-20071221094322-pgf4q5wla2mjs3gp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 10:44:07 +0100
message:
Fix more imports.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
------------------------------------------------------------
revno: 3111.1.15
revision-id:v.ladeuil+lp at free.fr-20071221094322-pgf4q5wla2mjs3gp
parent: v.ladeuil+lp at free.fr-20071220201638-dcvzegapib1wkdga
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 10:43:22 +0100
message:
Provide a way to specify the protocol version at the server layer.
* bzrlib/tests/http_server.py:
(TestingHTTPRequestHandler): Take the test case server protocol
version if provided to override the local protocol version.
(HttpServer): Add a optional protol_version parameter.
(HttpServer.__init__): If provided, our protocol version takes
precedence over the request handler one.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.14
revision-id:v.ladeuil+lp at free.fr-20071220201638-dcvzegapib1wkdga
parent: v.ladeuil+lp at free.fr-20071220195456-kcfeaesoblw6h0hm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 21:16:38 +0100
message:
Fix test leakage.
* bzrlib/tests/test_http.py:
(TestHttps_pycurl.test_pycurl_without_https_support): Restore
pycurl.version_info after the test.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.13
revision-id:v.ladeuil+lp at free.fr-20071220195456-kcfeaesoblw6h0hm
parent: v.ladeuil+lp at free.fr-20071220195147-2lcf8kynegha2kvr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 20:54:56 +0100
message:
Complete fix #177643 by reporting tests modifications (correctly).
modified:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.12
revision-id:v.ladeuil+lp at free.fr-20071220195147-2lcf8kynegha2kvr
parent: v.ladeuil+lp at free.fr-20071220163644-nh05tvd3jfsfz2y0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 20:51:47 +0100
message:
Complete fix #177643 by reporting tests modifications.
modified:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.11
revision-id:v.ladeuil+lp at free.fr-20071220163644-nh05tvd3jfsfz2y0
parent: v.ladeuil+lp at free.fr-20071220091804-8by0r5bwsw3qfg1q
parent: v.ladeuil+lp at free.fr-20071220142933-xf5h8kd1885f8nz6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 17:36:44 +0100
message:
merge fix for bug #177643
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
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/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3111.1.10
revision-id:v.ladeuil+lp at free.fr-20071220091804-8by0r5bwsw3qfg1q
parent: v.ladeuil+lp at free.fr-20071219112912-fd3wdp4z3tmknf0v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 10:18:04 +0100
message:
Finish http parameterization, 24 auth tests failing for pycurl (not
tested before).
* bzrlib/tests/test_http_implementations.py:
(AuthenticationTestProviderAdapter): Multiply tests against the
authentication schemes supported.
(TestRanges, TestHTTPSilentRedirections, TestDoCatchRedirections,
TestAuth, TestProxyAuth): Transferred from test_http.py.
* bzrlib/tests/test_http.py:
Delete the FIXME about testing against all http client
implementations, hurrah ! Fix some more imports. Transfer all
authentication, redirection, ranges tests to http_implementations.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.9
revision-id:v.ladeuil+lp at free.fr-20071219112912-fd3wdp4z3tmknf0v
parent: v.ladeuil+lp at free.fr-20071219093256-ibps16qrj0iji35v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Wed 2007-12-19 12:29:12 +0100
message:
Most refactoring regarding parameterization for urllib/pycurl and custom
request handlers done.
* bzrlib/tests/test_http_implementations.py:
Transfer more tests from test_http.py and dedicated request
handlers from http_utils.py.
* bzrlib/tests/test_http.py:
Transfer more tests to test_http_implementations.
* bzrlib/tests/http_utils.py:
Transfer to http_test_implementations.py all request hadlers that
exercise "bogus" behaviors since they are specific to some tests
and not expected to be reused.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.8
revision-id:v.ladeuil+lp at free.fr-20071219093256-ibps16qrj0iji35v
parent: v.ladeuil+lp at free.fr-20071219092921-3oxvnp5ptfhz8v42
parent: pqm at pqm.ubuntu.com-20071219091053-81xgp971m1pgmccf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Wed 2007-12-19 10:32:56 +0100
message:
Merge bzr.dev
added:
bzrlib/help_topics/ help_topics-20071211013603-qz0sojhgxhiujm6a-1
bzrlib/help_topics/en/ bzrlibhelp-20071209214431-xzg3moksichjwyts-1
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
doc/en/user-reference/readme.txt readme.txt-20071211133352-guencaey6fpesv4j-1
renamed:
bzrlib/help_topics.py => bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-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
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/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/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/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_diff.py test_diff.py-20060110203741-aa99ac93e633d971
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_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_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-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_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
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_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
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_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-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: 3111.1.7
revision-id:v.ladeuil+lp at free.fr-20071219092921-3oxvnp5ptfhz8v42
parent: v.ladeuil+lp at free.fr-20071219074629-nu5z8y56lp9o3m7f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Wed 2007-12-19 10:29:21 +0100
message:
Further refactoring.
* bzrlib/tests/test_http_implementations.py:
(TestHttpConnections, TestPost): Tranferred from test_http.py (use
case for moved lines).
* bzrlib/tests/http_utils.py
(RecordingServer): Transfered from test_http.py (use case for
moved lines as are the surrounding commits related to test_http.py
and test_http_implementations.py).
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
------------------------------------------------------------
revno: 3111.1.6
revision-id:v.ladeuil+lp at free.fr-20071219074629-nu5z8y56lp9o3m7f
parent: v.ladeuil+lp at free.fr-20071218213144-h276togzls9mi4g4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Wed 2007-12-19 08:46:29 +0100
message:
Begin refactoring test_http.py into parameterized tests.
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.5
revision-id:v.ladeuil+lp at free.fr-20071218213144-h276togzls9mi4g4
parent: v.ladeuil+lp at free.fr-20071218135304-rqiekrykivoq8qdm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Tue 2007-12-18 22:31:44 +0100
message:
Cherry-pick Robert's load_test() test feature as it is exactly what we
need.
modified:
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
------------------------------------------------------------
revno: 3111.1.4
revision-id:v.ladeuil+lp at free.fr-20071218135304-rqiekrykivoq8qdm
parent: v.ladeuil+lp at free.fr-20071217101617-zsszx3y00yj25dd2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Tue 2007-12-18 14:53:04 +0100
message:
Select the server depending on the request handler protocol. Add tests.
* bzrlib/tests/test_http.py:
Fix some more imports.
(TestHTTPServer): Smoke test for hhtp server.
* bzrlib/tests/http_server.py:
(HttpServer._get_httpd): Create the server for the protocol
handled by the request handler.
(HttpServer._http_start): Catch exceptions that could occur during
server construction or python will hang.
(HttpServer.setUp): Report exception if any.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3111.1.3
revision-id:v.ladeuil+lp at free.fr-20071217101617-zsszx3y00yj25dd2
parent: v.ladeuil+lp at free.fr-20071217085652-p4m867lxku62pmsn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-17 11:16:17 +0100
message:
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
* bzrlib/tests/http_server.py:
(TestingHTTPServerWrapper): Introduce a wrapper to allow different
subclasses for servers while keeping the common parts in a single
place.
(TestingHTTPServer): The 1.0 server.
(TestingThreadingHTTPServer): The 1.1 server.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.2
revision-id:v.ladeuil+lp at free.fr-20071217085652-p4m867lxku62pmsn
parent: v.ladeuil+lp at free.fr-20071214103445-ybf2vb56imwly2h7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Mon 2007-12-17 09:56:52 +0100
message:
Preparatory cleanup.
* bzrlib/tests/http_server.py:
Fix imports.
(TestingHTTPRequestHandler): Use HTTPMessage instead
mimetools.Message, we don't use it yet, but there is no good
reason to not be ready.
(HttpServer.get_bogus_url): Use _url_protocol, again no good
reason to not do it.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.1
revision-id:v.ladeuil+lp at free.fr-20071214103445-ybf2vb56imwly2h7
parent: pqm at pqm.ubuntu.com-20071214084717-xu119wq2x8l2w8lj
parent: v.ladeuil+lp at free.fr-20071211142618-pt6ca80047kok237
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-14 11:34:45 +0100
message:
Rename HTTPTestsUtils and HttpServer test modules
renamed:
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
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
------------------------------------------------------------
revno: 3102.1.1
revision-id:v.ladeuil+lp at free.fr-20071211142618-pt6ca80047kok237
parent: pqm at pqm.ubuntu.com-20071211072935-5kj4hhh82rgkqqwb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Tue 2007-12-11 15:26:18 +0100
message:
Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix
uses. Rename bzrlib/test/HttpServer.py to bzrlib/tests/http_server.py
and fix uses. Don't pretend we support HTTP/0.9 since we don't and do
that correctly.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractHTTPConnection): Specifying strict here is useless.
(HTTPConnection, HTTPSConnection): We don't support HTTP/0.9 in
other parts of the stack, be explicit *correctly*.
renamed:
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
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
------------------------------------------------------------
revno: 3152.2.5
revision-id:pqm at pqm.ubuntu.com-20080103093833-5bwfhwbkrke2b0cb
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: ian.clatworthy at internode.on.net-20080103083727-c10xa4jrvbl6jblb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 09:38:33 +0000
message:
Don't require a working tree in cmd_annotate. (Lukas Lalinsky, #90049)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3152.2.4.1.1
revision-id:ian.clatworthy at internode.on.net-20080103083727-c10xa4jrvbl6jblb
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: lalinsky at gmail.com-20071229185520-42dr3votzal51sl8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2008-01-03 18:37:27 +1000
message:
Don't require a working tree in cmd_annotate. (Lukas Lalinsky, #90049)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3146.2.1
revision-id:lalinsky at gmail.com-20071229185520-42dr3votzal51sl8
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: annotate-wt
timestamp: Sat 2007-12-29 19:55:20 +0100
message:
Don't require a working tree in cmd_annotate.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3152.2.4
revision-id:pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: pqm at pqm.ubuntu.com-20080103031640-m5fqotep9qaw2jtp
parent: aaron.bentley at utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 07:36:04 +0000
message:
Add new 'LCA merge' merge algorithm (abentley)
added:
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3144.3.7
revision-id:aaron.bentley at utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
parent: aaron.bentley at utoronto.ca-20080103063407-yicj1hy2v9s3w39j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: lcamerge
timestamp: Thu 2008-01-03 01:38:53 -0500
message:
Update from review
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3144.3.6
revision-id:aaron.bentley at utoronto.ca-20080103063407-yicj1hy2v9s3w39j
parent: abentley at panoramicfeedback.com-20071228215000-7i88ux30pcrwce0d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: lcamerge
timestamp: Thu 2008-01-03 01:34:07 -0500
message:
Add documentation of LCA merge
added:
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3144.3.5
revision-id:abentley at panoramicfeedback.com-20071228215000-7i88ux30pcrwce0d
parent: abentley at panoramicfeedback.com-20071228214916-9yttbqxmtkn4fxct
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:50:00 -0500
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3144.3.4
revision-id:abentley at panoramicfeedback.com-20071228214916-9yttbqxmtkn4fxct
parent: abentley at panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
parent: pqm at pqm.ubuntu.com-20071227150146-08nqv2gvo5e3i1n3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:49:16 -0500
message:
Merge from bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3144.3.3
revision-id:abentley at panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
parent: abentley at panoramicfeedback.com-20071228202604-kkolnauo09glnsbh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:45:18 -0500
message:
Update test for new conflicted types
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3144.3.2
revision-id:abentley at panoramicfeedback.com-20071228202604-kkolnauo09glnsbh
parent: abentley at panoramicfeedback.com-20071228201014-hd5g7gsz1ds1mmr4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 15:26:04 -0500
message:
Get conflict handling working
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3144.3.1
revision-id:abentley at panoramicfeedback.com-20071228201014-hd5g7gsz1ds1mmr4
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 15:10:14 -0500
message:
Implement LCA merge, with problematic conflict markers
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3152.2.3
revision-id:pqm at pqm.ubuntu.com-20080103031640-m5fqotep9qaw2jtp
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 03:16:40 +0000
message:
Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3152.2.2.1.1
revision-id:ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2008-01-03 12:20:06 +1000
message:
Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3152.2.2.2.1
revision-id:ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.bugs-doc
timestamp: Thu 2008-01-03 12:17:12 +1000
message:
Minor tweaks to bug tracker integration documentation
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3152.2.2
revision-id:pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: pqm at pqm.ubuntu.com-20080102195223-2kpjtcoeqvvcrcki
parent: abentley at panoramicfeedback.com-20071228165208-7lw04cwy51rxagsk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 20:46:44 +0000
message:
Handle missing tools gracefully in diff --using (abentley)
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3145.1.2
revision-id:abentley at panoramicfeedback.com-20071228165208-7lw04cwy51rxagsk
parent: abentley at panoramicfeedback.com-20071228163746-975r76opsppiwstk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory4
timestamp: Fri 2007-12-28 11:52:08 -0500
message:
Don't swallow other OSErrors
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3145.1.1
revision-id:abentley at panoramicfeedback.com-20071228163746-975r76opsppiwstk
parent: pqm at pqm.ubuntu.com-20071227150146-08nqv2gvo5e3i1n3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory4
timestamp: Fri 2007-12-28 11:37:46 -0500
message:
Handle missing tools gracefully in diff --using
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3152.2.1
revision-id:pqm at pqm.ubuntu.com-20080102195223-2kpjtcoeqvvcrcki
parent: pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
parent: bialix at ukr.net-20080102184754-wig6a9133t410ms7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 19:52:23 +0000
message:
(bialix) fix #90847: fix problem with parent location on another
logical drive
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3139.2.2
revision-id:bialix at ukr.net-20080102184754-wig6a9133t410ms7
parent: bialix at ukr.net-20071221172637-n6ndcccrp5du903x
parent: pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: fix.90847
timestamp: Wed 2008-01-02 20:47:54 +0200
message:
merge bzr.dev
added:
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3139.2.1
revision-id:bialix at ukr.net-20071221172637-n6ndcccrp5du903x
parent: pqm at pqm.ubuntu.com-20071221145325-erktp9le86ik56j1
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: fix.90847
timestamp: Fri 2007-12-21 19:26:37 +0200
message:
bugfix #90847: fix problem with parent location on another logical drive
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
Diff too large for email (5949 lines, the limit is 1000).
More information about the bazaar-commits
mailing list