Rev 1993: Merge bzr.dev. in file:///home/robertc/source/baz/revno/
Robert Collins
robertc at robertcollins.net
Mon Oct 16 10:14:52 BST 2006
------------------------------------------------------------
revno: 1993
revision-id: robertc at robertcollins.net-20061016091447-db8b4e07ba1dc204
parent: robertc at robertcollins.net-20060927051254-6b2d5066416d66c6
parent: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Mon 2006-10-16 19:14:47 +1000
message:
Merge bzr.dev.
added:
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_info.py bench_info.py-20060719045551-x5ixdrwbw57cg19z-1
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/tree_creator/many_commit.py many_commit.py-20060819021600-khvri55v4f6edzsl-1
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/inspect_for_copy.py inspect_for_copy.py-20060912223659-9ccpdogzwxqznpq1-1
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lazy_regex.py test_lazy_regex.py-20061009091222-fyettq6z5qomdl9e-2
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/workingtree_implementations/test_flush.py test_flush.py-20061005073432-585uyj0sua6r7i9v-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_put_file.py test_put_file.py-20060907214856-4omn6hf1u7fvrart-4
bzrlib/tests/workingtree_implementations/test_read_working_inventory.py test_read_working_in-20061005073432-585uyj0sua6r7i9v-2
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/version_info_formats/ version_formats-20060809195728-grgaanc8iql7psdy-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/version_info_formats/format_python.py format_python.py-20060809202444-ike7i9ub03gb432p-1
bzrlib/version_info_formats/format_rio.py format_rio.py-20060809202444-ike7i9ub03gb432p-2
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/branch.txt branch.txt-20060130010728-d96c35d50b205aed
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
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_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
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_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
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_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_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_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
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_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_version.py test_version.py-20060816024207-ves6ult9a11taj9t-2
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
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/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/elementtree/ElementTree.py ElementTree.py-20050323061623-cfa8eefe86f35391
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/newinventory.py newinventory.py-20050330222648-12642a6a7ae875e9
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py* setup.py-20050314065409-02f8a0a6e3f9bc70
tools/http_client.py http_client.py-20050819224207-b29be8324c55b359
------------------------------------------------------------
merged: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
parent: robertc at robertcollins.net-20061013073925-c5ffa47050a07d5e
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Mon 2006-10-16 11:13:59 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
parent: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-10-15 17:32:29 +0100
message:
New trees have unique root ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
parent: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:22:42 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:01:26 -0400
message:
add NEWS entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
parent: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:59:57 -0400
message:
Use all-lowercase in tree root ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
parent: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:55:32 -0400
message:
Fix up more memorytree tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
parent: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sat 2006-10-14 12:20:16 -0400
message:
Avoid committing with None root in test_straightline_ancestry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
parent: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 23:19:14 -0400
message:
Changes from review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 21:50:46 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: unique-root
timestamp: Mon 2006-10-02 09:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Fri 2006-09-29 20:25:31 -0400
message:
Ensure the null revision has no root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
parent: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:04:13 -0400
message:
fix version_info stuff to deliberately include root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
parent: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:03:29 -0400
message:
fix repeated root in WorkingTree.list_files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
parent: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:56:04 -0400
message:
Fix EmptyTree's default include_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
parent: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:50:18 -0400
message:
Fix bundle handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
parent: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 22:00:45 -0400
message:
Fix revision_tree tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
parent: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:57:43 -0400
message:
Fix testament text now that root are variable
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:53:23 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-09-26 22:28:44 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-22 00:52:17 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 16:12:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 15:04:48 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-03 16:41:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: pqm at pqm.ubuntu.com-20060816165353-bc26ccbe32f89d60
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 20:15:23 -0400
message:
merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: pqm at pqm.ubuntu.com-20060815031820-fde63c7ba995e484
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 19:17:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 12:02:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: abentley at panoramicfeedback.com-20060814154505-f7182110bfcce1bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 11:59:43 -0400
message:
Merge more checkout changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: abentley at panoramicfeedback.com-20060814134102-f8688153405a8ac7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 10:10:12 -0400
message:
Merge create_checkout_convenience update
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-08-08 00:48:19 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 20:19:03 -0400
message:
Reject further no-special-roots change
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 19:19:38 -0400
message:
Reject removing is_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060804235649-c209f0255dc6284c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 13:12:25 -0400
message:
Merge create_checkout_convenience branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 18:09:31 -0400
message:
Update from no-special-root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:26:23 -0400
message:
Revert removal of include_root from EmptyTree.list_files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:22:20 -0400
message:
Merge restoration of RootEntry and EmptyTree.kind
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 16:23:14 -0400
message:
Merge unicode test case fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
parent: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-08-05 20:20:32 -0400
message:
Revert no-special-root changes
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
parent: john at arbash-meinel.com-20061013074106-1c71354188ac0138
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:51:08 +0100
message:
(John Arbash Meinel) Change run_bzr_subprocess to default to supplying --no-plugins
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013074106-1c71354188ac0138
parent: john at arbash-meinel.com-20061013072223-9d1320456e7df776
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:41:06 -0500
message:
fixup one test
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013072223-9d1320456e7df776
parent: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:22:23 -0500
message:
[merge] bzr.dev 2076
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
parent: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:15:27 -0500
message:
Review comments from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Tue 2006-10-10 03:11:38 -0500
message:
Change run_bzr_subprocess to default to supplying --no-plugins.
Tests that need it can supply allow_plugins=True to override this
behavior.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
parent: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:17:06 +0100
message:
(Robert Collins, John Arbash Meinel) Allow tests that require a specific branch or repository format to obtain that through TestCaseWithMemoryTree.make_branch_and_memory_tree.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
parent: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
parent: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:08:38 +0100
message:
(Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
parent: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:53:26 +1000
message:
Add NEWS entry for bzr+http://
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
parent: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:41:04 +1000
message:
(Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
parent: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-11 17:16:15 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
parent: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-11 15:55:32 +1000
message:
Changes in response to review: re-use _base_curl, rather than keeping a seperate _post_curl object; add docstring to test_http.RecordingServer, set is_user_error on some new exceptions.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
parent: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-10-09 17:34:15 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
parent: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-10-09 17:13:40 +1000
message:
Changes prompted by j-a-meinel's review.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
parent: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-04 12:27:35 +1000
message:
Tweak psuedo-EBNF to be in sync with the code.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
parent: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-04 12:24:48 +1000
message:
Delete some obsolete code and comments.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
parent: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 16:28:58 +1000
message:
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
parent: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 15:04:36 +1000
message:
Remove commented cruft.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
parent: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 15:01:53 +1000
message:
Simplify do_POST, and add a comment.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
parent: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 14:35:19 +1000
message:
Tidy up _serve_one_request.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
parent: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 13:57:41 +1000
message:
Add TODOs about logging server exceptions.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
parent: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 13:52:23 +1000
message:
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
parent: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:17:37 +1000
message:
Remove old comments.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
parent: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:17:08 +1000
message:
Simplify SmartServerPipeStreamMedium._serve_one_request, and remove _recv_bulk, _recv_trailer and a _recv_tuple.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
parent: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:09:44 +1000
message:
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
parent: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 18:06:15 +1000
message:
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
parent: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 15:02:27 +1000
message:
Update SmartClientRequestProtocolOne.read_body_bytes to use next_read_size.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
parent: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 14:01:35 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
parent: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 13:45:48 +1000
message:
Remove commented cruft, add a TODO comment.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
parent: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-09-27 15:20:02 +1000
message:
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
parent: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 15:46:31 +1000
message:
(Andrew Bennetts, Robert Collins) Add test_http.RecordingServer, and use it to
test HttpTransport._post.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
parent: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 12:24:14 +1000
message:
Make HttpTransportBase.get_smart_client return self again.
Move HTTP smart client code into http.py from smart.py.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
parent: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 02:41:46 +1000
message:
Implement _post on HttpTransport_urllib.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
parent: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-09-25 19:56:00 +1000
message:
HTTP client starting to work (pycurl for the moment).
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
parent: robertc at robertcollins.net-20060922043958-628ce589a155a56e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-09-25 16:43:20 +1000
message:
Clean up some pyflakes warnings, including making 'backing_transport' a required argument of SmartTCPServer.__init__.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060922043958-628ce589a155a56e
parent: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
committer: Robert Collins <robertc at robertcollins.net>
branch nick: http-smart
timestamp: Fri 2006-09-22 14:39:58 +1000
message:
separate out the client medium from the client encoding protocol for the smart server.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
parent: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-21 19:15:20 +1000
message:
Starting factoring out the smart server client "medium" from the protocol.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
parent: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-19 21:18:46 +1000
message:
Implement HTTP smart server.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-19 13:47:01 +1000
message:
Empty BRANCH.TODO
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:36:44 +1000
message:
Robert's comments: Refer to RFC2616 to explain how we handle missing Content-Type
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: john at arbash-meinel.com-20061013013159-8224e911d84e438a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 07:41:21 +0100
message:
(John Arbash Meinel) Add a Registry class to help make registry functionality consistent
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013013159-8224e911d84e438a
parent: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 11:31:59 +1000
message:
[merge] bzr.dev 2073
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
parent: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 10:55:26 +1000
message:
cleanup doc strings as recommended by Aaron and Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
parent: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 10:25:45 +1000
message:
Updated HACKING and docstrings per Martin's suggestions
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
parent: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-10-11 11:21:22 +1000
message:
[merge] bzr.dev 2070
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
parent: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-10-11 11:20:09 +1000
message:
Cleanups suggested by Richard Wilbur
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
parent: john at arbash-meinel.com-20060921222519-429864b017a1629e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-09-27 17:40:45 -0500
message:
Use helper objects to handle lazy importing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921222519-429864b017a1629e
parent: john at arbash-meinel.com-20060909182125-b80276593538c308
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Thu 2006-09-21 17:25:19 -0500
message:
Remove extra dict-like members, simplfying the api
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909182125-b80276593538c308
parent: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 13:21:25 -0500
message:
A test which uses the callback to return information from the object.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
parent: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 13:19:01 -0500
message:
A help callable should take the registry as the first parameter
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
parent: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:44:43 -0500
message:
Add Registry.iterhelp and Registry.iterinfo
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
parent: john at arbash-meinel.com-20060909170355-487019ff329aea61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:30:34 -0500
message:
Add help and info parameters, and tests for them
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909170355-487019ff329aea61
parent: john at arbash-meinel.com-20060909165226-205b4911cc273230
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:03:55 -0500
message:
first_is_default was not a good design
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909165226-205b4911cc273230
parent: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 11:52:26 -0500
message:
Make a Registry look more like a dict, and allow anyone to register stuff lazily.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
parent: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 13:02:10 -0500
message:
move the NEWS entry to the correct location, update for final changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
parent: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
parent: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 12:59:34 -0500
message:
[merge] Adeodato Simó: change factory => registry
------------------------------------------------------------
merged: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
parent: dato at net.com.org.es-20060815180015-21aac59162d04066
parent: pqm at pqm.ubuntu.com-20060818181719-90004a4648d8537a
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Fri 2006-08-18 23:54:53 +0200
message:
[merge] bzr.dev 1947
------------------------------------------------------------
merged: dato at net.com.org.es-20060815180015-21aac59162d04066
parent: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 20:00:15 +0200
message:
Mention Registry and LazyImportRegistry in NEWS/INTERNALS.
------------------------------------------------------------
merged: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
parent: dato at net.com.org.es-20060815175135-c8390000cdf6561a
parent: pqm at pqm.ubuntu.com-20060815131500-a6ba92a17caa4aab
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 19:57:45 +0200
message:
[merge] bzr.dev 1924
------------------------------------------------------------
merged: dato at net.com.org.es-20060815175135-c8390000cdf6561a
parent: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 19:51:35 +0200
message:
Kill fallback_key parameter in Registry.get(), as discussed with John.
This frees up the base class from unneeded complexity, and a subclass
can implement that feature should it ever be needed (there are no known
use cases at the moment).
------------------------------------------------------------
merged: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
parent: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 04:04:35 +0200
message:
Improve description of :param key: in Registry.get().
------------------------------------------------------------
merged: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
parent: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 04:00:51 +0200
message:
Make :param key: in Registry.get() default to None, instead of _marker,
as suggested by John Arbash Meinel.
------------------------------------------------------------
merged: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
parent: dato at net.com.org.es-20060810214727-155eb44860689725
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 03:50:06 +0200
message:
Rename default_key in Registry.get() to fallback_key.
------------------------------------------------------------
merged: dato at net.com.org.es-20060810214727-155eb44860689725
parent: dato at net.com.org.es-20060810194614-4033e490fa06840e
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Thu 2006-08-10 23:47:27 +0200
message:
Morph John's LazyFactory into a generalized Registry class, and
implement LazyImportRegistry as a subclass.
------------------------------------------------------------
merged: dato at net.com.org.es-20060810194614-4033e490fa06840e
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_factory
timestamp: Thu 2006-08-10 21:46:14 +0200
message:
[merge] jam's lazy-factory
------------------------------------------------------------
merged: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 12:56:10 -0500
message:
[merge] bzr.dev 1981
------------------------------------------------------------
merged: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
parent: pqm at pqm.ubuntu.com-20060809170522-28c918e7d93365fe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy-factory
timestamp: Wed 2006-08-09 16:37:43 -0500
message:
Creating a factory that can load modules on demand.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061013073925-c5ffa47050a07d5e
parent: robertc at robertcollins.net-20061013071251-b49ee527c95bcacf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-13 17:39:25 +1000
message:
Merge reviews.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061013071251-b49ee527c95bcacf
parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-13 17:12:51 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-13 16:45:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 02:18:08 +0100
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
merged: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: james at jamesh.id.au-20061004071239-bb32b93e159b7899
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-10-11 20:07:42 -0500
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
merged: james at jamesh.id.au-20061004071239-bb32b93e159b7899
parent: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Wed 2006-10-04 15:12:39 +0800
message:
get rid of the recurse argument to get_user_option()
------------------------------------------------------------
merged: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
parent: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 21:36:02 +0800
message:
add back recurse=False option to config file
------------------------------------------------------------
merged: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
parent: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 19:10:54 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-09-18 10:59:05 +0800
message:
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
------------------------------------------------------------
merged: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
parent: james at jamesh.id.au-20060908031106-1b304673906dcf8f
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 12:30:02 +0800
message:
make test break again
------------------------------------------------------------
merged: james at jamesh.id.au-20060908031106-1b304673906dcf8f
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 11:11:06 +0800
message:
first go at making location config lookup recursive
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: john at arbash-meinel.com-20061011085152-65de197133d8bd41
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 01:51:31 +0100
message:
(John Arbash Meinel) Fix bug #62473
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011085152-65de197133d8bd41
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dont_require_content_type_62473
timestamp: Wed 2006-10-11 18:51:52 +1000
message:
Fix bug #62473 by not requiring content-type in range responses
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-11 10:26:57 +0100
message:
(John Arbash Meinel) use lazy importing to improve startup time
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
parent: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 11:17:15 +1000
message:
Update HACKING and TODO
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
parent: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 10:23:23 +1000
message:
[merge] bzr.dev 2070
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:50:43 +1000
message:
more lazy importing gets bzr rocks down to 116ms
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
parent: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:44:57 +1000
message:
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
parent: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:36:16 +1000
message:
make bzrlib/conflicts.py lazy
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
parent: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:29:17 +1000
message:
from bzrlib.ui lazy import progress, and make progress import lazily
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
parent: john at arbash-meinel.com-20061006072218-930b322b5d303872
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:25:55 +1000
message:
Make bzrlib.config use lazy importing
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072218-930b322b5d303872
parent: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:22:18 +1000
message:
Don't import 'bzrlib.tree' directly in bzrlib.builtins
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
parent: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:14:31 +1000
message:
don't import errors, and try to lazy import logging in bzrlib.trace
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
parent: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:13:51 +1000
message:
lazy import revisionspec and errors for bzrlib.options
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
parent: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:03:55 +1000
message:
lazy import getpass in bzrlib.ui.text
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
parent: john at arbash-meinel.com-20061006070031-1206bad6a645029c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:57 +1000
message:
Make cmd_version_info.py lazy import most other modules
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070031-1206bad6a645029c
parent: john at arbash-meinel.com-20061006064134-0716158c26306b4d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:31 +1000
message:
Make importing errors lazy for osutils
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006064134-0716158c26306b4d
parent: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:41:34 +1000
message:
NEWS about even better rocks time
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
parent: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:32:11 -0500
message:
also avoid importing WorkingTree before it is needed
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
parent: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:27:06 -0500
message:
shave off another 10ms by avoiding importing merge from working tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
parent: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:24:02 +1000
message:
NEWS about improved startup times
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
parent: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 15:53:44 +1000
message:
[merge] bzr.dev 2063
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 10:38:46 +1000
message:
make lazy_import lazily import errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
parent: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 08:42:09 +1000
message:
Now that mkdtemp and rmtree are lazy, they should not be directly improted.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
parent: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:21:03 -0500
message:
lazy_import plugin and transport/local
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
parent: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:20:41 -0500
message:
Update output of --profile-imports to understand from foo import bar time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
parent: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:51:49 -0500
message:
lazy_import AtomicFile
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
parent: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:44:23 -0500
message:
lazy_import osutils and sign_my_commits
Move doc tests into test_osutils, since lazy_import doesn't play nicely
with DocTest
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
parent: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 18:17:16 -0500
message:
Fix the inventory doc tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
parent: john at arbash-meinel.com-20060912223718-b605523794911ca9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:59:53 -0500
message:
Change how 'revision' is imported to avoid problems later
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912223718-b605523794911ca9
parent: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:37:18 -0500
message:
Hack around loading 'copy' to make startup much faster
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
parent: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:25:28 -0500
message:
lazy_import inventory.py, avoids importing tarfile
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
parent: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:16:38 -0500
message:
lazy_import diff.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
parent: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:12:30 -0500
message:
lazy_import bundle and bundle.commands
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
parent: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:03:29 -0500
message:
lazy import versionedfile, late-load bzrlib.merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
parent: john at arbash-meinel.com-20060912204642-91599869cc863f07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 16:19:54 -0500
message:
Find a few places that weren't importing their dependencies.
Demandload a few more places.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912204642-91599869cc863f07
parent: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:46:42 -0500
message:
Cleanup, deprecated, and get the tests passing again.
bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
parent: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:28:03 -0500
message:
lazy_import bzrlib/repository.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
parent: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:16:43 -0500
message:
Shave off another 40ms by demand loading branch and bzrdir
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
parent: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:10:32 -0500
message:
Make profile_imports aware of lazy_import stuff
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:02:29 -0500
message:
Demandloading builtins.py drops our load time from 350ms to 291ms
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:23:07 +0100
message:
(John Arbash Meinel) Handle exceptions while opening /dev/urandom
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: urandom-56883
timestamp: Tue 2006-10-10 01:26:39 -0500
message:
Catch an exception while opening /dev/urandom rather than using os.path.exists()
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: john at arbash-meinel.com-20061010064845-173353db11a009a0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:09:12 +0100
message:
(John Arbash Meinel) bzrlib.lazy_regex.lazy_compile creates regex objects that are compiled on demand
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010064845-173353db11a009a0
parent: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 16:48:45 +1000
message:
review feedback from Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
parent: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:06:24 +1000
message:
Install lazy compile during startup
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
parent: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:01:53 +1000
message:
Update profile imports to be aware of the new compiler
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
parent: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:41:01 +1000
message:
Add install and unistall functions, and tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:17:29 +1000
message:
bzrlib.lazy_regex.lazy_compile creates a proxy object around re.compile()
This object compiles on first use, rather than compiling instantly.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 07:28:41 +0100
message:
(mbp) benchmark updates
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20061004101753-20c01466441296e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: usecases-benchmarks
timestamp: Fri 2006-10-06 12:04:17 +1000
message:
merge additional fix from cfbolz
------------------------------------------------------------
merged: cfbolz at gmx.de-20061004101753-20c01466441296e7
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-10-04 12:17:53 +0200
message:
Fix make_kernel_like_tree_committed, which does not exist any more :-(.
------------------------------------------------------------
merged: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Tue 2006-10-03 17:34:29 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-09-29 22:27:19 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:54:47 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:51:59 +0200
message:
Fix bundle benchmarks: don't do install_bundle on too many revisions: takes way
too long. Split up timing of install_bundle and write_bundle.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
parent: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: pqm at pqm.ubuntu.com-20060830143731-af84f2be15714815
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:35 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:06 +0200
message:
Fix problems pointed out by John:
* Actually benchmark install_bundle too.
* Fix PEP 8 issues.
* Fix caching of trees by using names dependant on the parameters.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
parent: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 04:17:16 +0200
message:
Refactor the bundle benchmarks to use the existing helper functions.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
parent: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:40:18 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:37:50 +0200
message:
Fix docstrings and other things to be PEP 8 compatible. Removed caching of
trees in preparation of using John's mechanism.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
parent: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 18:42:15 +0200
message:
Use the proper functions for constructing trees in benchmarks introduced a
while ago that are also properly cached.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
parent: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 15:16:52 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:57:09 +0000
message:
Don't use cache by default.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
parent: hpk at merlinux.de-20060812095539-6acc59da6be3a656
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:56:40 +0000
message:
Explicitely generate test functions.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812095539-6acc59da6be3a656
parent: hpk at merlinux.de-20060812093832-8037f88795c2685e
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:55:39 +0000
message:
Reverting mutter branch merge.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812093832-8037f88795c2685e
parent: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:38:32 +0000
message:
Minor doc fix.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
parent: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:04:38 +0000
message:
Merge bundle benchmarks and resolve conflict.
------------------------------------------------------------
merged: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
parent: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
committer: holger krekel <hpk at merlinux.de>
branch nick: bundle_bench
timestamp: Fri 2006-08-11 17:25:00 +0000
message:
route more creation code through cached_make
and refactor so that apply bundle works from an
empty tree.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
parent: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:12:07 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 19:53:42 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:02:36 +0200
message:
(cfbolz, hpk): Add caching mechanism and add benchmark for bundle-reading.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 12:17:48 +0200
message:
Actually run the benchmarks.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 13:28:41 +0200
message:
low level bundle tests.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:02:27 +0000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 13:03:53 +0200
message:
Add benchmark for applying a benchmark and fix some formatting/typos.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
parent: cfbolz at gmx.de-20060807163103-127425db68843779
parent: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 12:55:04 +0200
message:
Merge Jan's benchmarks.
------------------------------------------------------------
merged: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
parent: jan at merlinux.de-20060719045812-23b43140f27fa081
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 07:54:36 +0200
message:
benchmarks for "bzr bundle --revision ..-1"
------------------------------------------------------------
merged: jan at merlinux.de-20060719045812-23b43140f27fa081
parent: jan at merlinux.de-20060719044851-ec1047597afeafdd
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:58:12 +0200
message:
added missing file bench_info.py
somehow bzr add missed the file, probably invoked it in a wrong dir
------------------------------------------------------------
merged: jan at merlinux.de-20060719044851-ec1047597afeafdd
parent: jan at merlinux.de-20060719042908-4f363674ac7c088e
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:48:51 +0200
message:
benchmarks for "bzr info" in a kernel like tree
------------------------------------------------------------
merged: jan at merlinux.de-20060719042908-4f363674ac7c088e
parent: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:29:08 +0200
message:
benchmark for "bzr commit single_file" in a kernel like tree
------------------------------------------------------------
merged: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 05:47:44 +0200
message:
benchmark for "bzr status single_file" in a kernel like tree
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 04:06:28 +0100
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: wang at ubuntu-20061010013213-1987b53af335c1cc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 12:26:32 +1000
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
merged: wang at ubuntu-20061010013213-1987b53af335c1cc
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: wang <wang at ubuntu>
branch nick: test-branch
timestamp: Tue 2006-10-10 09:32:13 +0800
message:
fix typos
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: john at arbash-meinel.com-20061010001525-84e54e428d10addd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:18:00 +0100
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010001525-84e54e428d10addd
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push-to-diverged
timestamp: Mon 2006-10-09 19:15:25 -0500
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:08:42 +0100
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 09:47:22 +1000
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.proxy-error
timestamp: Sat 2006-10-07 14:52:18 +0530
message:
correct handling of proxy error
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 02:59:35 +0100
message:
(jam) add more startup benchmarks
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: startup-benchmarks
timestamp: Mon 2006-10-09 18:44:19 -0500
message:
spin off startup benchmarks to their own branch
------------------------------------------------------------
merged: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061005075224-6b7bb42ecd661206
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-06 10:31:00 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-06 10:28:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 05:18:29 +0100
message:
Fix diff3 merges to not indicate conflicts on clean merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
parent: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-10-05 00:05:12 -0400
message:
Update test case style
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
parent: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 14:40:24 -0400
message:
Fix diff3 conflict-reporting bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 09:15:43 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 01:14:36 +0100
message:
(John Meinel) don't require a valid email for LockDir
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
parent: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:24:37 -0500
message:
Switch extract_email_address() to use a more specific exception
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:12:58 -0500
message:
Make LockDir less sensitive to invalid configuration of email
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 09:13:07 +0100
message:
(mbp) let bzr+ssh:// work without paramiko
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
parent: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 17:57:23 +1000
message:
Fix missing import
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
parent: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:43:08 +1000
message:
merge bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:41:54 +1000
message:
Define SmartSSHTransport class even without paramiko
(#62727)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 06:08:07 +0100
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
------------------------------------------------------------
merged: robertc at robertcollins.net-20061005075224-6b7bb42ecd661206
parent: robertc at robertcollins.net-20061005073458-f2a32fb8a43c0c34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Thu 2006-10-05 17:52:24 +1000
message:
Update comments and unlock in a better order in tree initialization (Robert Collins, John Meinel)
------------------------------------------------------------
merged: robertc at robertcollins.net-20061005073458-f2a32fb8a43c0c34
parent: robertc at robertcollins.net-20061004074228-8ac10a23b9713335
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Thu 2006-10-05 17:34:58 +1000
message:
New method ``WorkingTree.flush()`` which will write the current memory
inventory out to disk. At the same time, read_working_inventory will
no longer trash the current tree inventory if it has been modified within
the current lock, and the tree will now ``flush()`` automatically on
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
advantage of this functionality. (Robert Collins, John Arbash Meinel)
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004074228-8ac10a23b9713335
parent: robertc at robertcollins.net-20061004070333-622180ec5423be98
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Wed 2006-10-04 17:42:28 +1000
message:
``WorkingTree.set_root_id(None)`` is now deprecated. Please
pass in inventory.ROOT_ID if you want the default root id value.
(Robert Collins, John Arbash Meinel)
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004070333-622180ec5423be98
parent: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Wed 2006-10-04 17:03:33 +1000
message:
(Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Wed 2006-10-04 16:19:12 +1000
message:
``TestCase.make_branch_and_memory_tree`` now takes a format
option to set the BzrDir, Repository and Branch formats of the
created objects. (Robert Collins, John Arbash Meinel)
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
parent: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:50:23 +1000
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
parent: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:34:57 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
parent: robertc at robertcollins.net-20061004032543-58e96ff9d0e25d9c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 04:41:15 +0100
message:
(Robert Collins) Add TestCaseWithMemoryTransport, a test class specifically for doing tests with memory transports and no disk resources.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061004032543-58e96ff9d0e25d9c
parent: robertc at robertcollins.net-20060928231059-e8d068d63b81d3f1
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-10-04 13:25:43 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928231059-e8d068d63b81d3f1
parent: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 09:10:59 +1000
message:
Move NEWS section for TestCaseWithMemoryTransport to the right area.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-02 01:43:10 +0100
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr.dev
timestamp: Mon 2006-10-02 10:25:13 +1000
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:57:29 +0100
message:
(jam) Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 15:39:52 -0500
message:
Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:47:35 +0100
message:
(jam) find python2.5 if 2.4 is not available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929174315-796535c31fa0d121
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:43:15 -0500
message:
Find python2.5 if 2.4 cannot be found
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: john at arbash-meinel.com-20060929170751-15b398c539e26d21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 18:37:30 +0100
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929170751-15b398c539e26d21
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:07:51 -0500
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
merged: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: test_on_vfat.win32.fix
timestamp: Fri 2006-09-29 14:15:51 +0300
message:
test_on_vfat win32 fix: use binary line-endings
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 17:34:45 +0100
message:
Implement BzrDir.destroy_tree and destroy_tree_metadata
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-29 09:09:33 -0400
message:
Cleaner implementation of destroy_working_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
parent: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:27:36 -0400
message:
Introduce BzrDir.destroy_workingtree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:25:21 -0400
message:
merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 16:31:52 +0100
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 09:10:56 -0500
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
merged: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.win32-selftest
timestamp: Thu 2006-09-28 12:31:13 +0200
message:
Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 08:56:20 +1000
message:
Merge fixed TestCaseWithMemoryTransport.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 08:36:54 +1000
message:
Unbreak transport tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 07:54:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
parent: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 07:53:09 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
parent: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Fri 2006-09-29 07:49:43 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: john at arbash-meinel.com-20060928160442-53b112c0fe1477a8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 17:15:39 +0100
message:
(vila) Provide cloning hint to children of HttpTransportBase
------------------------------------------------------------
merged: john at arbash-meinel.com-20060928160442-53b112c0fe1477a8
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: v.ladeuil+lp at free.fr-20060921075929-3572272c52c8e14f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-09-28 11:04:42 -0500
message:
(vila) Provide cloning hint to children of HttpTransportBase
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20060921075929-3572272c52c8e14f
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.clone
timestamp: Thu 2006-09-21 09:59:29 +0200
message:
Fix bug #61606 by providing cloning hint do daughter classes.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.clone): We can't decide for the class daughters how
the cloning occurs. We just give them the hint.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: pqm at pqm.ubuntu.com-20060928081358-b8dfad24b0625b94
parent: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 11:06:33 +0100
message:
(mbp) find elementtree from python2.5
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Thu 2006-09-28 15:43:24 +1000
message:
Load python2.5's ElementTree if present
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928081358-b8dfad24b0625b94
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 09:13:58 +0100
message:
(jam) tests that expect LockContention should timeout sooner
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
parent: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 17:12:53 -0500
message:
Change tests that expect locking to fail to timeout sooner.
This includes changing LockDir to not have a compiled-in default timeout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
parent: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:58:37 -0500
message:
[merge] bzr.dev 2049
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:52:22 -0500
message:
Review feedback from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
parent: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Mon 2006-09-25 15:48:24 -0500
message:
[merge] bzr.dev 2041
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: john at arbash-meinel.com-20060920180700-0195b84c614cd094
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-09-22 18:36:40 -0500
message:
Change to reporting the time when we will stop trying to grab the lock
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920180700-0195b84c614cd094
parent: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 13:07:00 -0500
message:
Update NEWS for fixing bugs #43521, #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
parent: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:52:28 -0500
message:
Switch from locking the peek() to locking attempt_lock(), which is much more stable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
parent: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:10:45 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
parent: john at arbash-meinel.com-20060920163319-be9550fb82b83385
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:01:14 -0500
message:
Change default timeouts, and report differently the first failure
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163319-be9550fb82b83385
parent: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:33:19 -0500
message:
Decrease the waiting time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
parent: john at arbash-meinel.com-20060915004457-902cec0526a39337
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:32:06 -0500
message:
Add the ability to report if the lock changes from underneath you
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004457-902cec0526a39337
parent: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:44:57 -0500
message:
[merge] bzr.dev 2009
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:42:10 -0500
message:
Create a helper function for formatting lock information
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
parent: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:31:47 -0500
message:
create a helper for formatting a time delta
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
parent: john at arbash-meinel.com-20060825205133-402530a133d623a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 16:26:05 -0500
message:
NEWS: this addresses bug #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825205133-402530a133d623a0
parent: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:51:33 -0500
message:
Switch the default from instantly aborting, to waiting as long as 1 minute (down from 5 minutes)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
parent: pqm at pqm.ubuntu.com-20060825162024-eda7457881a28da7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:40:48 -0500
message:
Report to the user when we are spinning on a lock
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:44:31 +0100
message:
Revert deletes files that don't exist in target if not locally modified
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
parent: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 16:34:08 -0400
message:
Update NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
parent: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 16:28:32 -0400
message:
Changes from review
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
parent: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 15:14:52 -0400
message:
Fix iteraction of revert and files not present in target_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
parent: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 14:49:54 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: pqm at pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
parent: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:27:46 +0100
message:
Add support for bundles and testaments with roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
parent: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-27 16:16:08 -0400
message:
Fix copyright statements
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
parent: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-09-26 09:40:43 -0400
message:
Remove the check-parent patch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
parent: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-09-26 09:28:39 -0400
message:
Changes from review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
parent: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 22:08:10 -0400
message:
Add supports_rich_root member to repository
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
parent: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:53:50 -0400
message:
Cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
parent: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:20:15 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
parent: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:05:30 -0400
message:
Ensure that new-model revisions aren't installed into old-model repos
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
parent: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:47:14 -0400
message:
Test 0.9 bundles for knit format1 and knit format2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
parent: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:37:32 -0400
message:
Stop using get_revision_id to make bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
parent: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:23:03 -0400
message:
Got 0.9 bundles working, with root included by changes_from
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
parent: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 18:02:58 -0400
message:
More work on bundles
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
parent: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 14:14:14 -0400
message:
Bundle 0.9 uses Testament 3 strict
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
parent: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 13:40:20 -0400
message:
Implement testament format 3 strict
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
parent: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
parent: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 11:58:44 -0400
message:
Merge error message fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-parents
timestamp: Thu 2006-09-21 11:52:45 -0400
message:
Correct error formatting
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
parent: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 11:58:05 -0400
message:
Merge check-parent fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-parents
timestamp: Thu 2006-09-21 11:19:27 -0400
message:
Prevent raw copies from corrupting knits by checking parents
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
parent: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 07:59:20 -0400
message:
Bundles now corrupt repositories
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
parent: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-20 21:48:44 -0400
message:
start work on format 0.9 serializer
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-20 14:41:51 -0400
message:
Ensure that 0.8 bundles aren't used with KnitRepository2
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
parent: pqm at pqm.ubuntu.com-20060927192118-9930ffc4445f28ae
parent: john at arbash-meinel.com-20060927192035-617471739aca0247
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 20:48:46 +0100
message:
Lukáš Lalinský: TransportNotPossible has a bad docstring
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927192035-617471739aca0247
parent: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:20:35 -0500
message:
Lukáš Lalinský: TransportNotPossible has a bad docstring
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927192118-9930ffc4445f28ae
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
parent: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 20:21:18 +0100
message:
[merge] Lukáš Lalinský: fix 'bzr serve' for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
parent: john at arbash-meinel.com-20060927190923-0f500435cb703778
parent: lalinsky at gmail.com-20060927125058-1d3be7bb11c49b20
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:11:06 -0500
message:
[merge] Lukáš Lalinský: fix 'bzr serve' for win32
------------------------------------------------------------
merged: lalinsky at gmail.com-20060927125058-1d3be7bb11c49b20
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.win32-serve
timestamp: Wed 2006-09-27 14:50:58 +0200
message:
Use urlutils.local_path_to_url to get an URL from the directory path.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927190923-0f500435cb703778
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:09:23 -0500
message:
Give Robert credit for closing a bug
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
parent: robertc at robertcollins.net-20060926231500-ae7480f138254f17
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 00:30:56 +0100
message:
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060926231500-ae7480f138254f17
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-09-27 09:15:00 +1000
message:
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
parent: pqm at pqm.ubuntu.com-20060926075259-8417b3b53037df04
parent: john at arbash-meinel.com-20060926204611-8621c714eac8c614
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-26 22:59:10 +0100
message:
(jam) fix commit performance regression
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926204611-8621c714eac8c614
parent: john at arbash-meinel.com-20060926003925-a0e38c3d9fbadf4a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Tue 2006-09-26 15:46:11 -0500
message:
CommitBuilder.get_tree => CommitBuilder.revision_tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926003925-a0e38c3d9fbadf4a
parent: john at arbash-meinel.com-20060926003505-6d2c1d6ef6e4945e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:39:25 -0500
message:
NEWS and documentation
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926003505-6d2c1d6ef6e4945e
parent: john at arbash-meinel.com-20060926002612-31b451c3f8a41992
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:35:05 -0500
message:
Call _cache_basis_inventory directly rather than set_last_revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926002612-31b451c3f8a41992
parent: john at arbash-meinel.com-20060925222031-fa7a5cfd5c1fa5c4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:26:12 -0500
message:
Update WorkingTree.set_parent_trees() to directly cache inv.
Rather than go through set_parent_ids() which calls set_last_revision(),
which has to read the inventory back out of the repository.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925222031-fa7a5cfd5c1fa5c4
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 17:20:31 -0500
message:
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926075259-8417b3b53037df04
parent: pqm at pqm.ubuntu.com-20060925222037-8be906e237613b10
parent: robertc at robertcollins.net-20060926055137-7b0fe47fa3ba5dad
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-26 08:52:59 +0100
message:
(Andrew Bennetts, Robert Collins) Set smart server test sockets to be blocking
------------------------------------------------------------
merged: robertc at robertcollins.net-20060926055137-7b0fe47fa3ba5dad
parent: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-09-26 15:51:37 +1000
message:
(Andrew Bennetts, Robert Collins) Set smart server test sockets to be blocking
to avoid EAGAIN errors during the test suite on windows.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925222037-8be906e237613b10
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
parent: aaron.bentley at utoronto.ca-20060925215606-029bd3c8944318e2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 23:20:37 +0100
message:
Condense help command listings
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215606-029bd3c8944318e2
parent: aaron.bentley at utoronto.ca-20060925215505-d29f14c3fc73fdc3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:56:06 -0400
message:
update NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215505-d29f14c3fc73fdc3
parent: aaron.bentley at utoronto.ca-20060925215428-b2fe01fddf80004b
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:55:05 -0400
message:
merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215428-b2fe01fddf80004b
parent: aaron.bentley at utoronto.ca-20060924160338-24efe2f89e6cc190
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:54:28 -0400
message:
Change angle brackets to square brackets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060924160338-24efe2f89e6cc190
parent: aaron.bentley at utoronto.ca-20060923184336-75a9f0254667aca4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sun 2006-09-24 12:03:38 -0400
message:
Changes from review and tweaks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060923184336-75a9f0254667aca4
parent: aaron.bentley at utoronto.ca-20060923172850-790fb842f3df42fe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sat 2006-09-23 14:43:36 -0400
message:
Fix testcase
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060923172850-790fb842f3df42fe
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sat 2006-09-23 13:28:50 -0400
message:
Condense command help text
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
parent: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
parent: john at arbash-meinel.com-20060925193049-070c5538905aae3e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 20:40:52 +0100
message:
(jam) add working_dir= parameter to run_bzr* functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925193049-070c5538905aae3e
parent: john at arbash-meinel.com-20060925192926-eebc7d5b0211a310
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:30:49 -0500
message:
Move NEWS to dev section, rather than 0.11 section
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925192926-eebc7d5b0211a310
parent: john at arbash-meinel.com-20060925192112-c2847645ff74e8c7
parent: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:29:26 -0500
message:
[merge] bzr.dev 2040
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925192112-c2847645ff74e8c7
parent: john at arbash-meinel.com-20060921202504-926521f9d02ff542
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:21:12 -0500
message:
Add docstring to why run_bzr_captured is overridden
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921202504-926521f9d02ff542
parent: john at arbash-meinel.com-20060921201728-880046debc7eb84d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Thu 2006-09-21 15:25:04 -0500
message:
add tests that the working directory is preserved, cleanup run_bzr_subprocess
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921201728-880046debc7eb84d
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Thu 2006-09-21 15:17:28 -0500
message:
Add working_dir=XX to run_bzr_* functions, and clean up tests
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
parent: abentley at panoramicfeedback.com-20060925183050-057959b1247aacc8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 19:42:17 +0100
message:
cleanup progress properly when interrupted during fetch (#54000)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060925183050-057959b1247aacc8
parent: abentley at panoramicfeedback.com-20060925145238-385b618dccf07763
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: progress-cleanup
timestamp: Mon 2006-09-25 14:30:50 -0400
message:
Tweak test to avoid catching assert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060925145238-385b618dccf07763
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: progress-cleanup
timestamp: Mon 2006-09-25 10:52:38 -0400
message:
Clean up progress properly when interrupted during fetch (#54000)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
parent: pqm at pqm.ubuntu.com-20060925001848-e66640f823fffa93
parent: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 02:24:45 +0100
message:
(Robert Collins) Add 0.12 deprecation symbol.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
parent: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-09-25 11:10:49 +1000
message:
(Robert Collins) Add 0.12 deprecation symbol.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925001848-e66640f823fffa93
parent: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
parent: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 01:18:48 +0100
message:
(Robert Collins) bzr 0.11rc1 has branch, bump bzr.dev version to 0.12
------------------------------------------------------------
merged: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
parent: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-09-25 10:03:15 +1000
message:
(Robert Collins) bzr 0.11rc1 has branch, bump bzr.dev version to 0.12
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
parent: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
parent: john at arbash-meinel.com-20060924184209-09738b17b2de412f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-24 19:53:11 +0100
message:
(jam) don't delete logs for failed tests (and ensure this with new tests)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060924184209-09738b17b2de412f
parent: john at arbash-meinel.com-20060924172729-1dcf6e0dc1f7ab29
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fail-test-keep-log
timestamp: Sun 2006-09-24 13:42:09 -0500
message:
whitespace fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060924172729-1dcf6e0dc1f7ab29
parent: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fail-test-keep-log
timestamp: Sun 2006-09-24 12:27:29 -0500
message:
test that logs are kept or deleted when appropriate
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
parent: pqm at pqm.ubuntu.com-20060923065013-b8483dd421706cbe
parent: john at arbash-meinel.com-20060923203422-01eab04e7a3120cc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-23 22:07:11 +0100
message:
(jam) fix handling of directories in zip exports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923203422-01eab04e7a3120cc
parent: john at arbash-meinel.com-20060923190544-c3f625a5bc5589ab
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 15:34:22 -0500
message:
Bring back log deletions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923190544-c3f625a5bc5589ab
parent: john at arbash-meinel.com-20060923165308-821b9c574cfea136
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 14:05:44 -0500
message:
paths are always forward slashed for python zipfiles
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923165308-821b9c574cfea136
parent: john at arbash-meinel.com-20060923162147-06b40d23f9cd2f47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:53:08 -0500
message:
Set the external_attr bits so Windows respects our directories
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923162147-06b40d23f9cd2f47
parent: john at arbash-meinel.com-20060923161009-40d4cbd48b167f3c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:21:47 -0500
message:
In zip files, directories must have trailing slashes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923161009-40d4cbd48b167f3c
parent: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:10:09 -0500
message:
[merge] bzr.dev 2034
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060923065013-b8483dd421706cbe
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
parent: john at arbash-meinel.com-20060923063946-e596c8a8eef928b4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-23 07:50:13 +0100
message:
(jam) allow 'bzr inventory filename' (bug #3631)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923063946-e596c8a8eef928b4
parent: john at arbash-meinel.com-20060923063744-98451651a436df9b
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Sat 2006-09-23 01:39:46 -0500
message:
[merge] bzr.dev 2034
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923063744-98451651a436df9b
parent: john at arbash-meinel.com-20060922213954-8de9af5047a7e5c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Sat 2006-09-23 01:37:44 -0500
message:
make None the only invalid file list
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922213954-8de9af5047a7e5c1
parent: john at arbash-meinel.com-20060922213448-7ac0ce86b5fbcf9f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Fri 2006-09-22 16:39:54 -0500
message:
more tests for 'bzr inventory' including errors and nesting
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922213448-7ac0ce86b5fbcf9f
parent: john at arbash-meinel.com-20060921210631-c6ce799f90431a13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Fri 2006-09-22 16:34:48 -0500
message:
Change how 'bzr inventory' finds paths
It uses tree_files so it works correctly when in a subdir.
It also uses find_ids_across_trees() so that it can look
for files in old revisions using old or new paths, and
also checks that all paths actually exist, raising
an exception if paths are not present.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921210631-c6ce799f90431a13
parent: john at arbash-meinel.com-20060921205545-a6cc5f07adb70104
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Thu 2006-09-21 16:06:31 -0500
message:
Fix bug #3631, allow 'bzr inventory filename'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921205545-a6cc5f07adb70104
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Thu 2006-09-21 15:55:45 -0500
message:
Factor the 'bzr inventory' tests out of tests_too_much
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
parent: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
parent: john at arbash-meinel.com-20060922215628-276d52589e497eaf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 23:59:59 +0100
message:
(jam) fix bug #56814, don't fail when annotating an empty file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922215628-276d52589e497eaf
parent: john at arbash-meinel.com-20060921194129-7fed907b470a227e
parent: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate-empty-56814
timestamp: Fri 2006-09-22 16:56:28 -0500
message:
[merge] bzr.dev 2033
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921194129-7fed907b470a227e
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate-empty-56814
timestamp: Thu 2006-09-21 14:41:29 -0500
message:
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
parent: pqm at pqm.ubuntu.com-20060922195914-56c9cc71b2ea2e6f
parent: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 22:02:46 +0100
message:
Make commit puke on unversioned files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
parent: abentley at panoramicfeedback.com-20060922184904-2871c736c01241f3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 15:57:19 -0400
message:
Tweak from review comments
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922184904-2871c736c01241f3
parent: abentley at panoramicfeedback.com-20060922164454-40022f1c95ef9646
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 14:49:04 -0400
message:
Stop accepting non-existant files in commit (#50793)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922164454-40022f1c95ef9646
parent: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
parent: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 12:44:54 -0400
message:
Merge from bzr,dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922195914-56c9cc71b2ea2e6f
parent: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
parent: john at arbash-meinel.com-20060922193757-a8341ac119f0d33c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 20:59:14 +0100
message:
(jam) fixes for rio and version-info
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922193757-a8341ac119f0d33c
parent: john at arbash-meinel.com-20060922151955-1ce5162055c9538d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 14:37:57 -0500
message:
Create a 'read_stanza_unicode' to handle unicode processing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922151955-1ce5162055c9538d
parent: john at arbash-meinel.com-20060922054531-d580a97c764c63a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 10:19:55 -0500
message:
Add a test that we can find the version info when we only have a branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922054531-d580a97c764c63a2
parent: john at arbash-meinel.com-20060922053828-fee2e95b2fb407f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:45:31 -0500
message:
Change comparisons to ignore the build-date field
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922053828-fee2e95b2fb407f2
parent: john at arbash-meinel.com-20060922052938-8a82e211a1b7540a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:38:28 -0500
message:
Change the version-info --format=rio to support unicode messages
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922052938-8a82e211a1b7540a
parent: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:29:38 -0500
message:
Make it easier to nest Stanzas with Unicode contents
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
parent: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
parent: john at arbash-meinel.com-20060922050115-93b124532cdd0ed0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 06:13:12 +0100
message:
(abentley) Another test for TreeTransform.create_file()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922050115-93b124532cdd0ed0
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
parent: abentley at panoramicfeedback.com-20060921202136-e5a8deaadfa00021
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revert-subpath-56549
timestamp: Fri 2006-09-22 00:01:15 -0500
message:
[merge] Aaron Bentley's file mode fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921202136-e5a8deaadfa00021
parent: abentley at panoramicfeedback.com-20060921195811-4eeaff48e29d6604
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Thu 2006-09-21 16:21:36 -0400
message:
Added test for preserving file mode
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921195811-4eeaff48e29d6604
parent: aaron.bentley at utoronto.ca-20060525042123-3289bf33a73ef194
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Thu 2006-09-21 15:58:11 -0400
message:
Merge bugfix from John Meinel
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 04:48:48 +0100
message:
(marien,mbp) python2.5 and elementtree fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
parent: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:29:29 +1000
message:
merge import fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
parent: mbp at sourcefrog.net-20060921080121-f020f844f9982383
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:35:25 +1000
message:
fix imports in bench_sftp
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921080121-f020f844f9982383
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:01:21 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:27:19 +1000
message:
[merge] ElementTree exception fixes
------------------------------------------------------------
merged: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:51:36 +0200
message:
Handle the different exception (non-c)ElementTree raises.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:07:38 +1000
message:
Restore bench_sftp import of TestSkipped
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
parent: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 13:02:40 +1000
message:
[merge] additional python2.5 fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
parent: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:55:07 +1000
message:
python2.5 apparently has trouble with unicode options
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
parent: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:47:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060815050217-d2df7c83d6c5eeca
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 18:33:51 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060814042957-3fa43995db57512a
parent: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 17:49:12 +1000
message:
[merge] [broken] python2.5 fixes
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
parent: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:26:37 +0000
message:
Change a repository test to explicitly convert to a list.
In python2.5, generator objects apparently cannot be autoconverted to a list.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
parent: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:07:43 +0000
message:
Canonicalize the exception name to the python2.4 form, which is more
user-friendly.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
parent: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 01:23:24 +0000
message:
Change the BzrNewError super invocation to a direct call, so it works with 2.4.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 00:11:21 +0000
message:
Add a workaround for usage of the args attribute in exceptions.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 12:32:41 +1000
message:
[merge] python2.5 fixes from Marien
------------------------------------------------------------
merged: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
parent: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:17:08 +0200
message:
Fix another python 2.5 issue.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
parent: marienz at gentoo.org-20060921230619-910d2ec258cba83d
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:54 +0200
message:
Fixes for python 2.5.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230619-910d2ec258cba83d
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:19 +0200
message:
Make the test runner finish running if a doctest fails.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: pqm at pqm.ubuntu.com-20060921225925-ab09f1d0cb2c838c
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 01:24:07 +0100
message:
(jam, abentley) Fix bug #56549 by making TreeTransform._set_mode stat the right file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revert-subpath-56549
timestamp: Thu 2006-09-21 14:27:23 -0500
message:
Fix bug #56549, and write a direct test that the right path is being statted
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921225925-ab09f1d0cb2c838c
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
parent: john at arbash-meinel.com-20060921221228-94606313e7d88f86
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 23:59:25 +0100
message:
(jam) Add command 'bzr version-info'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921221228-94606313e7d88f86
parent: john at arbash-meinel.com-20060921164822-86cc68e95e20b5d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 17:12:28 -0500
message:
Add NEWS and a simple doc for using bzr version-info
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921164822-86cc68e95e20b5d7
parent: john at arbash-meinel.com-20060921164404-0df31a883c13e4e4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:48:22 -0500
message:
small cleanup, remove unused imports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921164404-0df31a883c13e4e4
parent: john at arbash-meinel.com-20060921163339-f96d93a31db0d88a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:44:04 -0500
message:
Cleanup and simplify the blackbox tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921163339-f96d93a31db0d88a
parent: john at arbash-meinel.com-20060920151119-88a7090d0c17bbb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:33:39 -0500
message:
test feedback from Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920151119-88a7090d0c17bbb3
parent: john at arbash-meinel.com-20060920150038-a5651db2503b9e81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 10:11:19 -0500
message:
Remove unused imports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920150038-a5651db2503b9e81
parent: john at arbash-meinel.com-20060920145103-02725c6d6c886040
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 10:00:38 -0500
message:
rename version_info => cmd_version_info
avoid conflicting with 'bzrlib.version_info' the variable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920145103-02725c6d6c886040
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: john at arbash-meinel.com-20060920140640-8dca2f0fdb7564c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 09:51:03 -0500
message:
[merge] version-info plugin, and cleanup for layout in bzr
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920140640-8dca2f0fdb7564c3
parent: john at arbash-meinel.com-20060920135737-52600d787db0b3a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-09-20 09:06:40 -0500
message:
whitespace and formatting cleanups.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920135737-52600d787db0b3a2
parent: john at arbash-meinel.com-20060809202506-dd9f277c93c6c977
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-09-20 08:57:37 -0500
message:
Add a test that a default format is chosen
------------------------------------------------------------
merged: john at arbash-meinel.com-20060809202506-dd9f277c93c6c977
parent: john at arbash-meinel.com-20060622214022-009a731bee5dce1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-08-09 15:25:06 -0500
message:
Splitting up the version info code into a lazy factory style.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060622214022-009a731bee5dce1c
parent: john at arbash-meinel.com-20060131195053-bed52461d9381dd3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Thu 2006-06-22 16:40:22 -0500
message:
Updated version-info to the latest bzr.dev codebase. Changed to using VersionInfoBuilder, and made tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131195053-bed52461d9381dd3
parent: john at arbash-meinel.com-20060119174638-8d4bbb4a48f6d5fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-31 13:50:53 -0600
message:
Adding compatibility workarounds for newest bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119174638-8d4bbb4a48f6d5fa
parent: john at arbash-meinel.com-20060104020046-590543c511a4fca7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Thu 2006-01-19 11:46:38 -0600
message:
Adding a setup script for Chris.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060104020046-590543c511a4fca7
parent: john at arbash-meinel.com-20060103213529-2e72f9a61c9f229e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 20:00:46 -0600
message:
Remove unnecessary import
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103213529-2e72f9a61c9f229e
parent: john at arbash-meinel.com-20060103183643-1ca02b174605d00d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 15:35:29 -0600
message:
Using revision-id for rio, and revision_id for python
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103183643-1ca02b174605d00d
parent: john at arbash-meinel.com-20060103182113-adcd11d25efa91b5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:36:43 -0600
message:
Including the date stamp for all revisions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103182113-adcd11d25efa91b5
parent: john at arbash-meinel.com-20060103181811-384fb3f4168f72fc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:21:13 -0600
message:
Clean up whitespace in --format=python
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103181811-384fb3f4168f72fc
parent: john at arbash-meinel.com-20060102221246-e5c0bf655ebc8f56
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:18:11 -0600
message:
Including file-revisions fields, updated test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102221246-e5c0bf655ebc8f56
parent: john at arbash-meinel.com-20060102221055-9331f83de11a4933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:12:46 -0600
message:
Getting rid of bogus fields in date.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102221055-9331f83de11a4933
parent: john at arbash-meinel.com-20060102220851-f076ae0686ce4696
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:10:55 -0600
message:
Comment fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102220851-f076ae0686ce4696
parent: john at arbash-meinel.com-20060102220755-fecd509ae4883a96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:08:51 -0600
message:
Forgot the api change.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102220755-fecd509ae4883a96
parent: john at arbash-meinel.com-20051229005431-63b97b439bbd71e1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:07:55 -0600
message:
Switching to open_containing for simplicity.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229005431-63b97b439bbd71e1
parent: john at arbash-meinel.com-20051229003713-f4b176e1b5e898ee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:54:31 -0600
message:
Removing errors.py since UncleanError is no longer needed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229003713-f4b176e1b5e898ee
parent: john at arbash-meinel.com-20051229002909-0c9f16858ecfebc7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:37:13 -0600
message:
Adding tests for parsing the rio text back into rio.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229002909-0c9f16858ecfebc7
parent: john at arbash-meinel.com-20051229000541-b81d81a6e2dc6382
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:29:09 -0600
message:
Updated the blackbox tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229000541-b81d81a6e2dc6382
parent: john at arbash-meinel.com-20051228220312-0cc1c8ba83abb421
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:05:41 -0600
message:
Adding some whitebox tests for the output of generate_version_info
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228220312-0cc1c8ba83abb421
parent: john at arbash-meinel.com-20051228215321-4c2a142860ade5c8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 16:03:12 -0600
message:
Cleaned up formats include-history always displays the log message.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228215321-4c2a142860ade5c8
parent: john at arbash-meinel.com-20051228211815-1ba13be897978e2d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 15:53:21 -0600
message:
Playing around with some formats
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228211815-1ba13be897978e2d
parent: john at arbash-meinel.com-20051228204947-2fd81543e866350a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 15:18:15 -0600
message:
Have working rio output
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228204947-2fd81543e866350a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 14:49:47 -0600
message:
Creating a plugin to ease generating version information from a tree.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
parent: pqm at pqm.ubuntu.com-20060921160307-6081481c9a444cce
parent: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 18:00:00 +0100
message:
(jam) export utf-8 paths to tarballs and zipfiles
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
parent: john at arbash-meinel.com-20060920234318-05de23e98f7e7876
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Thu 2006-09-21 11:14:58 -0500
message:
Use build_tree_contents instead of manually opening the file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920234318-05de23e98f7e7876
parent: john at arbash-meinel.com-20060920230051-3da14a7b314f6c99
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 18:43:18 -0500
message:
Move out export tests from test_too_much, refactor
and re-enable doc tests for export.get_root_name()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920230051-3da14a7b314f6c99
parent: john at arbash-meinel.com-20060920225418-76ce8b371260ef08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 18:00:51 -0500
message:
Cleanup the export tests to act more like the current api.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920225418-76ce8b371260ef08
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 17:54:18 -0500
message:
Fix bug #56815 by exporting paths in utf8 to tarfile and zipfile
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921160307-6081481c9a444cce
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
parent: cfbolz at gmx.de-20060906211757-b0d73953b54efbc9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 17:03:07 +0100
message:
(cfbolz) Throw away disk logfile if not used
------------------------------------------------------------
merged: cfbolz at gmx.de-20060906211757-b0d73953b54efbc9
parent: cfbolz at gmx.de-20060906211722-b04f9c3ad1f53ef1
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Wed 2006-09-06 23:17:57 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060906211722-b04f9c3ad1f53ef1
parent: cfbolz at gmx.de-20060831114547-88347e7a6bce0eaf
parent: pqm at pqm.ubuntu.com-20060831060638-bfc0303de36a40a8
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Wed 2006-09-06 23:17:22 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060831114547-88347e7a6bce0eaf
parent: cfbolz at gmx.de-20060817112101-5e714140fb51f0d6
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-31 13:45:47 +0200
message:
Make docstring clearer.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060817112101-5e714140fb51f0d6
parent: cfbolz at gmx.de-20060817111057-108585811d3d24bb
parent: pqm at pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-17 13:21:01 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: cfbolz at gmx.de-20060817111057-108585811d3d24bb
parent: pqm at pqm.ubuntu.com-20060815155756-77559a6254704822
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-17 13:10:57 +0200
message:
Throw away on-disk logfile when possible.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
parent: john at arbash-meinel.com-20060920223617-ee51f416037ec263
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 00:46:41 +0100
message:
(jam) fix StopIteration error: bug #46871
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920223617-ee51f416037ec263
parent: john at arbash-meinel.com-20060920223233-8ec5b9c560295b60
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stop-iteration-46871
timestamp: Wed 2006-09-20 17:36:17 -0500
message:
NEWS about fixing bug #46871
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920223233-8ec5b9c560295b60
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stop-iteration-46871
timestamp: Wed 2006-09-20 17:32:33 -0500
message:
When a weave file is empty, we should get WeaveFormatError, not StopIteration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
parent: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
parent: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-20 19:26:12 +0100
message:
Update revert documentation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
parent: abentley at panoramicfeedback.com-20060920141816-53f613c09bce2a11
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-20 13:38:34 -0400
message:
Update docs again
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920141816-53f613c09bce2a11
parent: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-20 10:18:16 -0400
message:
Update revert help text
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-20 14:59:17 +0100
message:
Fix deprecated use of pending_merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
parent: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-09-19 15:30:15 -0400
message:
Fix deprecated use of pending_merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
parent: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-09-19 15:08:11 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: pqm at pqm.ubuntu.com-20060919035202-8174b4dc7ff91add
parent: robertc at robertcollins.net-20060919040303-d9edb788bcdd2f21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-19 05:17:47 +0100
message:
Trivially cleanup BRANCH.TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060919040303-d9edb788bcdd2f21
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-09-19 14:03:03 +1000
message:
Trivially cleanup BRANCH.TODO
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060919035202-8174b4dc7ff91add
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-19 04:52:02 +0100
message:
(Andrew Bennetts, Robert Collins) Add bzr+ssh:// url support and turn the smart server into a anonymous readonly server by default.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
parent: andrew.bennetts at canonical.com-20060918095840-53ae8a55c60f636e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Tue 2006-09-19 13:09:24 +1000
message:
Improvements to test_bzr_connect_to_bzr_ssh based on review comments
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918095840-53ae8a55c60f636e
parent: andrew.bennetts at canonical.com-20060918094756-0fc9beb9cd638340
parent: robertc at robertcollins.net-20060918083454-a8913e95b2722ade
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 19:58:40 +1000
message:
Merge --allow-writes from Robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918083454-a8913e95b2722ade
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: readonly-server
timestamp: Mon 2006-09-18 18:34:54 +1000
message:
Add readonly support to the smart server, enabled by default via `bzr server`.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918094756-0fc9beb9cd638340
parent: andrew.bennetts at canonical.com-20060918075841-a4935a338ae68533
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 19:47:56 +1000
message:
Implement ParamikoVendor.connect_ssh
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918075841-a4935a338ae68533
parent: andrew.bennetts at canonical.com-20060918074805-7cc3d8a8222fc745
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 17:58:41 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918074805-7cc3d8a8222fc745
parent: andrew.bennetts at canonical.com-20060918061343-0d8eb343d0b5aedc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 17:48:05 +1000
message:
Use bzrlib rather than a bzr subprocess in test_bzr_connect_to_bzr_ssh.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918061343-0d8eb343d0b5aedc
parent: andrew.bennetts at canonical.com-20060918061331-2e7054dfa69f1dc0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 16:13:43 +1000
message:
Remove a little bit of duplication in ssh.py
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918061331-2e7054dfa69f1dc0
parent: andrew.bennetts at canonical.com-20060918054323-ff9e1fbfe8d935db
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 16:13:31 +1000
message:
Expand docs about bzr+ssh:// slightly.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918054323-ff9e1fbfe8d935db
parent: andrew.bennetts at canonical.com-20060918053711-3aef5e6a0a538c53
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:43:23 +1000
message:
Skip test_bzr_connect_to_bzr_ssh if connect_ssh isn't implemented on the default vendor.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918053711-3aef5e6a0a538c53
parent: andrew.bennetts at canonical.com-20060918052741-f3aec942d5f070e6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:37:11 +1000
message:
Comment polishing.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918052741-f3aec942d5f070e6
parent: andrew.bennetts at canonical.com-20060918051119-e6501d102613d928
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:27:41 +1000
message:
Tidy imports, skip test if paramiko isn't installed.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918051119-e6501d102613d928
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:11:19 +1000
message:
Make bzr+ssh:// actually work (at least with absolute paths).
This also adds an ugly blackbox test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 15:38:58 +1000
message:
Merge from TestCaseWithMemoryTransport.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
parent: robertc at robertcollins.net-20060918052852-743b230325d2d4d5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Mon 2006-09-18 15:35:44 +1000
message:
New test base class TestCaseWithMemoryTransport offers memory-only
testing facilities: its not suitable for tests that need to mutate disk
state, but most tests should not need that and should be converted to
TestCaseWithMemoryTransport. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918052852-743b230325d2d4d5
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Mon 2006-09-18 15:28:52 +1000
message:
Merge bzr.dev,
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Mon 2006-09-18 14:09:11 +1000
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
parent: pqm at pqm.ubuntu.com-20060917211956-6e30d07da410fd1a
parent: robertc at robertcollins.net-20060917235017-2e3fa32c9a080cea
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-18 01:18:02 +0100
message:
(John Arbash Meinel, Robert Collins) Implement readv and put_bytes_nonatomic for the SmartTransport.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060917235017-2e3fa32c9a080cea
parent: robertc at robertcollins.net-20060917231256-dd9167cde535bc58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: put_nonatomic
timestamp: Mon 2006-09-18 09:50:17 +1000
message:
Touchup method order.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060917231256-dd9167cde535bc58
parent: robertc at robertcollins.net-20060917230502-20d52dba45fc2077
parent: john at arbash-meinel.com-20060916043259-8d799619a460adff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: put_nonatomic
timestamp: Mon 2006-09-18 09:12:56 +1000
message:
Merge johns put_bytes_non_atomic patch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916043259-8d799619a460adff
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server-put-nonatomic
timestamp: Fri 2006-09-15 23:32:59 -0500
message:
Implement put_bytes_non_atomic for the smart transport
------------------------------------------------------------
merged: robertc at robertcollins.net-20060917230502-20d52dba45fc2077
parent: robertc at robertcollins.net-20060917212427-343ef161b483b8e4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: review-readv
timestamp: Mon 2006-09-18 09:05:02 +1000
message:
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060917212427-343ef161b483b8e4
parent: john at arbash-meinel.com-20060916032649-140a79a2134b1c0d
parent: pqm at pqm.ubuntu.com-20060917211956-6e30d07da410fd1a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: john-readv
timestamp: Mon 2006-09-18 07:24:27 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916032649-140a79a2134b1c0d
parent: john at arbash-meinel.com-20060916022644-e19857e642b00a9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server-readv
timestamp: Fri 2006-09-15 22:26:49 -0500
message:
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916022644-e19857e642b00a9e
parent: john at arbash-meinel.com-20060916003806-29872939c029bf8f
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server-readv
timestamp: Fri 2006-09-15 21:26:44 -0500
message:
[merge] bzr.dev 2017
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916003806-29872939c029bf8f
parent: john at arbash-meinel.com-20060916002809-3b60a139b214b6fa
parent: john at arbash-meinel.com-20060914190856-746db7da49f34568
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server-readv
timestamp: Fri 2006-09-15 19:38:06 -0500
message:
[merge] short-read code, implement for Smart readv
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916002809-3b60a139b214b6fa
parent: john at arbash-meinel.com-20060915234816-cbbdb0ad5c77da23
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server-readv
timestamp: Fri 2006-09-15 19:28:09 -0500
message:
Implement readv() for the SmartServer
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060917211956-6e30d07da410fd1a
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
parent: robertc at robertcollins.net-20060917210304-3a697132f5fb68ac
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-17 22:19:56 +0100
message:
(Robert Collins) Change the Branch bind method to just bind rather than binding and pushing (fixes #43744 and #39542)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060917210304-3a697132f5fb68ac
parent: robertc at robertcollins.net-20060911010359-0404571fa92c5cfe
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bind-does-not-push-or-pull
timestamp: Mon 2006-09-18 07:03:04 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060911010359-0404571fa92c5cfe
parent: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bind-does-not-push-or-pull
timestamp: Mon 2006-09-11 11:03:59 +1000
message:
``Branch.bind(other_branch)`` no longer takes a write lock on the
other branch, and will not push or pull between the two branches.
API users will need to perform a push or pull or update operation if they
require branch synchronisation to take place. (Robert Collins)
``bzr bind`` no longer synchronises history with the master branch.
Binding should be followed by an update or push to synchronise the
two branches. This fixes bug #39542 for heavyweight checkouts.
(Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: robertc at robertcollins.net-20060916133647-ee5626e6ab413aa4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 15:03:54 +0100
message:
(robertc) Add MemoryTree and TreeBuilder test helpers. Also test behavior of transport.has('/') which caused failures in this when merging, and as a result cleanup the sftp path normalisation logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060916133647-ee5626e6ab413aa4
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: robertc at robertcollins.net-20060916064447-99a2987e5485b5ea
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-09-16 23:36:47 +1000
message:
(robertc) Add MemoryTree and TreeBuilder test helpers. Also test behavior of transport.has('/') which caused failures in this when merging, and as a result cleanup the sftp path normalisation logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060916064447-99a2987e5485b5ea
parent: robertc at robertcollins.net-20060915224602-3b939c8c84018c0d
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Sat 2006-09-16 16:44:47 +1000
message:
Merge from bzr.dev, fixing found bugs handling 'has('/')' in MemoryTransport and SFTP transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915224602-3b939c8c84018c0d
parent: robertc at robertcollins.net-20060915020315-9a4b022a6db42940
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Sat 2006-09-16 08:46:02 +1000
message:
Update to the TreeBuilder tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915020315-9a4b022a6db42940
parent: robertc at robertcollins.net-20060915012138-7d6fb0a40a980f36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-15 12:03:15 +1000
message:
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915012138-7d6fb0a40a980f36
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-15 11:21:38 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
parent: john at arbash-meinel.com-20060916021414-bd9e4cb9ac173022
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 03:23:41 +0100
message:
(jam) raise ShortReadvError when we don't get back enough data
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916021414-bd9e4cb9ac173022
parent: john at arbash-meinel.com-20060914190856-746db7da49f34568
parent: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Fri 2006-09-15 21:14:14 -0500
message:
[merge] bzr.dev 2016
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914190856-746db7da49f34568
parent: john at arbash-meinel.com-20060912170328-beee785b9e579ac2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Thu 2006-09-14 14:08:56 -0500
message:
review feedback: add the actual count written to ShortReadvError
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912170328-beee785b9e579ac2
parent: john at arbash-meinel.com-20060912164248-e56b8c183b6ac6a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Tue 2006-09-12 12:03:28 -0500
message:
Force all transports to raise ShortReadvError if they can
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912164248-e56b8c183b6ac6a6
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Tue 2006-09-12 11:42:48 -0500
message:
Add some assert statements to make readv safe
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
parent: pqm at pqm.ubuntu.com-20060916014706-93f2994bdb0c0850
parent: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 02:57:02 +0100
message:
(jam) don't use deprecated pending_merges for 'bzr update'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: update-deprecated
timestamp: Fri 2006-09-15 19:31:52 -0500
message:
Stop using pending_merges() in 'bzr update'
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916014706-93f2994bdb0c0850
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
parent: john at arbash-meinel.com-20060915234816-cbbdb0ad5c77da23
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 02:47:06 +0100
message:
(spiv,mpool,robertc) Create a RPC protocol as the building blocks for a smart server
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915234816-cbbdb0ad5c77da23
parent: john at arbash-meinel.com-20060915224610-e2488ffa5c43f20b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server
timestamp: Fri 2006-09-15 18:48:16 -0500
message:
Translate UnicodeErrors across the smart server
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915224610-e2488ffa5c43f20b
parent: robertc at robertcollins.net-20060915123116-2151853564521d8f
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server
timestamp: Fri 2006-09-15 17:46:10 -0500
message:
[merge] bzr.dev 2013
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915123116-2151853564521d8f
parent: andrew.bennetts at canonical.com-20060915063039-a0488e9077438ecb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: smart-transport
timestamp: Fri 2006-09-15 22:31:16 +1000
message:
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915063039-a0488e9077438ecb
parent: andrew.bennetts at canonical.com-20060915052345-9553e8c30355cefa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 16:30:39 +1000
message:
Address various review comments.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915052345-9553e8c30355cefa
parent: andrew.bennetts at canonical.com-20060915051928-f417c710aa907ec4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 15:23:45 +1000
message:
Activate a disabled test, rename another test to be consistent with what it's testing. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915051928-f417c710aa907ec4
parent: andrew.bennetts at canonical.com-20060915021438-cc11222a2a599231
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 15:19:28 +1000
message:
General code cleanup based on review comments and other observations.
Specifically, add a test --inet mode to the blackbox serve tests, change \1 to
\x01 for readability, add parameter to SmartTransport allowing provision of a
client, remove the use of deprecated 'put' method, tidy imports and remove
commented dead code. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915021438-cc11222a2a599231
parent: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
parent: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 12:14:38 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
parent: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
parent: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 23:43:21 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
parent: andrew.bennetts at canonical.com-20060913064503-801bc0a66726de1c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:53:25 +1000
message:
Give a sensible error if insufficient options are passed to 'bzr serve'.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064503-801bc0a66726de1c
parent: andrew.bennetts at canonical.com-20060913064201-39d1deac86fc332b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:45:03 +1000
message:
Allow specifying the host/interface to bzr serve, and use the new test
infrastructure to blackbox test bzr serve in listening mode of a local branch.
(Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064201-39d1deac86fc332b
parent: andrew.bennetts at canonical.com-20060913055419-2a16c273a7d5169b
parent: andrew.bennetts at canonical.com-20060913064003-968d976096934580
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:42:01 +1000
message:
Merge increased transport root tests and fix the smart transport accordingly.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055419-2a16c273a7d5169b
parent: andrew.bennetts at canonical.com-20060913044833-6d54576583f4d7bd
parent: andrew.bennetts at canonical.com-20060913055352-4d8ccca5a3841600
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 15:54:19 +1000
message:
Merge Start and stop bzr subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055352-4d8ccca5a3841600
parent: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
parent: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Smart transport server and client
timestamp: Wed 2006-09-13 15:53:52 +1000
message:
Merge Start and stop bzr subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913044833-6d54576583f4d7bd
parent: andrew.bennetts at canonical.com-20060913035313-30489d7505552ad9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 14:48:33 +1000
message:
Add a doc on "Running a Bazaar Server" (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913035313-30489d7505552ad9
parent: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 13:53:13 +1000
message:
Add SSH support.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
parent: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Tue 2006-09-12 16:47:51 +1000
message:
Add a new method ``Transport.get_smart_client()``. This is provided to allow
upgrades to a richer interface than the VFS one provided by Transport. (Andrew
Bennetts, Martin Pool)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Smart transport server and client
timestamp: Tue 2006-09-12 16:22:31 +1000
message:
Support bzr:// urls to work with the new RPC-based transport which will be used
with the upcoming high-performance smart server. The new command ``bzr serve``
will invoke bzr in server mode, which processes these requests. (Andrew
Bennetts, Robert Collins, Martin Pool)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 00:39:42 +0100
message:
(spiv,jam) fallback to Paramiko if ssh is not available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
parent: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:23:44 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
parent: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:18:19 -0500
message:
Add a test that we can always fall back to the paramiko vendor
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:05:19 -0500
message:
[merge] Andrew Bennetts: fixes for _get_ssh_vendor()
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-ssh-fixes
timestamp: Wed 2006-09-13 22:44:46 +1000
message:
Fix NameError reported by Alexander Belchenko.
This also fixes some other nits so that pyflakes now gives completely
clean output for sftp.py and ssh.py.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
parent: john at arbash-meinel.com-20060914192015-c1ec551d8f12bc7e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 18:14:38 +0100
message:
(jam,moy) skip tests when dependencies aren't available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914192015-c1ec551d8f12bc7e
parent: john at arbash-meinel.com-20060914191856-dfdf8d312ba5c0e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Thu 2006-09-14 14:20:15 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914191856-dfdf8d312ba5c0e3
parent: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
parent: Matthieu.Moy at imag.fr-20060909164309-4fdfb7759964c51b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Thu 2006-09-14 14:18:56 -0500
message:
[merge] Matthieu Moy: updates to skipping setup.py test
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060909164309-4fdfb7759964c51b
parent: Matthieu.Moy at imag.fr-20060909162811-116ee7c027bdb073
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.skip-test-setup
timestamp: Sat 2006-09-09 18:43:09 +0200
message:
Test for the presence of the Makefile
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060909162811-116ee7c027bdb073
parent: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.skip-test-setup
timestamp: Sat 2006-09-09 18:28:11 +0200
message:
jam's first try
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
parent: john at arbash-meinel.com-20060909155019-0ea9be294a2a0ca3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Sat 2006-09-09 10:51:54 -0500
message:
Skip tests that require paramiko (or think they do)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155019-0ea9be294a2a0ca3
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Sat 2006-09-09 10:50:19 -0500
message:
Skip the setup tests if they don't have distutils.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
parent: pqm at pqm.ubuntu.com-20060915023821-c5c8891c3a7fc98f
parent: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 04:10:26 +0100
message:
(Andrew Bennetts, Robert Collins) Create a new test helper start_bzr_subprocess which is paired with finish_bzr_subprocess, allowing tests that need to interact with the upcoming bzr serve command.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
parent: andrew.bennetts at canonical.com-20060915015604-7a2c896892577c63
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 12:04:56 +1000
message:
Add skip_if_plan_to_signal flag to start_bzr_subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915015604-7a2c896892577c63
parent: andrew.bennetts at canonical.com-20060915012539-34efe857110f4ffc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:56:04 +1000
message:
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915012539-34efe857110f4ffc
parent: andrew.bennetts at canonical.com-20060915010327-9a82c824fe58fc00
parent: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:25:39 +1000
message:
Merge from extra transport tests
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915010327-9a82c824fe58fc00
parent: andrew.bennetts at canonical.com-20060915005252-ef68d419511c6c73
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:03:27 +1000
message:
Use sys.stdout consistently, rather than mixed with print.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915005252-ef68d419511c6c73
parent: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
parent: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 10:52:52 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
parent: andrew.bennetts at canonical.com-20060913064003-968d976096934580
parent: andrew.bennetts at canonical.com-20060913132246-aa988489fa35ced1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 23:34:45 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913132246-aa988489fa35ced1
parent: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
parent: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Wed 2006-09-13 23:22:46 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064003-968d976096934580
parent: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
parent: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 16:40:03 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
parent: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Wed 2006-09-13 16:39:41 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 15:52:29 +1000
message:
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
running concurrently with a subprocess of bzr. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
parent: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Thu 2006-08-31 19:24:07 +1000
message:
Change TestCaseWithTransport.get_url so that test_add_in_nonascii_branch passes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915023821-c5c8891c3a7fc98f
parent: pqm at pqm.ubuntu.com-20060915013127-9c6755fb4c48456e
parent: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 03:38:21 +0100
message:
(Martin Pool) Make it optional for transports to implement lock_read and lock_write by testing that they either work or raise TransportNotPossible.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
parent: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
parent: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 11:25:25 +1000
message:
Merge from extra transport tests
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
parent: andrew.bennetts at canonical.com-20060915003856-698df72c7e9cf2b0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 10:45:12 +1000
message:
Update Transport.abspath docstring.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915003856-698df72c7e9cf2b0
parent: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
parent: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 10:38:56 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
parent: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
parent: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-09-13 22:56:39 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
parent: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
parent: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-09-13 16:39:31 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
parent: andrew.bennetts at canonical.com-20060830063450-82e8f60ce2bc67fc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-08-30 16:54:56 +1000
message:
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830063450-82e8f60ce2bc67fc
parent: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-08-30 16:34:50 +1000
message:
lock_read and lock_write may raise TransportNotPossible.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915013127-9c6755fb4c48456e
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
parent: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 02:31:27 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Ensure consistent behaviour at the root of transports for clone/abspath.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
parent: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Fri 2006-09-15 11:12:18 +1000
message:
Fix the FTP transport's handling of abspath('/')
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
parent: andrew.bennetts at canonical.com-20060914074125-53a230e52cd76c31
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 23:07:57 +1000
message:
Merge from preserve transport when creating bzrdir
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914074125-53a230e52cd76c31
parent: andrew.bennetts at canonical.com-20060914071239-caffd8e71f43ec4b
parent: andrew.bennetts at canonical.com-20060914074113-2a1ac195e4b0888e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 17:41:25 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914074113-2a1ac195e4b0888e
parent: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
parent: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Thu 2006-09-14 17:41:13 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914071239-caffd8e71f43ec4b
parent: andrew.bennetts at canonical.com-20060914062800-033348f8dbfb3db1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 17:12:39 +1000
message:
Put url in 'invalid port number' message on a new line.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914062800-033348f8dbfb3db1
parent: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
parent: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 16:28:00 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
parent: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Thu 2006-09-14 16:09:05 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
parent: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-09-13 22:32:47 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
parent: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-09-13 16:38:44 +1000
message:
Transport behaviour at the root of the URL is now defined and tested.
(Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
parent: andrew.bennetts at canonical.com-20060830055126-c5217a1ab701d0ae
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 16:19:59 +1000
message:
Make SFTPTransport._remote_path do the right thing with absolute paths (and thus make it pass tests.)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830055126-c5217a1ab701d0ae
parent: andrew.bennetts at canonical.com-20060830053114-cf8a726b4c99a401
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:51:26 +1000
message:
Make memory transport pass tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830053114-cf8a726b4c99a401
parent: andrew.bennetts at canonical.com-20060830051859-0a29e4526c6c7ab1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:31:14 +1000
message:
Fix SFTPTransport to pass the new abspath tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830051859-0a29e4526c6c7ab1
parent: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:18:59 +1000
message:
More tests for abspath and clone behaviour
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
parent: pqm at pqm.ubuntu.com-20060914061322-e7009c1bca0f6df8
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 09:59:36 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Allow make_bzrdir on TestCaseWithTransport to create it correctly on all transports, allowing directory formats that require a non-local transport to be testable.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
parent: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 18:07:20 +1000
message:
Merge from workingtree-creation-bug-fix.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
parent: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-09-13 22:07:13 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-08-30 12:53:00 +1000
message:
Fix to make_branch_and_tree's behavior when used with an sftp transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 17:23:40 +1000
message:
Fix TestCaseWithTransport.get_url so that e.g. test_nonascii passes.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
parent: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:03:41 +1000
message:
Do slightly less splitting.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:00:17 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-09-13 22:02:33 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-08-30 12:44:47 +1000
message:
Make make_bzrdir preserve the transport.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914061322-e7009c1bca0f6df8
parent: pqm at pqm.ubuntu.com-20060914054513-56edb058a4b64088
parent: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 07:13:22 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Make BzrNewError more robust against usage bugs - catch TypeError for badly type format strings.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
parent: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:51:28 +1000
message:
Add test for BzrNewError.__str__ error handling.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:35:04 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-09-13 21:31:49 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-08-30 12:33:36 +1000
message:
Catch TypeError in BzrNewError.__str__, and print more information if an exception happens in that.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914054513-56edb058a4b64088
parent: pqm at pqm.ubuntu.com-20060914050813-98851d72ff5fc45a
parent: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 06:45:13 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Refactor BzrDir.open and BzrDir.open_containing_from_transport to use a single common helper open_from_transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
parent: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:30 +1000
message:
Add tests for BzrDir.open_from_transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
parent: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:20 +1000
message:
Merge from cosmetic
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:18:19 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Wed 2006-09-13 21:14:06 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Tue 2006-08-29 18:16:22 +1000
message:
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914050813-98851d72ff5fc45a
parent: pqm at pqm.ubuntu.com-20060914045315-d646c86b3f4722f2
parent: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 06:08:13 +0100
message:
(Andrew Bennetts, Robert Collins) sort the output of listdir in add.py, so that adds are in lexographic order, not filesystem order.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:38:45 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:14:48 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Wed 2006-09-13 20:51:26 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Tue 2006-09-12 16:30:01 +1000
message:
Sort os.listdir results in add.py.
Some filesystems (like ext3 with the 'dir_index' option set) don't necessarily
return directory listings in alphabetical order, contrary to what some tests
assume.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914045315-d646c86b3f4722f2
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
parent: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 05:53:15 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Various cosmetic improvements to docstrings and comments throughout bzrlib.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:33:22 +1000
message:
Re-instate copy import, which is actually needed.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
parent: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:10:40 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 13:28:14 +1000
message:
Expand comment about lock_read/lock_write.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Wed 2006-09-13 20:36:03 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
parent: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: list_dir return type
timestamp: Wed 2006-09-13 20:03:10 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
parent: andrew.bennetts at canonical.com-20060829012540-e6285c443460fa06
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sftp refactoring 2
timestamp: Wed 2006-09-13 19:40:56 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Tue 2006-08-29 18:12:53 +1000
message:
Various cosmetic changes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: john at arbash-meinel.com-20060913021602-3a0be26095515136
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 03:27:00 +0100
message:
(jam) lazy_import module allows on-demand loading of objects, can help startup time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913021602-3a0be26095515136
parent: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:16:02 -0500
message:
Add a test for side-effects from using ScopeReplacer
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
parent: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:09:37 -0500
message:
Update HACKING and docstrings
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
parent: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:57:42 -0500
message:
[merge] bzr.dev 2003
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:52:31 -0500
message:
cherry-pick the inspect_for_copy changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
parent: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 18:10:13 -0500
message:
Clean up comment as suggested by Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
parent: john at arbash-meinel.com-20060912203631-00b158854d709a81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 17:02:02 -0500
message:
Update --profile-imports to support the new lazy_import code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912203631-00b158854d709a81
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 15:36:31 -0500
message:
fix typo
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912193702-22c752299731a663
parent: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:37:02 -0500
message:
HACKING and NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
parent: john at arbash-meinel.com-20060912184249-83efc58bcc327550
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:07:27 -0500
message:
Write a simple wrapper function to make lazy imports easy.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912184249-83efc58bcc327550
parent: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 13:42:49 -0500
message:
Add more structured error handling
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
parent: john at arbash-meinel.com-20060912173323-112d28652516fd94
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:34:52 -0500
message:
Small cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173323-112d28652516fd94
parent: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:33:23 -0500
message:
Raise an exception when ScopeReplacer has been misused
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
parent: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 19:31:09 -0500
message:
Everything is now hooked up
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
parent: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 18:28:01 -0500
message:
Add tests for converting from a string to the final map
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
parent: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:55:35 -0500
message:
small test updates
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
parent: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:48:57 -0500
message:
Switch from individual functions to a class
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
parent: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:43:13 -0500
message:
Test the ability to take a bunch of import lines and canonicalize them
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
parent: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:09:06 -0500
message:
Handle 'from foo import bar' syntax
This includes:
from foo import bar
from foo import bar, baz
from foo import bar as bing, baz as bar
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
parent: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 16:56:26 -0500
message:
Create a method for handling 'import *' syntax.
This handles:
import foo
import foo.bar
import foo.bar as baz
import foo, foo.bar, baz.bing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
parent: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:53:44 -0500
message:
Split up TestImportReplacer into a helper class
Getting ready to test a simple import line parser.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
parent: john at arbash-meinel.com-20060911201045-2a703743d89ce392
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:51:55 -0500
message:
Test a nested import with multiple deep children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911201045-2a703743d89ce392
parent: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:10:45 -0500
message:
Test that we can add more children to the existing lazy object
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
parent: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:03:50 -0500
message:
Test that we can lazy import a module, and its children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
parent: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 14:55:18 -0500
message:
Change how parameters are passed to support 'import root1.mod1 as mod1'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
parent: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 16:20:31 -0500
message:
Basic single-level imports work
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
parent: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:59:01 -0500
message:
start working on some lazy importing code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:39:26 -0500
message:
Adding a ScopeReplacer class, which can replace itself on demand
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 00:56:34 +0100
message:
(jam) add more verbose logging when run_bzr_subprocess fails
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:58:07 -0500
message:
Add more verbose output when run_bzr_subprocess fails
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 23:51:50 +0100
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
parent: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:05:26 -0500
message:
[merge] typo fix from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-09-12 21:25:01 +0000
message:
Fix typo in encoding warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 16:56:31 -0500
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-09-04 01:59:19 +0100
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-09-04 10:47:38 +1000
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Tue 2006-08-29 02:04:26 +0100
message:
The bzr selftest was failing on installed versions due to a bug in a new
------------------------------------------------------------
merged: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Tue 2006-08-29 10:52:14 +1000
message:
The bzr selftest was failing on installed versions due to a bug in a new
test helper. (John Arbash Meinel, Robert Collins, #58057)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
parent: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-08-28 02:17:24 +0100
message:
(robertc) Update version strings for 0.10rc1.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-08-28 11:03:33 +1000
message:
Update version strings for 0.10rc1.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 16:39:32 +0100
message:
(vila) Fix bug #59835: avoid e.code for URLErrors
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
parent: john at arbash-meinel.com-20060912152802-64ced185121942af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:29:07 -0500
message:
NEWS for fixing bug #59835
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152802-64ced185121942af
parent: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:28:02 -0500
message:
Update the urllib.has test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:23:25 -0500
message:
[merge] vila: fix bug #59835 with test
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
committer: v.ladeuil+lp at free.fr
branch nick: bug.59835
timestamp: Tue 2006-09-12 12:54:46 +0200
message:
Fix bug 59835 with test.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.has): Only HTTPError have a 'code'
attribute. Separate them from URLError exceptions.
* bzrlib/tests/test_http.py:
(TestHttpConnections_urllib.test_bogus_host): Check that an
URLError can be raised safely.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 02:40:25 +0100
message:
(robertc) Partial fix for bug #39542 - allow lightweight checkouts over http.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
parent: robertc at robertcollins.net-20060910234217-0ae24d8e666d60d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: anonymous lightweight checkout
timestamp: Mon 2006-09-11 09:56:57 +1000
message:
``bzr checkout --lightweight`` now operates on readonly branches as well
as readwrite branches. This fixes bug #39542 for lightweight checkouts
but not for heavyweight ones (the default). (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910234217-0ae24d8e666d60d6
parent: robertc at robertcollins.net-20060910225337-eeb90bb6ebad85d0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: convert-tree-decorators
timestamp: Mon 2006-09-11 09:42:17 +1000
message:
All WorkingTree methods which write to the tree, but not to the branch
have been converted to use ``needs_tree_write_lock`` rather than
``needs_write_lock``. Also converted is the revert, conflicts and tree
transform modules. This provides a modest performance improvement on
metadir style trees, due to the reduce lock-acquisition, and a more
significant performance improvement on lightweight checkouts from
remote branches, where trivial operations used to pay a significant
penalty. It also provides the basis for allowing readonly checkouts.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910225337-eeb90bb6ebad85d0
parent: robertc at robertcollins.net-20060910225011-c46f2b78a0f5cb7d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: lock_tree_write
timestamp: Mon 2006-09-11 08:53:37 +1000
message:
Update NEWS too.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060910225011-c46f2b78a0f5cb7d
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Robert Collins <robertc at robertcollins.net>
branch nick: lock_tree_write
timestamp: Mon 2006-09-11 08:50:11 +1000
message:
Add WorkingTree.lock_tree_write.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: john at arbash-meinel.com-20060911162245-225331216fd26a9f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 17:55:31 +0100
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911162245-225331216fd26a9f
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-09-11 11:22:45 -0500
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
parent: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:34:51 +0200
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 14:03:10 +0530
message:
Better testcase for revno:N:branch/path error.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
parent: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:57:14 +0530
message:
Made merge work with two revisions in different branches.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
parent: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:28:50 +0530
message:
Canceled an incorrect "path = None".
Indeed, the "path" problem is managed in the revisionspec for revno:N:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
parent: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:37:02 +0530
message:
Cut long lines, prevent "path" component from being used in revno:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
parent: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:28:15 +0530
message:
missing newline
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
parent: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:26:03 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-08-28 12:17:41 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:26:10 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:18:23 +0530
message:
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
parent: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 16:54:13 +0530
message:
Explain the error messages in the code.
Keep the errors for merge and log called with two revno:N:path with
different paths, but add a comment to explain why.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
parent: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:43:16 +0530
message:
bzr cat now works nicely with revno:N:path too
(even outside a branch or working tree).
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
parent: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:01:40 +0530
message:
Make log work nicely with revno:N:path too.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 20:39:48 +0530
message:
Fixed merge to work nicely with -r revno:N:path
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 16:25:32 +0100
message:
(jam) save a round trip during locking using put_bytes_non_atomic
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
parent: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:52:19 -0500
message:
Use Stanza.to_string() rather than a RioWriter
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:10:07 -0500
message:
Use put_file_non_atomic in lockdir() to save some sftp round trips
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-10 19:57:20 +0100
message:
Add new format to support nested trees
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
parent: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 22:18:31 -0400
message:
Update from review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
parent: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 14:52:57 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 18:25:18 -0400
message:
Whitespace fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
parent: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:59 -0400
message:
Support experimental knit2 at commandline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
parent: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:18 -0400
message:
Retrieve only 500 revision trees at once
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
parent: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:49:47 -0400
message:
Merge from other branch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-25 12:18:48 -0400
message:
Handle inventories with no revision_ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:18:43 -0400
message:
Restore RepositoryFormatKnit1 as the default
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:06:46 -0400
message:
Clean up clone format creation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
parent: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 17:51:05 -0400
message:
Stopped sprout from setting repository_format on _matchingbzrdir
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
parent: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 15:59:56 -0400
message:
Fix checkout bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
parent: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:58:29 -0400
message:
Fix info test to use knit1 for bound branches
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
parent: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:37:24 -0400
message:
Handle empty commits, fix test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
parent: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 12:45:00 -0400
message:
Get upgrade from format4 under test and fixed for all formats
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
parent: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 11:49:07 -0400
message:
Better fix for convesion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
parent: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:56:26 -0400
message:
Ensure we get a Knit1 in conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
parent: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:48:07 -0400
message:
Fix default format test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
parent: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:40:32 -0400
message:
Handle capital-letter file-ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
parent: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 23:35:48 -0400
message:
Fix bugs in basis inventory handling, change filename
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
parent: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:42:06 -0400
message:
Make RepositoryFormatKnit2 the default (for testing)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
parent: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:13:34 -0400
message:
Fix up sprout, nuke workaround
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
parent: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 14:17:36 -0400
message:
Fix sprout for fileid involved test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
parent: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:50:17 -0400
message:
Fixed conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
parent: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:08:20 -0400
message:
Fix up some test cases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
parent: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: pqm at pqm.ubuntu.com-20060823140849-674057caaed0edc0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:33:40 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:21:19 -0400
message:
Got intra-repository fetch working between model1 and 2 for all types
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
parent: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 09:15:45 -0400
message:
Fix up test cases that manually construct inventories
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
parent: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 00:25:06 -0400
message:
Make commits preserve root entry data
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
parent: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Tue 2006-08-22 18:44:21 -0400
message:
Remove workingtree 4 for now
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
parent: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 17:50:47 -0400
message:
Add WorkingTreeFormat4
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
parent: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 16:37:53 -0400
message:
Test whether revision id for root is retained
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
parent: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:40:32 -0400
message:
Implement creation of knits for tree roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
parent: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:11:46 -0400
message:
Get fetching from 1 to 2 under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
parent: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: pqm at pqm.ubuntu.com-20060822164041-3ff8e0735c0cb7c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:57:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:14:17 -0400
message:
Back out inter.get changes, make optimizers an ordered list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
parent: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-18 16:53:05 -0400
message:
Fail when trying to use interrepository on Knit2 and Knit1
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
parent: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 18:02:30 -0400
message:
Start work on converter
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
parent: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 15:51:54 -0400
message:
Implement knit repo format 2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
parent: aaron.bentley at utoronto.ca-20060817013139-9f128dc0fbddadca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-17 08:06:34 -0400
message:
Start work on Knit format 2
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
parent: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: robey at lag.net-20060908185217-6a4406e1d41753f5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 19:02:00 +0100
message:
(robey) remove hasattr and == None in favor of getattr() and is None
------------------------------------------------------------
merged: robey at lag.net-20060908185217-6a4406e1d41753f5
parent: robey at lag.net-20060908184629-e3fc4c61ca21508c
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Fri 2006-09-08 11:52:17 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060908184629-e3fc4c61ca21508c
parent: robey at lag.net-20060903002818-71ca5c7bfea93a26
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Fri 2006-09-08 11:46:29 -0700
message:
pychecker is on crack; go back to using 'is None'.
------------------------------------------------------------
merged: robey at lag.net-20060903002818-71ca5c7bfea93a26
parent: robey at lag.net-20060903001354-1f596a529c9c4934
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 17:28:18 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060903001354-1f596a529c9c4934
parent: robey at lag.net-20060902222155-1d1ed3d3c31120ee
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 17:13:54 -0700
message:
remove usage of hasattr
------------------------------------------------------------
merged: robey at lag.net-20060902222155-1d1ed3d3c31120ee
parent: robey at lag.net-20060830022017-53f9005cacd0b1e2
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Sat 2006-09-02 15:21:55 -0700
message:
be explicit about the deprecation of setup_caching and remove no-op destructor
------------------------------------------------------------
merged: robey at lag.net-20060830022017-53f9005cacd0b1e2
parent: robey at lag.net-20060829204702-6d40ae7a33ec62c7
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.no_has_key
timestamp: Tue 2006-08-29 19:20:17 -0700
message:
make return (x in y) explicit with parens
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: pqm at pqm.ubuntu.com-20060909154533-ffb28f628144941d
parent: john at arbash-meinel.com-20060909155501-3d39643be1accab1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 17:04:18 +0100
message:
(jam) remove more env vars than just LANG
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155501-3d39643be1accab1
parent: john at arbash-meinel.com-20060909153900-a7d8b960eaac71d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-09 10:55:01 -0500
message:
Unset a few other LANG type variables when spawning diff
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909153900-a7d8b960eaac71d6
parent: john at arbash-meinel.com-20060902152121-2aa9f40fccfc8cb5
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-09 10:39:00 -0500
message:
[merge] bzr.dev 1993
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902152121-2aa9f40fccfc8cb5
parent: john at arbash-meinel.com-20060902151948-be48553dd9b43625
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:21:21 -0500
message:
Update locale tests to remove more env vars
Some systems have LC_ALL or LC_CTYPE setup, which overrides LANG.
Now we remove them, to give us a cleaner testing area.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902151948-be48553dd9b43625
parent: john at arbash-meinel.com-20060902151815-1c0aa36eb69e0a60
parent: john at arbash-meinel.com-20060902150748-720dd94b32896aac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:19:48 -0500
message:
[merge] run_bzr_subprocess fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060902151815-1c0aa36eb69e0a60
parent: john at arbash-meinel.com-20060828150419-f5077aa755c10f88
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locale-35392
timestamp: Sat 2006-09-02 10:18:15 -0500
message:
[merge] bzr.dev 1981
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060909154533-ffb28f628144941d
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
parent: john at arbash-meinel.com-20060909140450-787dc70dce713090
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-09 16:45:33 +0100
message:
(jam) add a tutorial on centralized workflow
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909140450-787dc70dce713090
parent: john at arbash-meinel.com-20060830195010-96618b54d5a83404
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: documentation
timestamp: Sat 2006-09-09 09:04:50 -0500
message:
Adding a footnote to help understand nesting
------------------------------------------------------------
merged: john at arbash-meinel.com-20060830195010-96618b54d5a83404
parent: pqm at pqm.ubuntu.com-20060828164122-9c1715bd268374ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: documentation
timestamp: Wed 2006-08-30 14:50:10 -0500
message:
Adding basic documentation about working with a central repository
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
parent: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-08 01:38:11 +0100
message:
(robertc) Deprecate WorkingTree.pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-08 10:19:48 +1000
message:
Merge bzr.dev and undeprecated WorkingTree.last_revision as per review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905231840-bd95f673d0205a81
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:44:49 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:15:30 +1000
message:
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.
Please use the get_parent_ids (introduced in 0.10) method instead.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
parent: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905230133-2c68611e38fd7922
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:08:03 +1000
message:
Merge improved test deprecation helpers, simplifying handling of deprecated WorkingTree function tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 19:49:40 +1000
message:
Deprecated WorkingTree.pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
parent: robertc at robertcollins.net-20060905052834-d84078bf055d0345
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 18:14:23 +1000
message:
Deprecate WorkingTree.last_revision.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905052834-d84078bf055d0345
parent: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: pqm at pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 15:28:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-01 14:17:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: pqm at pqm.ubuntu.com-20060830043844-d570350402a5ad15
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 16:39:01 +1000
message:
sync with bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060830041458-c0b772f8932bf454
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 14:36:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060811120610-ae75892349d3f2e4
parent: robertc at robertcollins.net-20060825065618-75b5d54af758e21b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-08-25 16:56:44 +1000
message:
Merge bzr.dev and fully converted uses of new parents api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 14:45:31 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Thu 2006-09-14 16:18:29 +1000
message:
Bugfix - the name of the test for make_branch_and_memory_tree was wrong.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:52:09 +1000
message:
25/home/robertc/source/baz/test-performance/bzrlib/tests/test_ancestry.py performance win for tests in test_ancestry.py.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
parent: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:28:12 +1000
message:
Merge MemoryTree branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
parent: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Thu 2006-09-14 13:27:17 +1000
message:
Add MemoryTree.last_revision.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
parent: robertc at robertcollins.net-20060907233310-c8d52c742057aff5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:36:40 +1000
message:
Update NEWS.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233310-c8d52c742057aff5
parent: robertc at robertcollins.net-20060907233128-2602099e86422c10
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:33:10 +1000
message:
Fixup deprecations from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233128-2602099e86422c10
parent: robertc at robertcollins.net-20060907231308-fc41d15bb7218fe1
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:31:28 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
parent: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: robertc at robertcollins.net-20060907225055-1651b407b395fd48
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-08 00:06:08 +0100
message:
(robertc) Improve performance of bzr commit by eliminating the need for one inventory parse.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907225055-1651b407b395fd48
parent: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: robertc at robertcollins.net-20060907222825-b2a11f240a09a474
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-09-08 08:50:55 +1000
message:
Merge comit performance improvement.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907222825-b2a11f240a09a474
parent: robertc at robertcollins.net-20060907084618-fae5efc1ca3c108d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Fri 2006-09-08 08:28:25 +1000
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907084618-fae5efc1ca3c108d
parent: robertc at robertcollins.net-20060907081744-e0a9ba051e0194bd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:46:18 +1000
message:
When an entire subtree has been deleted, commit will now report that
just the top of the subtree has been deleted, rather than reporting
all the individual items. (Robert Collins)
Commit performs one less XML parse. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907081744-e0a9ba051e0194bd
parent: robertc at robertcollins.net-20060907081322-976bb2fb48de4f0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:17:44 +1000
message:
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907081322-976bb2fb48de4f0f
parent: robertc at robertcollins.net-20060907074457-ac9dbaab35e6ddab
parent: robertc at robertcollins.net-20060907080558-d3e2a01c00d3d4dd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:13:22 +1000
message:
Merge in commit test case for deletion-heuristic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907080558-d3e2a01c00d3d4dd
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-commit-of-deleted-subtrees
timestamp: Thu 2006-09-07 18:05:58 +1000
message:
Add test case to ensure that the working tree inventory and disk state is correctly update when commit is removing directory entries.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907074457-ac9dbaab35e6ddab
parent: robertc at robertcollins.net-20060907073151-24ad889e938b4b05
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 17:44:57 +1000
message:
Add test script I forgotten - doh.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907073151-24ad889e938b4b05
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 17:31:51 +1000
message:
WorkingTree has a new api ``unversion`` which allow the unversioning of
entries by their file id. (Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: pqm at pqm.ubuntu.com-20060907204720-3a4f5b7276ad0948
parent: john at arbash-meinel.com-20060907214121-09d5878b96e58f58
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-07 23:29:38 +0100
message:
(jam) separate out test working from test home
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907214121-09d5878b96e58f58
parent: john at arbash-meinel.com-20060907214033-40618bdf709145ef
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:41:21 -0500
message:
fix the home_is_not_working test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907214033-40618bdf709145ef
parent: john at arbash-meinel.com-20060907213743-89623fc3adbb9b86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:40:33 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907213743-89623fc3adbb9b86
parent: john at arbash-meinel.com-20060907213158-71df9bbd07474d1d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:37:43 -0500
message:
Remove the unneeded _set_user_ignores(['./.bazaar']) now that home has moved
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907213158-71df9bbd07474d1d
parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:31:58 -0500
message:
Update the test suite to put HOME in a different directory
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907204720-3a4f5b7276ad0948
parent: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
parent: john at arbash-meinel.com-20060907203743-52d89f3d2b38225b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-07 21:47:20 +0100
message:
(jam) Update how we cleanup the environment, and run_bzr_subprocess can take universal_newlines=True
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907203743-52d89f3d2b38225b
parent: john at arbash-meinel.com-20060907202907-17d6b3f3bd42b5b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:37:43 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907202907-17d6b3f3bd42b5b1
parent: john at arbash-meinel.com-20060907202017-025a3518df901ea5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:29:07 -0500
message:
Add a universal_newlines flag to run_bzr_subprocess, so we can be line-ending independent for tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907202017-025a3518df901ea5
parent: john at arbash-meinel.com-20060906153336-0da656a7714f07a9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:20:17 -0500
message:
import sys in gpg.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906153336-0da656a7714f07a9
parent: john at arbash-meinel.com-20060906153211-9519b9dfdf3daf60
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Wed 2006-09-06 10:33:36 -0500
message:
Update NEWS that we shouldn't use preexec_fn on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906153211-9519b9dfdf3daf60
parent: john at arbash-meinel.com-20060905141157-09649d57bb9cf247
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Wed 2006-09-06 10:32:11 -0500
message:
Don't use preexec_fn on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905141157-09649d57bb9cf247
parent: john at arbash-meinel.com-20060905140658-85f905ffc247730f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 09:11:57 -0500
message:
Switch to directly setting the env, and cleaning it up. So that it works on all platforms
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905140658-85f905ffc247730f
parent: john at arbash-meinel.com-20060905135730-d51221405aa03eb2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 09:06:58 -0500
message:
Use the new helper function in a few places
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905135730-d51221405aa03eb2
parent: john at arbash-meinel.com-20060902150748-720dd94b32896aac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 08:57:30 -0500
message:
Create an osutils helper function for modifying the environment
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
parent: john at arbash-meinel.com-20060906215658-422a15bab820945c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 23:55:29 +0100
message:
(jam) delay creating knit contents for significantly better new commit and push performance
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906215658-422a15bab820945c
parent: john at arbash-meinel.com-20060906215139-48d4e17bcf86a97c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:56:58 -0500
message:
Small cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906215139-48d4e17bcf86a97c
parent: john at arbash-meinel.com-20060906214940-d46dc5bd454672ad
parent: john at arbash-meinel.com-20060906214549-1ac6815d44926e1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:51:39 -0500
message:
Fix the sftp mkdir mode code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906214549-1ac6815d44926e1a
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp_mode_bits
timestamp: Wed 2006-09-06 16:45:49 -0500
message:
Restore mode bit tests for sftp, and track down bugs
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906214940-d46dc5bd454672ad
parent: john at arbash-meinel.com-20060906205407-7daa22adaea61492
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:49:40 -0500
message:
Pass in the directory mode to the knit
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906205407-7daa22adaea61492
parent: john at arbash-meinel.com-20060906204245-2c4b8481f344d692
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 15:54:07 -0500
message:
Test that passing modes does the right thing for knits.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906204245-2c4b8481f344d692
parent: john at arbash-meinel.com-20060906152328-aa73b664a5f17eb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 15:42:45 -0500
message:
Add ability to pass a directory mode to non_atomic_put
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906152328-aa73b664a5f17eb3
parent: john at arbash-meinel.com-20060906152150-25d59d381a869186
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 10:23:28 -0500
message:
Update NEWS, since commit is faster too
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906152150-25d59d381a869186
parent: john at arbash-meinel.com-20060905231850-c870288bfb3fcab8
parent: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 10:21:50 -0500
message:
[merge] up-to-date with Transport.put_*_non_atomic
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905231850-c870288bfb3fcab8
parent: john at arbash-meinel.com-20060905230922-6ed11ce0a4b04065
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Tue 2006-09-05 18:18:50 -0500
message:
NEWS about fixing bug #44692
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905230922-6ed11ce0a4b04065
parent: john at arbash-meinel.com-20060818231423-6daa262d1263c896
parent: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Tue 2006-09-05 18:09:22 -0500
message:
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818231423-6daa262d1263c896
parent: john at arbash-meinel.com-20060818225219-6f4bfa3870d716b7
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 18:14:23 -0500
message:
[merge] bzr.dev 1948
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818225219-6f4bfa3870d716b7
parent: john at arbash-meinel.com-20060818225138-6c93f68102a6c579
parent: john at arbash-meinel.com-20060818164853-eb25e4db3385e216
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:52:19 -0500
message:
[merge] sftp benchmarks
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818225138-6c93f68102a6c579
parent: john at arbash-meinel.com-20060818224609-e4cbe8bdb33bdd34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:51:38 -0500
message:
Make knit stores delay creation, but not control stores
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818224609-e4cbe8bdb33bdd34
parent: john at arbash-meinel.com-20060818222925-fea833eabf8277b1
parent: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:46:09 -0500
message:
[merge] transport-non-atomic-put
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818222925-fea833eabf8277b1
parent: john at arbash-meinel.com-20060818222437-03dd852ab6d65995
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:29:25 -0500
message:
Pass around the file mode correctly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818222437-03dd852ab6d65995
parent: john at arbash-meinel.com-20060818221703-958786fafe340fd9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:24:37 -0500
message:
test delay_create does the right thing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818221703-958786fafe340fd9
parent: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:17:03 -0500
message:
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907231308-fc41d15bb7218fe1
parent: robertc at robertcollins.net-20060906011108-466432bcfcb4eb2b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:13:08 +1000
message:
Various changes to allow non-workingtree specific tests to run entirely
from MemoryTransports:
* Create MemoryTree and pull up common code for it from WorkingTree to
a new common base class MutableTree.
* Add MutableTree.mkdir().
* Add MutableTree.put_file_bytes_nonatomic().
* New test helper make_branch_and_memory_tree().
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060906011108-466432bcfcb4eb2b
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Wed 2006-09-06 11:11:08 +1000
message:
Move test_branch_on_vfat into a repository implementation test, to ensure that all repository formats are safe on vfat.
More information about the bazaar-commits
mailing list