Rev 1745: Resolve conflicts with bzr.dev. in file:///home/robertc/source/baz/pyrex/
Robert Collins
robertc at robertcollins.net
Mon Apr 23 03:29:48 BST 2007
At file:///home/robertc/source/baz/pyrex/
------------------------------------------------------------
revno: 1745
revision-id: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
parent: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Mon 2007-04-23 12:29:35 +1000
message:
Resolve conflicts with bzr.dev.
removed:
NEWS.developers NEWS.developers-20050919074335-ad69ad48eec18028
build-api build-api-20050309064830-a0be0dc1452cda87
added:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/ smart-20061101100241-u0wzhkl4sjwmuzhd-1
bzrlib/smart/__init__.py __init__.py-20061101100249-8jwwl0d3jr080zim-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/per_lock/ bzrlibtestsper_lock-20070314195914-llb0phfp2laomqb3-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/per_lock/test_lock.py test_lock.py-20070313190612-mfpoa7t8kvrgrhj2-1
bzrlib/tests/per_lock/test_temporary_write_lock.py test_temporary_write-20070314233412-xp3ocbyvw3woa03w-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070411212918-dhentj8gk0hsu54z-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
man1/ man1-20070418045910-74ew7wm1oqo2tfv0-1
tools/bzr_epydoc bzr_epydoc-20070409231252-ec7uffstn62q7nhv-1
tools/bzr_epydoc_uid.py bzr_epydoc_uid.py-20070409231252-ec7uffstn62q7nhv-2
renamed:
bzrlib/transport/smart.py => bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
HACKING HACKING-20050805200004-2a5dc975d870f78c
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
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/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
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_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
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/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/lock_helpers.py LockHelpers.py-20060707151933-tav3o2hpibwi53u4-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
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/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_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_commands.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_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_identitymap.py testidentitymap.py-20051007040721-37936d473bd1ac51
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
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/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
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/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 1739.1.584.1.118
merged: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
parent: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 03:09:44 +0100
message:
(robertc) Fix bugs 107656 and 50408 by creating multiple help indices and cross referencing between them when user help requests are ambiguous. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.109.1.33
merged: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
parent: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-23 11:41:05 +1000
message:
Fix tests broken by deprecation of help.command_usage.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.32
merged: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
parent: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-23 10:28:58 +1000
message:
Merge up with bzr.dev.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.31
merged: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
parent: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Mon 2007-04-23 10:24:53 +1000
message:
Review feedback and put help.command_usage back in as a deprecated function.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.30
merged: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
parent: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:44:37 +1000
message:
Fix the ModuleHelpTopic get_help_topic to be tested with closer to real world data and strip the bzrlib.plugins. prefix from the name.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.29
merged: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
parent: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:41:57 +1000
message:
Add get_help_topic to ModuleHelpTopic.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.28
merged: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
parent: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:39:19 +1000
message:
Add a get_help_topic method to commands.Command.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.27
merged: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
parent: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:36:58 +1000
message:
Add a get_help_topic method to RegisteredTopic.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.26
merged: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
parent: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:32:28 +1000
message:
NEWS entry for bzr help PLUGINNAME.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.25
merged: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
parent: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 15:30:47 +1000
message:
Return plugin module docstrings for 'bzr help plugin'.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.24
merged: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
parent: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 14:36:09 +1000
message:
Add plugins as a help index.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.23
merged: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
parent: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 14:35:44 +1000
message:
Add a list of shadowed terms to "bzr help term".
------------------------------------------------------------
revno: 1739.1.584.1.109.1.22
merged: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
parent: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 14:08:31 +1000
message:
Teach RegisteredTopic to support the additional_see_also list of related help terms.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.21
merged: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
parent: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 13:54:06 +1000
message:
Teach Command.get_help_text to show additional help cross references when supplied.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.20
merged: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
parent: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 13:39:54 +1000
message:
Modify the result of HelpIndices.search to include the index each result was found in.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.19
merged: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
parent: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 13:32:20 +1000
message:
Ensure each HelpIndex has a unique prefix.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.18
merged: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
parent: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 13:19:49 +1000
message:
Add support for doing bzr help commands/COMMANDNAME.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.17
merged: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
parent: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 13:07:01 +1000
message:
Add prefixes to HelpIndexes.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.16
merged: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
parent: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 12:56:44 +1000
message:
Correct spelling of Indexs to Indices.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.15
merged: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
parent: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 12:48:34 +1000
message:
Rename Context (in bzrlib.help) to Index, for a clearer name.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.14
merged: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
parent: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 12:32:10 +1000
message:
Switch help.help to using HelpContexts completely, fixing bug 107656.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.13
merged: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
parent: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 12:20:05 +1000
message:
HelpCommandContext now implementes get_topics.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.12
merged: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
parent: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 11:57:10 +1000
message:
Relocate command help onto Command.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.11
merged: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
parent: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 11:15:12 +1000
message:
Remove duplication by using the new help infrastructure for topic output.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.10
merged: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
parent: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 11:07:51 +1000
message:
Add get_help_text() to RegisteredTopic to get the help as a string.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.9
merged: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
parent: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:50:34 +1000
message:
Expand HelpContexts documentation.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.8
merged: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
parent: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:45:17 +1000
message:
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.7
merged: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
parent: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:34:03 +1000
message:
HelpContexts.search now returns the found topics.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.6
merged: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
parent: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:30:40 +1000
message:
HelpContexts.search now invokes get_topics on each context.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.5
merged: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
parent: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:18:30 +1000
message:
Initial stub for topic searching.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.4
merged: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
parent: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:14:15 +1000
message:
Add an explicit error for missing help topics.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.3
merged: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
parent: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 10:06:46 +1000
message:
Create a HelpContexts object to do help lookups.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.2
merged: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
parent: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 09:57:17 +1000
message:
Add a HelpCommandContext class for help from commands.
------------------------------------------------------------
revno: 1739.1.584.1.109.1.1
merged: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: help-contexts
timestamp: Fri 2007-04-20 09:54:43 +1000
message:
Add a HelpTopicContext object.
------------------------------------------------------------
revno: 1739.1.584.1.117
merged: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
parent: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
parent: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-04-21 16:11:39 +0100
message:
(John Arbash Meinel) Fix bug #105479: properly handle moving a directory with children that have been added, renamed, removed
------------------------------------------------------------
revno: 1739.1.584.1.115.1.16
merged: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
parent: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Sat 2007-04-21 09:43:19 -0500
message:
NEWS for fixing bug #105479
------------------------------------------------------------
revno: 1739.1.584.1.115.1.15
merged: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
parent: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Sat 2007-04-21 09:39:50 -0500
message:
Remove a superfluous 'else' (recommended by Martin)
------------------------------------------------------------
revno: 1739.1.584.1.115.1.14
merged: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
parent: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:39:53 -0500
message:
Clean up assert helper for missing parent.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.13
merged: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
parent: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:36:30 -0500
message:
Add a test for moving a directory where a child has been moved into a subdir.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.12
merged: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
parent: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:28:56 -0500
message:
Add a test with children that have been swapped
------------------------------------------------------------
revno: 1739.1.584.1.115.1.11
merged: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
parent: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:25:52 -0500
message:
Add a test for moving a directory with a renamed child.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.10
merged: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
parent: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:58:24 -0500
message:
Make WT4.move() properly handle moving a directory with a renamed child.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.9
merged: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
parent: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:56:49 -0500
message:
Add another (failing) test when we move an entry which has a renamed child.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.8
merged: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
parent: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:48:57 -0500
message:
Fix the case when renaming a directory with deleted children.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.7
merged: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
parent: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:42:39 -0500
message:
While in this area, add a test for renaming a directory with removed children.
Which actually currently fails.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.6
merged: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
parent: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:37:09 -0500
message:
Simplify the test since all we require is renaming a newly added entry's parent dir.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.5
merged: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
parent: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:30:42 -0500
message:
Fix the bug by not iterating over the same list we are modifying.
If a record only exists in one tree (current) move_one() will remove it from
the current block. Which means that the block we are
iterating over may change underneath us. So grab a copy before iterating.
Do some other small doc updates.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.4
merged: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
parent: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 13:20:16 -0500
message:
Extend the test slightly.
Oddly enough, both newly added records are moved correctly,
but the existing directory 'c/b/d' is not moved.
------------------------------------------------------------
revno: 1739.1.584.1.115.1.3
merged: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
parent: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 13:13:39 -0500
message:
Add 2 new WT.move() tests, one of which exposes bug #105479
------------------------------------------------------------
revno: 1739.1.584.1.115.1.2
merged: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
parent: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 12:57:13 -0500
message:
Add a check that all entries have a valid parent entry.
If we have a non-absent entry, it must have a valid directory entry as a parent.
(You can't have a present entry in an absent directory, or in a missing dir)
------------------------------------------------------------
revno: 1739.1.584.1.115.1.1
merged: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 11:48:21 -0500
message:
Create an assertion to help track down what the bug is.
------------------------------------------------------------
revno: 1739.1.584.1.116
merged: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
parent: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-04-21 15:47:13 +0100
message:
(erik, bialix, r=john) Tags in long log
------------------------------------------------------------
revno: 1739.1.584.1.65.1.13
merged: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
parent: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Sat 2007-04-21 17:15:08 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.65.1.12
merged: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
parent: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-19 23:01:50 +0300
message:
direct test for tags.get_reverse_tag_dict()
------------------------------------------------------------
revno: 1739.1.584.1.65.1.11
merged: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
parent: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-19 22:28:39 +0300
message:
changes after John's review
------------------------------------------------------------
revno: 1739.1.584.1.65.1.10
merged: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
parent: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-12 14:12:26 +0300
message:
Slightly reworked: use None instead of [] as default tags list; PEP-8
------------------------------------------------------------
revno: 1739.1.584.1.65.1.9
merged: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
parent: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 03:18:00 +0200
message:
test for merges with tags in log
------------------------------------------------------------
revno: 1739.1.584.1.65.1.8
merged: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
parent: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 03:04:57 +0200
message:
Redo based on input from Alexander
------------------------------------------------------------
revno: 1739.1.584.1.65.1.7
merged: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
parent: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 02:13:29 +0200
message:
use , to separate tags in log
------------------------------------------------------------
revno: 1739.1.584.1.65.1.6
merged: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
parent: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Tue 2007-04-10 01:13:40 +0200
message:
change order of log headers
------------------------------------------------------------
revno: 1739.1.584.1.65.1.5
merged: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
parent: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 11:51:17 +0200
message:
[merge] bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.65.1.4
merged: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
parent: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 00:21:23 +0200
message:
added NEWS entry
------------------------------------------------------------
revno: 1739.1.584.1.65.1.3
merged: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
parent: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 00:20:59 +0200
message:
tests for tags in log output
------------------------------------------------------------
revno: 1739.1.584.1.65.1.2
merged: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
parent: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-04 21:28:02 +0200
message:
Use the reverse tag dict to show tags in log output
------------------------------------------------------------
revno: 1739.1.584.1.65.1.1
merged: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-04 21:27:18 +0200
message:
created reverse_tag_dict in tags.py
------------------------------------------------------------
revno: 1739.1.584.1.115
merged: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
parent: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
parent: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 16:40:33 +0100
message:
(John Arbash Meinel) Fix bug #104257 to handle unknown files in previously empty versioned directories
------------------------------------------------------------
revno: 1739.1.584.1.79.2.5
merged: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
parent: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Fri 2007-04-20 10:05:22 -0500
message:
[merge] bzr.dev 2428
------------------------------------------------------------
revno: 1739.1.584.1.79.2.4
merged: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
parent: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Fri 2007-04-13 09:47:09 -0500
message:
Clean up the setup for clarity (suggested by Robert)
------------------------------------------------------------
revno: 1739.1.584.1.79.2.3
merged: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
parent: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:55:22 -0500
message:
NEWS for fixing bug #104257
------------------------------------------------------------
revno: 1739.1.584.1.79.2.2
merged: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
parent: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:50:22 -0500
message:
Fix _iter_changes to properly handle versioned (but empty) directories
so that it yields files from there as unknown.
Also check to make sure we don't recurse into subdirectories of these dirs.
------------------------------------------------------------
revno: 1739.1.584.1.79.2.1
merged: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:02:44 -0500
message:
Add a test which exposes the bug in WT4._iter_changes()
------------------------------------------------------------
revno: 1739.1.584.1.114
merged: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 13:19:56 +0100
message:
new formats are network-compatible with old clients (#107168)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.7
merged: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
parent: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-04-20 07:48:24 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.6
merged: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
parent: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-04-20 00:19:55 -0400
message:
Use ROOT_ID when the repository supports old clients (Bug #107168)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.5
merged: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-04-19 23:21:16 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.113
merged: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
parent: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
parent: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 10:08:29 +0100
message:
doc Dirstate.initialize
------------------------------------------------------------
revno: 1739.1.584.1.102.5.1
merged: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2007-04-20 18:05:24 +1000
message:
doc Dirstate.initialize
------------------------------------------------------------
revno: 1739.1.584.1.112
merged: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
parent: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
parent: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 09:33:47 +0100
message:
(Andrew Bennetts, and many others) High performance smart server: add smart (non-vfs) commands to the client and server.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.174
merged: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
parent: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 15:11:46 +1000
message:
Various nits discovered by pyflakes.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.173
merged: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
parent: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 14:18:37 +1000
message:
Remove unused import.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.172
merged: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
parent: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 13:00:57 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.171
merged: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
parent: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
parent: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 00:55:20 +1000
message:
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
------------------------------------------------------------
revno: 1739.1.584.1.81.1.1
merged: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: faster-tests
timestamp: Wed 2007-04-11 15:17:06 +1000
message:
Remove temporary directories from successful tests as soon as possible, thus making the full test suite much much faster.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.170
merged: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
parent: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-19 14:29:20 +1000
message:
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.169
merged: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
parent: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 21:27:56 +1000
message:
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.168
merged: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
parent: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 21:24:53 +1000
message:
Add some comments to test_clone_bzrdir_repository_branch_both_under_shared.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.167
merged: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
parent: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 15:38:31 +1000
message:
Various changes in response to John's review.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.166
merged: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
parent: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 15:10:19 +1000
message:
Small changes in response to Aaron's review.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.165
merged: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
parent: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:50:11 +1000
message:
Remove XXX
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.164
merged: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
parent: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:16:29 +1000
message:
Deal with some more review comments.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.163
merged: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
parent: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:01:53 +1000
message:
Deal with various review comments from Robert.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.162
merged: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
parent: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 14:30:51 +1000
message:
Add some missing _ensure_real calls, and a missing import.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.161
merged: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
parent: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 14:00:51 +1000
message:
Reinstate forcing binary mode on windows in SmartServerStreamMedium.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.160
merged: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
parent: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:59:48 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.159
merged: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
parent: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:49:35 +1000
message:
Rename SmartClient to _SmartClient.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.158
merged: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:23:40 +1000
message:
Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.157
merged: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
parent: andrew.bennetts at canonical.com-20070416055251-imntu6k33rni8h4o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 16:53:00 +1000
message:
Remove unnecessary trivial divergences from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.156
merged: andrew.bennetts at canonical.com-20070416055251-imntu6k33rni8h4o
parent: andrew.bennetts at canonical.com-20070416042411-6itr5e3kuqwpm65y
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 15:52:51 +1000
message:
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.155
merged: andrew.bennetts at canonical.com-20070416042411-6itr5e3kuqwpm65y
parent: andrew.bennetts at canonical.com-20070416041315-w95yo01oar5pwsht
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 14:24:11 +1000
message:
Remove unused import
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.154
merged: andrew.bennetts at canonical.com-20070416041315-w95yo01oar5pwsht
parent: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 14:13:15 +1000
message:
Clear out BRANCH.TODO; all these items have been dealt with one way or another.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.153
merged: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
parent: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 12:56:19 +1000
message:
Rename call2 to call_expecting_body, and other small changes prompted by review.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.152
merged: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
parent: andrew.bennetts at canonical.com-20070413143008-gd15pnoln3mrmjd7
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Sun 2007-04-15 00:22:29 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.151
merged: andrew.bennetts at canonical.com-20070413143008-gd15pnoln3mrmjd7
parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
parent: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Sat 2007-04-14 00:30:08 +1000
message:
Small cosmetic tweaks to ease merging.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.150.1.2
merged: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
parent: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Sat 2007-04-14 00:23:26 +1000
message:
Clean up some imports.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.150.1.1
merged: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
parent: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 17:39:17 +1000
message:
Merge hpss-miscellany.
------------------------------------------------------------
revno: 1739.1.584.1.91.2.1
merged: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany
timestamp: Fri 2007-04-13 17:18:57 +1000
message:
Some miscellaneous new APIs, tests and other changes from the hpss branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.150
merged: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
parent: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:53:07 +1000
message:
Tidy imports in HTTPTestUtil.py
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.149
merged: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
parent: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:23:59 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.148
merged: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
parent: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:18:40 +1000
message:
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.147
merged: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
parent: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 15:48:30 +1000
message:
Merge rename-SmartTransport branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.146
merged: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 11:57:12 +1000
message:
Merge in the branch with the extracted lock_write token changes, resolving conflicts.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.145
merged: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
parent: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 10:56:08 +1000
message:
Add a brief explanation of what tokens are used for to lock_write docstrings.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.144
merged: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
parent: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 02:22:21 +1000
message:
Fix four tests I broke with the Branch.lock_write changes.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.143
merged: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
parent: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-12 18:04:51 +1000
message:
Remove some XXXs
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.142
merged: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
parent: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-12 17:08:33 +1000
message:
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.141
merged: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
parent: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 15:58:16 +1000
message:
Merge supports-rich-root branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.140
merged: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
parent: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 14:26:23 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.139
merged: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
parent: robertc at robertcollins.net-20070405093526-bfbpg82tlc7kldni
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 01:54:15 +1000
message:
Merge from bzr.dev, resolving conflicts.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.138
merged: robertc at robertcollins.net-20070405093526-bfbpg82tlc7kldni
parent: andrew.bennetts at canonical.com-20070405054113-e41edg4i5mop40nd
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-04-05 19:35:26 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.137
merged: andrew.bennetts at canonical.com-20070405054113-e41edg4i5mop40nd
parent: andrew.bennetts at canonical.com-20070405044649-6w32o4u1im56i7kr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-05 15:41:13 +1000
message:
Remove more duplicate code from bzrlib/transport/remote.py that has been moved elsewhere.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.136
merged: andrew.bennetts at canonical.com-20070405044649-6w32o4u1im56i7kr
parent: andrew.bennetts at canonical.com-20070330054348-h08inse3na9o7j8l
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-05 14:46:49 +1000
message:
Remote duplicated SmartServerRequestHandler from bzrlib/transport/remote.py; we use the one in bzrlib/smart/request.py now.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.135
merged: andrew.bennetts at canonical.com-20070330054348-h08inse3na9o7j8l
parent: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-30 15:43:48 +1000
message:
Prevent remote branch clients from determining the 'right' mode for control files, because we don't want clients setting the mode anyway.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.134
merged: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
parent: andrew.bennetts at canonical.com-20070329090825-n2imszarc27gf6ls
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-30 11:46:31 +1000
message:
Fix the TooManyConcurrentRequests error message.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.133
merged: andrew.bennetts at canonical.com-20070329090825-n2imszarc27gf6ls
parent: robertc at robertcollins.net-20070329085846-0tmwanst070lb0e5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-29 19:08:25 +1000
message:
All TestLockableFiles_RemoteLockDir tests passing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.132
merged: robertc at robertcollins.net-20070329085846-0tmwanst070lb0e5
parent: andrew.bennetts at canonical.com-20070329084623-ruqx0po8q3lxw0b7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 18:58:46 +1000
message:
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.131
merged: andrew.bennetts at canonical.com-20070329084623-ruqx0po8q3lxw0b7
parent: robertc at robertcollins.net-20070329073949-t6qt1arpx375mjek
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-29 18:46:23 +1000
message:
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.130
merged: robertc at robertcollins.net-20070329073949-t6qt1arpx375mjek
parent: robertc at robertcollins.net-20070329072414-7dh0io231c2tormb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 17:39:49 +1000
message:
Make all branch_implementations tests pass.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.129
merged: robertc at robertcollins.net-20070329072414-7dh0io231c2tormb
parent: robertc at robertcollins.net-20070329065545-e4d0sbkszqbr5p84
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 17:24:14 +1000
message:
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.128
merged: robertc at robertcollins.net-20070329065545-e4d0sbkszqbr5p84
parent: andrew.bennetts at canonical.com-20070329064628-gdonyjmcedx7q8vh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 16:55:45 +1000
message:
Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.127
merged: andrew.bennetts at canonical.com-20070329064628-gdonyjmcedx7q8vh
parent: robertc at robertcollins.net-20070329060318-uqqabpbnzsnaldx7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-29 16:46:28 +1000
message:
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.126
merged: robertc at robertcollins.net-20070329060318-uqqabpbnzsnaldx7
parent: robertc at robertcollins.net-20070329050914-srdhcaubqro5awjs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 16:03:18 +1000
message:
Make the InterRepository tests less abusive of the API for InterRepository. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.125
merged: robertc at robertcollins.net-20070329050914-srdhcaubqro5awjs
parent: robertc at robertcollins.net-20070329050040-mihvse1hk4mu7mxk
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 15:09:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.124
merged: robertc at robertcollins.net-20070329050040-mihvse1hk4mu7mxk
parent: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 15:00:40 +1000
message:
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.123
merged: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
parent: robertc at robertcollins.net-20070329040816-w9220t3gkdb45n3i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 14:21:56 +1000
message:
Translate ReadOnlyError in RemoteBranch._remote_lock_write.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.122
merged: robertc at robertcollins.net-20070329040816-w9220t3gkdb45n3i
parent: andrew.bennetts at canonical.com-20070329025245-8wdjghnbgjcp9mxy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 14:08:16 +1000
message:
More Branch implementation test passing foo.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.121
merged: andrew.bennetts at canonical.com-20070329025245-8wdjghnbgjcp9mxy
parent: robertc at robertcollins.net-20070329023848-b6v5memfil1qq3uq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-29 12:52:45 +1000
message:
Fix cmd_serve.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.120
merged: robertc at robertcollins.net-20070329023848-b6v5memfil1qq3uq
parent: robertc at robertcollins.net-20070329023227-1xss7o4d3bc56x8h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 12:38:48 +1000
message:
The Repository API ``make_working_trees`` is now permitted to return
False when ``set_make_working_trees`` is not implemented - previously
an unimplemented ``set_make_working_trees`` implied the result True
from ``make_working_trees``. This has been changed to accomodate the
smart server, where it does not make sense (at this point) to ever
make working trees by default. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.119
merged: robertc at robertcollins.net-20070329023227-1xss7o4d3bc56x8h
parent: robertc at robertcollins.net-20070329021404-5fcofqw7m3znip04
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 12:32:27 +1000
message:
Unbreak TestRepositoryMakeBranchAndTree.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.118
merged: robertc at robertcollins.net-20070329021404-5fcofqw7m3znip04
parent: robertc at robertcollins.net-20070329015852-akojjr51k9273rp7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 12:14:04 +1000
message:
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.117
merged: robertc at robertcollins.net-20070329015852-akojjr51k9273rp7
parent: robertc at robertcollins.net-20070328225443-lqmj3q8wwkz5kztu
parent: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 11:58:52 +1000
message:
Merge repository format attribute cleanup.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.116
merged: robertc at robertcollins.net-20070328225443-lqmj3q8wwkz5kztu
parent: robertc at robertcollins.net-20070328134526-y54ua41jbtoxbgcf
parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 08:54:43 +1000
message:
Commit final test-case-cleanups branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.115
merged: robertc at robertcollins.net-20070328134526-y54ua41jbtoxbgcf
parent: robertc at robertcollins.net-20070328084906-3n8damdsktuvt5ob
parent: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 23:45:26 +1000
message:
Merge incremental cleanups from hpss-test-correctness.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.114
merged: robertc at robertcollins.net-20070328084906-3n8damdsktuvt5ob
parent: robertc at robertcollins.net-20070328074837-v6jlmuzlbwcpfu7o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 18:49:06 +1000
message:
Commit current test pass improvements.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.113
merged: robertc at robertcollins.net-20070328074837-v6jlmuzlbwcpfu7o
parent: robertc at robertcollins.net-20070328052828-mubnf4b0llxumi2b
parent: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 17:48:37 +1000
message:
Test only fixes from the ported-to-bzr.dev test-correctness branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.112
merged: robertc at robertcollins.net-20070328052828-mubnf4b0llxumi2b
parent: robertc at robertcollins.net-20070328033336-sql7uwiy63dgq70i
parent: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 15:28:28 +1000
message:
Updated chroot cleanups.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.111
merged: robertc at robertcollins.net-20070328033336-sql7uwiy63dgq70i
parent: robertc at robertcollins.net-20070328031239-tavfdk4e6yarr2na
parent: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 13:33:36 +1000
message:
Further test-usability for chroots.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.110
merged: robertc at robertcollins.net-20070328031239-tavfdk4e6yarr2na
parent: robertc at robertcollins.net-20070327222505-qtmqubr1zrnhjgnu
parent: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 13:12:39 +1000
message:
Merge up split out hpss-chroot branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.109
merged: robertc at robertcollins.net-20070327222505-qtmqubr1zrnhjgnu
parent: andrew.bennetts at canonical.com-20070327135702-vnyrun2ejnj5ji7j
parent: robertc at robertcollins.net-20070327214650-v48kmnzoq865kbl6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 08:25:05 +1000
message:
Merge bzr.dev and record a merge against the split out urlutils work to prevent conflicts.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.104.1.2
merged: robertc at robertcollins.net-20070327214650-v48kmnzoq865kbl6
parent: robertc at robertcollins.net-20070327214559-3zto1rfp3g7dnzl9
parent: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 07:46:50 +1000
message:
Record merge against split out urlutils work.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.104.1.1
merged: robertc at robertcollins.net-20070327214559-3zto1rfp3g7dnzl9
parent: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2007-03-28 07:45:59 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.108
merged: andrew.bennetts at canonical.com-20070327135702-vnyrun2ejnj5ji7j
parent: andrew.bennetts at canonical.com-20070327134409-img1fcrrh0dznei8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 23:57:02 +1000
message:
Fix some tests in bzrdir_implementations that assumed make_branch_and_tree returns a tree with the same bzrdir as the branch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.107
merged: andrew.bennetts at canonical.com-20070327134409-img1fcrrh0dznei8
parent: andrew.bennetts at canonical.com-20070327130249-fweassil5stwtt1d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 23:44:09 +1000
message:
Fix test_retire_bzrdir to cope with transports that aren't backed by disk.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.106
merged: andrew.bennetts at canonical.com-20070327130249-fweassil5stwtt1d
parent: andrew.bennetts at canonical.com-20070327113312-l712t10dawjvdujb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 23:02:49 +1000
message:
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.105
merged: andrew.bennetts at canonical.com-20070327113312-l712t10dawjvdujb
parent: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 21:33:12 +1000
message:
Implement revision_history caching for RemoteBranch.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.104
merged: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
parent: andrew.bennetts at canonical.com-20070327064226-80ympk0j9aoc81oa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 19:46:24 +1000
message:
Completely rework chrooted transports.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.103
merged: andrew.bennetts at canonical.com-20070327064226-80ympk0j9aoc81oa
parent: andrew.bennetts at canonical.com-20070321054214-zri3jrjvxiepvhl6
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-27 16:42:26 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.102
merged: andrew.bennetts at canonical.com-20070321054214-zri3jrjvxiepvhl6
parent: andrew.bennetts at canonical.com-20070316034056-2htzztjob2i4wsrt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-03-21 16:42:14 +1100
message:
Make branch_implementations/test_http.py a little clearer.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.101
merged: andrew.bennetts at canonical.com-20070316034056-2htzztjob2i4wsrt
parent: andrew.bennetts at canonical.com-20070316033333-miblalavqdrr6zue
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-16 14:40:56 +1100
message:
Let make_branch_and_tree put checkouts in the current working directory.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.100
merged: andrew.bennetts at canonical.com-20070316033333-miblalavqdrr6zue
parent: andrew.bennetts at canonical.com-20070316032017-n43z217c0h6gkuns
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-16 14:33:33 +1100
message:
Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.99
merged: andrew.bennetts at canonical.com-20070316032017-n43z217c0h6gkuns
parent: andrew.bennetts at canonical.com-20070316014406-clpywqu5jpdx1hjm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-16 14:20:17 +1100
message:
Don't test mode setting for remote branches because they don't do mode setting.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.98
merged: andrew.bennetts at canonical.com-20070316014406-clpywqu5jpdx1hjm
parent: andrew.bennetts at canonical.com-20070316012733-chpwoqk66wa8oncf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-16 12:44:06 +1100
message:
Remove left over pdb.set_trace()
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.97
merged: andrew.bennetts at canonical.com-20070316012733-chpwoqk66wa8oncf
parent: andrew.bennetts at canonical.com-20070313065543-9ut4f0hw91ay6kdf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-03-16 12:27:33 +1100
message:
Fix more tests.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.96
merged: andrew.bennetts at canonical.com-20070313065543-9ut4f0hw91ay6kdf
parent: andrew.bennetts at canonical.com-20070313055201-ivxd3uhcvhqk995p
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-13 17:55:43 +1100
message:
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.95
merged: andrew.bennetts at canonical.com-20070313055201-ivxd3uhcvhqk995p
parent: andrew.bennetts at canonical.com-20070306133649-2371mkrfnrxcqjnn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-13 16:52:01 +1100
message:
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.94
merged: andrew.bennetts at canonical.com-20070306133649-2371mkrfnrxcqjnn
parent: andrew.bennetts at canonical.com-20070306112113-9pow71l4euaiftth
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-03-07 00:36:49 +1100
message:
Various small changes in aid of making tests pass (including deleting one invalid test).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.93
merged: andrew.bennetts at canonical.com-20070306112113-9pow71l4euaiftth
parent: andrew.bennetts at canonical.com-20070306080144-frjogke5hvc7a2t7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-06 22:21:13 +1100
message:
Fix another bug in urlutils.join.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.92
merged: andrew.bennetts at canonical.com-20070306080144-frjogke5hvc7a2t7
parent: andrew.bennetts at canonical.com-20070306071340-1nsftdleyx0ye73k
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-06 19:01:44 +1100
message:
Small bugfix to urlutils.join: join('anything', 'http://bar/a/') should not strip the trailing slash.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.91
merged: andrew.bennetts at canonical.com-20070306071340-1nsftdleyx0ye73k
parent: andrew.bennetts at canonical.com-20070306053139-9rntcbp5gi9008o9
parent: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-06 18:13:40 +1100
message:
Merge tidy-up to BzrDir.cloning_metadir.
------------------------------------------------------------
revno: 1739.1.566.3.1
merged: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: trivial
timestamp: Tue 2007-03-06 18:11:37 +1100
message:
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.90
merged: andrew.bennetts at canonical.com-20070306053139-9rntcbp5gi9008o9
parent: andrew.bennetts at canonical.com-20070305080113-hhmi12uzn1616n2u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-03-06 16:31:39 +1100
message:
Fix test_upgrade_preserves_signatures; it incorrectly assumed that upgrade(wt, ...) would necessarily affect the repository.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.89
merged: andrew.bennetts at canonical.com-20070305080113-hhmi12uzn1616n2u
parent: andrew.bennetts at canonical.com-20070305074829-5jw2mszjxine5340
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 19:01:13 +1100
message:
Fix thinko in _get_checkout_format; checkouts for RemoteBranches should be in the default bzrdir/repo format, of course. Thanks Robert.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.88
merged: andrew.bennetts at canonical.com-20070305074829-5jw2mszjxine5340
parent: andrew.bennetts at canonical.com-20070305073349-dr29xzo4jxj5niz5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 18:48:29 +1100
message:
Clarify make_branch_and_tree docstring a little.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.87
merged: andrew.bennetts at canonical.com-20070305073349-dr29xzo4jxj5niz5
parent: andrew.bennetts at canonical.com-20070305070421-y8wp2a7j7ymymyyk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 18:33:49 +1100
message:
Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.86
merged: andrew.bennetts at canonical.com-20070305070421-y8wp2a7j7ymymyyk
parent: andrew.bennetts at canonical.com-20070305060419-g6jwzbokqechgsp1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 18:04:21 +1100
message:
Skip BoundSFTPTests when a workingtree can't be created at a non-local URL.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.85
merged: andrew.bennetts at canonical.com-20070305060419-g6jwzbokqechgsp1
parent: andrew.bennetts at canonical.com-20070305051557-1ky8luc1kt0c39x0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 17:04:19 +1100
message:
Revert change to fetch.py that broke test_upgrade_preserves_signatures for non-Remote repositories. Still hangs for Remote repos too :(
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.84
merged: andrew.bennetts at canonical.com-20070305051557-1ky8luc1kt0c39x0
parent: andrew.bennetts at canonical.com-20070305050314-tskdcd65ok6jyj9o
parent: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 16:15:57 +1100
message:
Merge in supports-rich-root, another test passing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.83
merged: andrew.bennetts at canonical.com-20070305050314-tskdcd65ok6jyj9o
parent: andrew.bennetts at canonical.com-20070301050832-rf5egucjf7uypta5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 16:03:14 +1100
message:
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.82
merged: andrew.bennetts at canonical.com-20070301050832-rf5egucjf7uypta5
parent: andrew.bennetts at canonical.com-20070301023318-yz01arzlhgmgnz7g
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-01 16:08:32 +1100
message:
Merge from bzr.dev. Breaks a few tests because there are new methods not yet implemented.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.81
merged: andrew.bennetts at canonical.com-20070301023318-yz01arzlhgmgnz7g
parent: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
parent: andrew.bennetts at canonical.com-20070301012234-pl8k56r5ui0orfxg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-01 13:33:18 +1100
message:
All branch_implementations/test_locking tests passing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.80.1.1
merged: andrew.bennetts at canonical.com-20070301012234-pl8k56r5ui0orfxg
parent: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-01 12:22:34 +1100
message:
All branch_implementations/test_locking tests passing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.80
merged: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
parent: andrew.bennetts at canonical.com-20070228122251-49u5cagwiyvxqqjc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-28 23:27:04 +1100
message:
Many fixes and stub methods. Nearly all of repository_implementations passes now, and a fair bit of branch_implementations does too.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.79.1.3
merged: andrew.bennetts at canonical.com-20070228122251-49u5cagwiyvxqqjc
parent: andrew.bennetts at canonical.com-20070228095707-1v1wa3himjoa1p27
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-28 23:22:51 +1100
message:
Make a couple more branch_implementations tests pass.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.79.1.2
merged: andrew.bennetts at canonical.com-20070228095707-1v1wa3himjoa1p27
parent: andrew.bennetts at canonical.com-20070228070825-q2dvkjb0a11ouhtx
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-28 20:57:07 +1100
message:
All but one repository_implementation tests for RemoteRepository passing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.79.1.1
merged: andrew.bennetts at canonical.com-20070228070825-q2dvkjb0a11ouhtx
parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
parent: andrew.bennetts at canonical.com-20070221071326-atz27got2gd86mvw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-28 18:08:25 +1100
message:
Update to current hpss branch? Fix lots of test failures.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.79.2.1
merged: andrew.bennetts at canonical.com-20070221071326-atz27got2gd86mvw
parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-21 18:13:26 +1100
message:
Skip some branch_implementation tests that use branch.control_files if testing RemoteBranches.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.79
merged: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
parent: andrew.bennetts at canonical.com-20070219023638-d3wepid4l65cbar8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-21 16:55:24 +1100
message:
Implement RemoteBranch.lock_write/unlock as smart operations.
Because Branch.lock_write/unlock actually also lock/unlock the repository, I've
slightly changed lock_write's interface to accept and return 'tokens' rather
than 'token'. i.e. a 2-tuple of (branch token, repo token), or None.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.78
merged: andrew.bennetts at canonical.com-20070219023638-d3wepid4l65cbar8
parent: larstiq at larstiq.dyndns.org-20070215230302-j5pyq8flndti2490
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-02-19 13:36:38 +1100
message:
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
smart protocol as appropriate, so that locking operations on RemoteRepositories
work correctly.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.77
merged: larstiq at larstiq.dyndns.org-20070215230302-j5pyq8flndti2490
parent: andrew.bennetts at canonical.com-20070215013211-uj9q2b1qtq3x1peu
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss.clean
timestamp: Fri 2007-02-16 00:03:02 +0100
message:
Fix typo in request_handlers registration of Branch.set_last_revision, and test that registration
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.76
merged: andrew.bennetts at canonical.com-20070215013211-uj9q2b1qtq3x1peu
parent: andrew.bennetts at canonical.com-20070213135929-bmohxoh4kxp9bxwc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-15 12:32:11 +1100
message:
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.75
merged: andrew.bennetts at canonical.com-20070213135929-bmohxoh4kxp9bxwc
parent: andrew.bennetts at canonical.com-20070212050945-vbhooxmswr6r380d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-02-14 00:59:29 +1100
message:
Add Repository.{dont_,}leave_lock_in_place.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.74
merged: andrew.bennetts at canonical.com-20070212050945-vbhooxmswr6r380d
parent: andrew.bennetts at canonical.com-20070208065511-ny1p067c3poqwesp
parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-02-12 16:09:45 +1100
message:
Merge from bzr.dev.hpss.api.changes.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.73
merged: andrew.bennetts at canonical.com-20070208065511-ny1p067c3poqwesp
parent: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
parent: andrew.bennetts at canonical.com-20070208065130-gpzocn512ppmcm72
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-08 17:55:11 +1100
message:
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. Also some test tweaks.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.72.1.3
merged: andrew.bennetts at canonical.com-20070208065130-gpzocn512ppmcm72
parent: andrew.bennetts at canonical.com-20070208030648-2xc34ee8vvoxt035
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-08 17:51:30 +1100
message:
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.72.1.2
merged: andrew.bennetts at canonical.com-20070208030648-2xc34ee8vvoxt035
parent: andrew.bennetts at canonical.com-20070208030114-70sddbm02excfsve
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-08 14:06:48 +1100
message:
Remove some duplicate code in test_remote
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.72.1.1
merged: andrew.bennetts at canonical.com-20070208030114-70sddbm02excfsve
parent: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-08 14:01:14 +1100
message:
Add TestBranch.test_set_revision_history
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.72
merged: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
parent: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
parent: andrew.bennetts at canonical.com-20070205063314-d4gs6djeweqowxn7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-02-05 17:35:52 +1100
message:
Merge some local commits: a WSGI+chroot test fix, and include RemoteBranch in the branch_implementations tests.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.71.1.2
merged: andrew.bennetts at canonical.com-20070205063314-d4gs6djeweqowxn7
parent: andrew.bennetts at canonical.com-20070205051609-1oxwbeg70yzruqjt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-02-05 17:33:14 +1100
message:
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.71.1.1
merged: andrew.bennetts at canonical.com-20070205051609-1oxwbeg70yzruqjt
parent: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-02-05 16:16:09 +1100
message:
Fix test_wsgi.TestWSGI.test_chrooting to work with the new chroot semantics.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.71
merged: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
parent: robertc at robertcollins.net-20070203185724-i6gudgl39nbv1qa8
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Sun 2007-02-04 12:30:03 +0100
message:
Remove spurious TestRepositoryGetRevisionGraph class definition
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.70
merged: robertc at robertcollins.net-20070203185724-i6gudgl39nbv1qa8
parent: robertc at robertcollins.net-20070203173724-gswe95wx03oqkjum
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sun 2007-02-04 05:57:24 +1100
message:
Only try to get real repositories when an operation requires them.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.69
merged: robertc at robertcollins.net-20070203173724-gswe95wx03oqkjum
parent: larstiq at larstiq.dyndns.org-20070203160453-q5llrsq61v1edkld
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sun 2007-02-04 04:37:24 +1100
message:
Prevent the smart server sending cruft over stderr to the client.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.68
merged: larstiq at larstiq.dyndns.org-20070203160453-q5llrsq61v1edkld
parent: larstiq at larstiq.dyndns.org-20070203154834-ucle8brpytbfbgbi
parent: v.ladeuil+lp at free.fr-20070203155209-1mrxlytgtcwovift
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Sat 2007-02-03 17:04:53 +0100
message:
Merge RemoteRepository.gather_stats.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.63.1.3
merged: v.ladeuil+lp at free.fr-20070203155209-1mrxlytgtcwovift
parent: v.ladeuil+lp at free.fr-20070203145734-vuxwtgmwrn13odze
committer: v.ladeuil+lp at free.fr
branch nick: hpss
timestamp: Sat 2007-02-03 16:52:09 +0100
message:
more tests for gather_stats
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.63.1.2
merged: v.ladeuil+lp at free.fr-20070203145734-vuxwtgmwrn13odze
parent: v.ladeuil+lp at free.fr-20070203134321-s8tykvh00hl45j7r
committer: v.ladeuil+lp at free.fr
branch nick: hpss
timestamp: Sat 2007-02-03 15:57:34 +0100
message:
gather_stats server side and request registration
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.63.1.1
merged: v.ladeuil+lp at free.fr-20070203134321-s8tykvh00hl45j7r
parent: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
committer: v.ladeuil+lp at free.fr
branch nick: hpss
timestamp: Sat 2007-02-03 14:43:21 +0100
message:
Line too long
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.67
merged: larstiq at larstiq.dyndns.org-20070203154834-ucle8brpytbfbgbi
parent: larstiq at larstiq.dyndns.org-20070203153621-1d9kmc03i04mfksq
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Sat 2007-02-03 16:48:34 +0100
message:
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.66
merged: larstiq at larstiq.dyndns.org-20070203153621-1d9kmc03i04mfksq
parent: robertc at robertcollins.net-20070203133806-23k6ycwczhna1j3f
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Sat 2007-02-03 16:36:21 +0100
message:
Fix repository test parameterization for RemoteRepository.
(Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.65
merged: robertc at robertcollins.net-20070203133806-23k6ycwczhna1j3f
parent: robertc at robertcollins.net-20070203120738-vyfg1kkskz2l4kiv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sun 2007-02-04 00:38:06 +1100
message:
Really fix the opening of RemoteBranches for both shared and nonshared repositories.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.64
merged: robertc at robertcollins.net-20070203120738-vyfg1kkskz2l4kiv
parent: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 23:07:38 +1100
message:
Allow Repository tests to be backed onto a specific VFS as needed.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.63
merged: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
parent: robertc at robertcollins.net-20070203105720-wbxy8pkap13sdgq7
parent: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 21:59:06 +1100
message:
Merge updated gather_stats to get repository wide info working.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.62
merged: robertc at robertcollins.net-20070203105720-wbxy8pkap13sdgq7
parent: robertc at robertcollins.net-20070203101104-obpia4s4zfq313nj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 21:57:20 +1100
message:
Stub out RemoteRepository.gather_stats while its implemented in parallel.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.61
merged: robertc at robertcollins.net-20070203101104-obpia4s4zfq313nj
parent: robertc at robertcollins.net-20070203100954-vucxltziwzgkkyw0
parent: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 21:11:04 +1100
message:
Merge Repository.gather_stats api for hpss.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.60
merged: robertc at robertcollins.net-20070203100954-vucxltziwzgkkyw0
parent: robertc at robertcollins.net-20070202192520-3fecwesz5o3hb0fo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 21:09:54 +1100
message:
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.59
merged: robertc at robertcollins.net-20070202192520-3fecwesz5o3hb0fo
parent: larstiq at larstiq.dyndns.org-20070202180451-ug4361fboqj0qfcc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 06:25:20 +1100
message:
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.58
merged: larstiq at larstiq.dyndns.org-20070202180451-ug4361fboqj0qfcc
parent: robertc at robertcollins.net-20070202173408-pt1fl00icfekufxi
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Fri 2007-02-02 19:04:51 +0100
message:
Small test fixes to reflect naming and documentation
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.57
merged: robertc at robertcollins.net-20070202173408-pt1fl00icfekufxi
parent: robertc at robertcollins.net-20070202170549-ykriy5021olx98eu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 04:34:08 +1100
message:
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.56
merged: robertc at robertcollins.net-20070202170549-ykriy5021olx98eu
parent: robertc at robertcollins.net-20070202061527-ep28ktwh0th06gbo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Sat 2007-02-03 04:05:49 +1100
message:
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.55
merged: robertc at robertcollins.net-20070202061527-ep28ktwh0th06gbo
parent: andrew.bennetts at canonical.com-20070202053106-j1n21t61x5wdxu64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2007-02-02 17:15:27 +1100
message:
Give RemoteBranch a base url in line with the Branch protocol.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.54
merged: andrew.bennetts at canonical.com-20070202053106-j1n21t61x5wdxu64
parent: andrew.bennetts at canonical.com-20070202013427-s8eiu8d3g78c8prs
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-02-02 16:31:06 +1100
message:
Fix ChrootTransportDecorator's abspath method to be consistent with its clone
method when dealing with relpaths that start with "/".
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.53
merged: andrew.bennetts at canonical.com-20070202013427-s8eiu8d3g78c8prs
parent: larstiq at larstiq.dyndns.org-20070201180900-4iusc3mjwwq5lt1j
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-02-02 12:34:27 +1100
message:
Small fix to urlutils.joinpath that was causing a misbehaviour in
ChrootedTransportDecorator.clone.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.52
merged: larstiq at larstiq.dyndns.org-20070201180900-4iusc3mjwwq5lt1j
parent: larstiq at larstiq.dyndns.org-20070201174038-9cp5yxon7a5igkqk
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Thu 2007-02-01 19:09:00 +0100
message:
Provide more information when encountering unexpected responses from a smart
server. (Wouter van Heyst, Vincent Ladeuil, Robert Collins)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.51
merged: larstiq at larstiq.dyndns.org-20070201174038-9cp5yxon7a5igkqk
parent: larstiq at larstiq.dyndns.org-20070201160944-od4tx1f4a6ens2n0
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Thu 2007-02-01 18:40:38 +0100
message:
Test and implement RemoteBranch.last_revision_info()
(Wouter van Heyst, Robert Collins, Vincent Ladeuil)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.50
merged: larstiq at larstiq.dyndns.org-20070201160944-od4tx1f4a6ens2n0
parent: larstiq at larstiq.dyndns.org-20070201154238-uu3l7iizk31d45as
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Thu 2007-02-01 17:09:44 +0100
message:
Add SmartServerBranchRequestLastRevisionInfo method.
(Wouter van Heyst, Robert Collins, Vincent Ladeuil)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.49
merged: larstiq at larstiq.dyndns.org-20070201154238-uu3l7iizk31d45as
parent: larstiq at larstiq.dyndns.org-20070201152242-rwgu7dtaz2l2v4gp
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Thu 2007-02-01 16:42:38 +0100
message:
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
allow easier writing of smartserver Branch methods.
(Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.48
merged: larstiq at larstiq.dyndns.org-20070201152242-rwgu7dtaz2l2v4gp
parent: andrew.bennetts at canonical.com-20070201065505-om3g02ffix0vl3k8
parent: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: hpss
timestamp: Thu 2007-02-01 16:22:42 +0100
message:
Merge the Branch.last_revision_info api change.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.47
merged: andrew.bennetts at canonical.com-20070201065505-om3g02ffix0vl3k8
parent: andrew.bennetts at canonical.com-20070201050316-tja93nv3i3d6ucku
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-01 17:55:05 +1100
message:
Make SmartTCPServer_for_Testing.setUp's backing_transport_server argument optional.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.46
merged: andrew.bennetts at canonical.com-20070201050316-tja93nv3i3d6ucku
parent: andrew.bennetts at canonical.com-20070201014908-xmhw8eg0a7t0f758
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-01 16:03:16 +1100
message:
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.45
merged: andrew.bennetts at canonical.com-20070201014908-xmhw8eg0a7t0f758
parent: andrew.bennetts at canonical.com-20070131122335-v79cgeavk4dqp73c
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-02-01 12:49:08 +1100
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.44
merged: andrew.bennetts at canonical.com-20070131122335-v79cgeavk4dqp73c
parent: andrew.bennetts at canonical.com-20061221155042-m63gy5z4vztk8ngj
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-01-31 23:23:35 +1100
message:
Small changes to help a couple more tests pass.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.43
merged: andrew.bennetts at canonical.com-20061221155042-m63gy5z4vztk8ngj
parent: robertc at robertcollins.net-20061129034335-692a00550b9109a8
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2006-12-22 02:50:42 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.42
merged: robertc at robertcollins.net-20061129034335-692a00550b9109a8
parent: robertc at robertcollins.net-20061128025534-1c132391351b65e9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2006-11-29 14:43:35 +1100
message:
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.41
merged: robertc at robertcollins.net-20061128025534-1c132391351b65e9
parent: robertc at robertcollins.net-20061128022124-9359f58013ff94d8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Tue 2006-11-28 13:55:34 +1100
message:
Fix SmartServerResponse.__eq__ to handle None.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.40
merged: robertc at robertcollins.net-20061128022124-9359f58013ff94d8
parent: robertc at robertcollins.net-20061128013723-cd07a2ccb796b80a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Tue 2006-11-28 13:21:24 +1100
message:
Implement a remote Repository.has_revision method.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.39
merged: robertc at robertcollins.net-20061128013723-cd07a2ccb796b80a
parent: robertc at robertcollins.net-20061124034136-54af820c9797fe30
parent: robertc at robertcollins.net-20061128010415-b004ee4bfebfad9c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Tue 2006-11-28 12:37:23 +1100
message:
Merge integration and knit-index utf8 decoding fixes.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.38
merged: robertc at robertcollins.net-20061124034136-54af820c9797fe30
parent: andrew.bennetts at canonical.com-20061123061615-4b2a1fb77e6e4dc4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-24 14:41:36 +1100
message:
Implement RemoteBranch.revision_history().
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.37
merged: andrew.bennetts at canonical.com-20061123061615-4b2a1fb77e6e4dc4
parent: andrew.bennetts at canonical.com-20061123053021-8549e8989eda8ee9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2006-11-23 17:16:15 +1100
message:
Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.36
merged: andrew.bennetts at canonical.com-20061123053021-8549e8989eda8ee9
parent: andrew.bennetts at canonical.com-20061123012847-15406b2537c5dcda
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2006-11-23 16:30:21 +1100
message:
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.35
merged: andrew.bennetts at canonical.com-20061123012847-15406b2537c5dcda
parent: robertc at robertcollins.net-20061122034604-349a69c544a1706a
parent: andrew.bennetts at canonical.com-20061121081935-6440ef860ef00262
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2006-11-23 12:28:47 +1100
message:
Merge bzr.dev (via NO_SMART_VFS branch).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.24.1.1
merged: andrew.bennetts at canonical.com-20061121081935-6440ef860ef00262
parent: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
parent: andrew.bennetts at canonical.com-20061121081704-1899cc83e9d4b59e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: NO_SMART_VFS environment variable
timestamp: Tue 2006-11-21 19:19:35 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.23.1.1
merged: andrew.bennetts at canonical.com-20061121081704-1899cc83e9d4b59e
parent: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
parent: andrew.bennetts at canonical.com-20061121081646-ef6a49ad44bf2f9b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Tue 2006-11-21 19:17:04 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.1.1.1
merged: andrew.bennetts at canonical.com-20061121081646-ef6a49ad44bf2f9b
parent: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
parent: pqm at pqm.ubuntu.com-20061120225523-9a6692bea52007b0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote + wsgi integration
timestamp: Tue 2006-11-21 19:16:46 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.34
merged: robertc at robertcollins.net-20061122034604-349a69c544a1706a
parent: andrew.bennetts at canonical.com-20061121072903-82e6c6cc18eb232e
parent: robertc at robertcollins.net-20061122024926-41ba3a48a35200ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2006-11-22 14:46:04 +1100
message:
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.32.1.1
merged: robertc at robertcollins.net-20061122024926-41ba3a48a35200ee
parent: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Wed 2006-11-22 13:49:26 +1100
message:
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.33
merged: andrew.bennetts at canonical.com-20061121072903-82e6c6cc18eb232e
parent: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Register RemoteBzrDirFormat always.
timestamp: Tue 2006-11-21 18:29:03 +1100
message:
Fix two trivial test failures.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.32
merged: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
parent: robertc at robertcollins.net-20061117001712-f87f23b516fe9814
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 11:19:00 +1100
message:
Unescape urls before handing over the wire to the smart server for the probe_transport method.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.31
merged: robertc at robertcollins.net-20061117001712-f87f23b516fe9814
parent: robertc at robertcollins.net-20061117000942-5f38b7a179c42641
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 11:17:12 +1100
message:
Make RemoteBzrDir tests use a real smart transport connection to a read only server instance for read-only tests.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.30
merged: robertc at robertcollins.net-20061117000942-5f38b7a179c42641
parent: robertc at robertcollins.net-20061117000537-ab73c5d053cb65b5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 11:09:42 +1100
message:
Reenable the stock repository implementations for testing.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.29
merged: robertc at robertcollins.net-20061117000537-ab73c5d053cb65b5
parent: robertc at robertcollins.net-20061116193044-df4ff02c6f0e289a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 11:05:37 +1100
message:
Dont run the vfat repository test on RemoteRepositories as there is no point.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.28
merged: robertc at robertcollins.net-20061116193044-df4ff02c6f0e289a
parent: robertc at robertcollins.net-20061116192335-6f5128786c709903
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 06:30:44 +1100
message:
Fix RemoteBzrDirFormat probe api usage.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.27
merged: robertc at robertcollins.net-20061116192335-6f5128786c709903
parent: andrew.bennetts at canonical.com-20061116020230-792552fcf4fc86a7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Fri 2006-11-17 06:23:35 +1100
message:
Fix usage of smart_client.call_with_body_bytes in RemoteTransport.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.26
merged: andrew.bennetts at canonical.com-20061116020230-792552fcf4fc86a7
parent: andrew.bennetts at canonical.com-20061115015627-e01121d1aa982d05
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Register RemoteBzrDirFormat always.
timestamp: Thu 2006-11-16 13:02:30 +1100
message:
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.25
merged: andrew.bennetts at canonical.com-20061115015627-e01121d1aa982d05
parent: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Register RemoteBzrDirFormat always.
timestamp: Wed 2006-11-15 12:56:27 +1100
message:
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.24
merged: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
parent: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: NO_SMART_VFS environment variable
timestamp: Wed 2006-11-15 12:27:08 +1100
message:
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.23
merged: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
parent: andrew.bennetts at canonical.com-20061114225451-79aee38a4790bc30
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-15 09:57:07 +1100
message:
Use a Registry for smart server command handlers.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.22
merged: andrew.bennetts at canonical.com-20061114225451-79aee38a4790bc30
parent: andrew.bennetts at canonical.com-20061114221015-cd275a3205ef8876
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-15 09:54:51 +1100
message:
Fix cmd_serve after move of bzrlib.transport.smart
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.21
merged: andrew.bennetts at canonical.com-20061114221015-cd275a3205ef8876
parent: andrew.bennetts at canonical.com-20061114201451-50fc10d6722cc329
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-15 09:10:15 +1100
message:
Move bzrlib.transport.smart to bzrlib.smart
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.20
merged: andrew.bennetts at canonical.com-20061114201451-50fc10d6722cc329
parent: andrew.bennetts at canonical.com-20061110104647-bfc9b83ef817a5a7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-15 07:14:51 +1100
message:
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.19
merged: andrew.bennetts at canonical.com-20061110104647-bfc9b83ef817a5a7
parent: andrew.bennetts at canonical.com-20061110095814-50103d6e4f953d1a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 21:46:47 +1100
message:
Add docstrings to all the new modules, and a few other places.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.18
merged: andrew.bennetts at canonical.com-20061110095814-50103d6e4f953d1a
parent: andrew.bennetts at canonical.com-20061110090253-947df3118bb2933f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 20:58:14 +1100
message:
Remove last non-global import of bzrlib.transport.smart.* from the split out code.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.17
merged: andrew.bennetts at canonical.com-20061110090253-947df3118bb2933f
parent: andrew.bennetts at canonical.com-20061110065239-3357f8a1930ad526
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 20:02:53 +1100
message:
Paramaterise the commands handled by SmartServerRequestHandler.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.16
merged: andrew.bennetts at canonical.com-20061110065239-3357f8a1930ad526
parent: andrew.bennetts at canonical.com-20061110064224-1d4511dddbacfbca
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 17:52:39 +1100
message:
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.15
merged: andrew.bennetts at canonical.com-20061110064224-1d4511dddbacfbca
parent: andrew.bennetts at canonical.com-20061110062216-5d8a2a58758f05f0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 17:42:24 +1100
message:
Tidy some imports, and bugs introduced when adding server.py
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.14
merged: andrew.bennetts at canonical.com-20061110062216-5d8a2a58758f05f0
parent: andrew.bennetts at canonical.com-20061109050141-3832b8dd1930c841
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-10 17:22:16 +1100
message:
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.13
merged: andrew.bennetts at canonical.com-20061109050141-3832b8dd1930c841
parent: andrew.bennetts at canonical.com-20061109050019-23216fc8e90cfe00
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 16:01:41 +1100
message:
Remove excessive blank lines.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.12
merged: andrew.bennetts at canonical.com-20061109050019-23216fc8e90cfe00
parent: andrew.bennetts at canonical.com-20061109043134-abef311bcac5bd46
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 16:00:19 +1100
message:
Rename SmartServerRequestHandler's command attribute to _command; it's private.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.11
merged: andrew.bennetts at canonical.com-20061109043134-abef311bcac5bd46
parent: andrew.bennetts at canonical.com-20061109043107-9ec3bdcacf63b06c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 15:31:34 +1100
message:
Remove obsolete comment.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.10
merged: andrew.bennetts at canonical.com-20061109043107-9ec3bdcacf63b06c
parent: andrew.bennetts at canonical.com-20061109043040-2e4e7b5d9933766c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 15:31:07 +1100
message:
Remove useless comments.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.9
merged: andrew.bennetts at canonical.com-20061109043040-2e4e7b5d9933766c
parent: andrew.bennetts at canonical.com-20061109042832-7b472545e11506fd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 15:30:40 +1100
message:
Remove some more dead code.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.8
merged: andrew.bennetts at canonical.com-20061109042832-7b472545e11506fd
parent: andrew.bennetts at canonical.com-20061109042410-2ec48953f7ed20ce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 15:28:32 +1100
message:
Remove SmartServerRequest.response; commands can simply return the response from either do or do_body now.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.7
merged: andrew.bennetts at canonical.com-20061109042410-2ec48953f7ed20ce
parent: andrew.bennetts at canonical.com-20061108101448-ffae384a676d2592
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Thu 2006-11-09 15:24:10 +1100
message:
Simplify dispatch_command.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.6
merged: andrew.bennetts at canonical.com-20061108101448-ffae384a676d2592
parent: andrew.bennetts at canonical.com-20061108100112-4375099e84117e51
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-08 21:14:48 +1100
message:
Tidy ups, and turn do_hello and do_get_bundle into command objects.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.5
merged: andrew.bennetts at canonical.com-20061108100112-4375099e84117e51
parent: andrew.bennetts at canonical.com-20061108095724-29af1e1abcf5cc87
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-08 21:01:12 +1100
message:
Pass body_bytes directly to SmartServerRequest.do_body
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.4
merged: andrew.bennetts at canonical.com-20061108095724-29af1e1abcf5cc87
parent: andrew.bennetts at canonical.com-20061108035508-333440d39865078c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-08 20:57:24 +1100
message:
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.3
merged: andrew.bennetts at canonical.com-20061108035508-333440d39865078c
parent: andrew.bennetts at canonical.com-20061103051926-09b9bc4657c50038
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Wed 2006-11-08 14:55:08 +1100
message:
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.2
merged: andrew.bennetts at canonical.com-20061103051926-09b9bc4657c50038
parent: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split smart
timestamp: Fri 2006-11-03 16:19:26 +1100
message:
Start splitting bzrlib/transport/smart.py into a package.
------------------------------------------------------------
revno: 1739.1.279.1.11.1.25.1.13.1.1
merged: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
parent: andrew.bennetts at canonical.com-20061018060759-6a590c7a6c04b360
parent: andrew.bennetts at canonical.com-20061101094905-2690b01c9e75ebfa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart
timestamp: Wed 2006-11-01 20:56:56 +1100
message:
Merge from remote-transport
------------------------------------------------------------
revno: 1739.1.13.2.90
merged: andrew.bennetts at canonical.com-20061101094905-2690b01c9e75ebfa
parent: andrew.bennetts at canonical.com-20061101094808-98f7a769f2499b06
parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-11-01 20:49:05 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.89
merged: andrew.bennetts at canonical.com-20061101094808-98f7a769f2499b06
parent: andrew.bennetts at canonical.com-20061027074809-ce65588d897aa851
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-11-01 20:48:08 +1100
message:
Skip test_upgrade_from_format4 for RemoteRepositoryFormat.
------------------------------------------------------------
revno: 1739.1.13.2.88
merged: andrew.bennetts at canonical.com-20061027074809-ce65588d897aa851
parent: andrew.bennetts at canonical.com-20061027045922-843414bdbc432164
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-10-27 17:48:09 +1000
message:
Trim some comment cruft.
------------------------------------------------------------
revno: 1739.1.13.2.87
merged: andrew.bennetts at canonical.com-20061027045922-843414bdbc432164
parent: andrew.bennetts at canonical.com-20061020040248-80ca63c7e0a13298
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-10-27 14:59:22 +1000
message:
Make tests pass.
------------------------------------------------------------
revno: 1739.1.13.2.86
merged: andrew.bennetts at canonical.com-20061020040248-80ca63c7e0a13298
parent: andrew.bennetts at canonical.com-20061009045436-6febebf1c571ed17
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-10-20 14:02:48 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.85
merged: andrew.bennetts at canonical.com-20061009045436-6febebf1c571ed17
parent: andrew.bennetts at canonical.com-20060917082244-f3a2e5dcd6e87b36
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Mon 2006-10-09 14:54:36 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.84
merged: andrew.bennetts at canonical.com-20060917082244-f3a2e5dcd6e87b36
parent: andrew.bennetts at canonical.com-20060913140829-e8fc75a832057416
parent: robertc at robertcollins.net-20060915123116-2151853564521d8f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Sun 2006-09-17 18:22:44 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.83
merged: andrew.bennetts at canonical.com-20060913140829-e8fc75a832057416
parent: andrew.bennetts at canonical.com-20060913070250-e3ea2c0e7d58433b
parent: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Thu 2006-09-14 00:08:29 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.82
merged: andrew.bennetts at canonical.com-20060913070250-e3ea2c0e7d58433b
parent: andrew.bennetts at canonical.com-20060912080707-b522f3cedce06212
parent: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-09-13 17:02:50 +1000
message:
Merge smart transport improvements.
------------------------------------------------------------
revno: 1739.1.13.2.81
merged: andrew.bennetts at canonical.com-20060912080707-b522f3cedce06212
parent: andrew.bennetts at canonical.com-20060829054101-e08d300913a1ae41
parent: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-09-12 18:07:07 +1000
message:
Merge cleaned up underlying dependencies for remote bzrdir.
------------------------------------------------------------
revno: 1739.1.13.2.80
merged: andrew.bennetts at canonical.com-20060829054101-e08d300913a1ae41
parent: andrew.bennetts at canonical.com-20060829033913-a907394320a45228
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-29 15:41:01 +1000
message:
Some urlquoting fixes, a double-slash fix, a fix for an incorrect test (still failing though) and remove an apparently obsolete comment.
------------------------------------------------------------
revno: 1739.1.13.2.79
merged: andrew.bennetts at canonical.com-20060829033913-a907394320a45228
parent: andrew.bennetts at canonical.com-20060829014055-6c7765df32d398b9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-29 13:39:13 +1000
message:
URL escaping fixes that somehow got lost in conflict resolution.
------------------------------------------------------------
revno: 1739.1.13.2.78
merged: andrew.bennetts at canonical.com-20060829014055-6c7765df32d398b9
parent: andrew.bennetts at canonical.com-20060825042337-b913098a7dee77cb
parent: andrew.bennetts at canonical.com-20060829013958-3dcc275cd414b1a1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-29 11:40:55 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.18
merged: andrew.bennetts at canonical.com-20060829013958-3dcc275cd414b1a1
parent: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
parent: andrew.bennetts at canonical.com-20060829013947-139e5fed102a23c2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Tue 2006-08-29 11:39:58 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.14.1.4
merged: andrew.bennetts at canonical.com-20060829013947-139e5fed102a23c2
parent: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-29 11:39:47 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.77
merged: andrew.bennetts at canonical.com-20060825042337-b913098a7dee77cb
parent: andrew.bennetts at canonical.com-20060824013856-dc34dcd68584aa3e
parent: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-25 14:23:37 +1000
message:
Merge from sftp refactoring 2.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.17
merged: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
parent: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
parent: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Fri 2006-08-25 14:21:47 +1000
message:
Merge from sftp refactoring 2.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.14.1.3
merged: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
parent: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
parent: andrew.bennetts at canonical.com-20060825042046-7f1cb13726dc6c06
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Fri 2006-08-25 14:21:37 +1000
message:
Merge from sftp refactoring 2.
------------------------------------------------------------
revno: 1739.1.13.2.76
merged: andrew.bennetts at canonical.com-20060824013856-dc34dcd68584aa3e
parent: andrew.bennetts at canonical.com-20060823131948-7035572a1281b5f1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Thu 2006-08-24 11:38:56 +1000
message:
Move lazy-connection logic into SmartStreamClient.
------------------------------------------------------------
revno: 1739.1.13.2.75
merged: andrew.bennetts at canonical.com-20060823131948-7035572a1281b5f1
parent: andrew.bennetts at canonical.com-20060823111354-f57cfa43a1397425
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 23:19:48 +1000
message:
Add XXX about lazy connection making.
------------------------------------------------------------
revno: 1739.1.13.2.74
merged: andrew.bennetts at canonical.com-20060823111354-f57cfa43a1397425
parent: andrew.bennetts at canonical.com-20060823105658-10d57b3d1b7329fc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 21:13:54 +1000
message:
Make SmartTransport.clone return the right class, and move connection sharing into clone from __init__.
------------------------------------------------------------
revno: 1739.1.13.2.73
merged: andrew.bennetts at canonical.com-20060823105658-10d57b3d1b7329fc
parent: andrew.bennetts at canonical.com-20060823055908-d6194c6c666c8ce6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 20:56:58 +1000
message:
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
------------------------------------------------------------
revno: 1739.1.13.2.72
merged: andrew.bennetts at canonical.com-20060823055908-d6194c6c666c8ce6
parent: andrew.bennetts at canonical.com-20060823035337-35b78d67b08f7633
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 15:59:08 +1000
message:
Make Remote* classes in remote.py more consistent and remove some dead code.
------------------------------------------------------------
revno: 1739.1.13.2.71
merged: andrew.bennetts at canonical.com-20060823035337-35b78d67b08f7633
parent: andrew.bennetts at canonical.com-20060823034826-1111a81f2f27d0a2
parent: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 13:53:37 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.41.1.16
merged: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
parent: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
parent: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-23 13:53:32 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.41.1.14.1.2
merged: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
parent: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
parent: andrew.bennetts at canonical.com-20060823035321-c05a07751e7a0611
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-23 13:53:26 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.70
merged: andrew.bennetts at canonical.com-20060823034826-1111a81f2f27d0a2
parent: andrew.bennetts at canonical.com-20060823032615-f744598ab1f11165
parent: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 13:48:26 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.41.1.15
merged: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
parent: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-23 13:48:16 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.41.1.14.1.1
merged: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
parent: andrew.bennetts at canonical.com-20060823034524-002552c75ec7f81e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-23 13:48:08 +1000
message:
Merge from test tweaks
------------------------------------------------------------
revno: 1739.1.13.2.69
merged: andrew.bennetts at canonical.com-20060823032615-f744598ab1f11165
parent: andrew.bennetts at canonical.com-20060823031526-cc49126a7a08dd29
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 13:26:15 +1000
message:
Guard RemoteBzrDirFormat.__eq__ with an isinstance check.
------------------------------------------------------------
revno: 1739.1.13.2.68
merged: andrew.bennetts at canonical.com-20060823031526-cc49126a7a08dd29
parent: andrew.bennetts at canonical.com-20060823030804-e5812d75252db56f
parent: andrew.bennetts at canonical.com-20060823031520-8099305ab9ac19bf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 13:15:26 +1000
message:
Merge from high performance smart server
------------------------------------------------------------
revno: 1739.1.13.2.42.1.14
merged: andrew.bennetts at canonical.com-20060823031520-8099305ab9ac19bf
parent: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-23 13:15:20 +1000
message:
Merge from high performance smart server
------------------------------------------------------------
revno: 1739.1.13.2.41.1.14
merged: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
parent: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-23 13:14:53 +1000
message:
Fix shallow bug (bad conflict resolution?) in errors.UnsupportedEOLMarker
------------------------------------------------------------
revno: 1739.1.13.2.67
merged: andrew.bennetts at canonical.com-20060823030804-e5812d75252db56f
parent: andrew.bennetts at canonical.com-20060821081826-908982fcdc0e67a7
parent: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-23 13:08:04 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.42.1.13
merged: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
parent: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
parent: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-23 13:07:54 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.41.1.13
merged: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
parent: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
parent: andrew.bennetts at canonical.com-20060823030742-0432ddd9a41acbac
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-23 13:07:48 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.66
merged: andrew.bennetts at canonical.com-20060821081826-908982fcdc0e67a7
parent: andrew.bennetts at canonical.com-20060816075127-298046537ac3794c
parent: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Mon 2006-08-21 18:18:26 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.12
merged: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
parent: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
parent: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Mon 2006-08-21 18:16:10 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.12
merged: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
parent: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
parent: andrew.bennetts at canonical.com-20060821081202-8871ca6b89209e28
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Mon 2006-08-21 18:15:59 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.65
merged: andrew.bennetts at canonical.com-20060816075127-298046537ac3794c
parent: andrew.bennetts at canonical.com-20060816071806-0154b6a44243f7b5
parent: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 17:51:27 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.11
merged: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
parent: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
parent: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-16 17:51:22 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.11
merged: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
parent: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
parent: andrew.bennetts at canonical.com-20060816075110-8405df735e442ef3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-16 17:51:16 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.64
merged: andrew.bennetts at canonical.com-20060816071806-0154b6a44243f7b5
parent: andrew.bennetts at canonical.com-20060816062317-7164e5faddd7ef0b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 17:18:06 +1000
message:
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
------------------------------------------------------------
revno: 1739.1.13.2.63
merged: andrew.bennetts at canonical.com-20060816062317-7164e5faddd7ef0b
parent: andrew.bennetts at canonical.com-20060816061420-49cf31690d23607b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 16:23:17 +1000
message:
Delegate set_parent.
------------------------------------------------------------
revno: 1739.1.13.2.62
merged: andrew.bennetts at canonical.com-20060816061420-49cf31690d23607b
parent: andrew.bennetts at canonical.com-20060816060910-3e352be345adc843
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 16:14:20 +1000
message:
Add TODO
------------------------------------------------------------
revno: 1739.1.13.2.61
merged: andrew.bennetts at canonical.com-20060816060910-3e352be345adc843
parent: andrew.bennetts at canonical.com-20060816044359-7e1481d784b80251
parent: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 16:09:10 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.10
merged: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
parent: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
parent: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-16 16:08:08 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.10
merged: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
parent: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
parent: andrew.bennetts at canonical.com-20060816060755-c78362354f63d6ce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-16 16:08:03 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.60
merged: andrew.bennetts at canonical.com-20060816044359-7e1481d784b80251
parent: andrew.bennetts at canonical.com-20060811070013-49ca62687d41dcc1
parent: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-16 14:43:59 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.42.1.9
merged: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
parent: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
parent: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-16 14:43:49 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.41.1.9
merged: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
parent: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
parent: andrew.bennetts at canonical.com-20060816043711-9f0277328a973692
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-16 14:42:52 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.59
merged: andrew.bennetts at canonical.com-20060811070013-49ca62687d41dcc1
parent: andrew.bennetts at canonical.com-20060811065856-7128aecf285d9fbd
parent: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 17:00:13 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.8
merged: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
parent: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
parent: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Fri 2006-08-11 17:00:08 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.8
merged: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
parent: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
parent: andrew.bennetts at canonical.com-20060811065958-c5a025e340363cd3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Fri 2006-08-11 17:00:03 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.58
merged: andrew.bennetts at canonical.com-20060811065856-7128aecf285d9fbd
parent: andrew.bennetts at canonical.com-20060811061033-556f8b46f5c98157
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 16:58:56 +1000
message:
Make SmartTransport.put accept strings as well as file-like objects.
------------------------------------------------------------
revno: 1739.1.13.2.57
merged: andrew.bennetts at canonical.com-20060811061033-556f8b46f5c98157
parent: andrew.bennetts at canonical.com-20060811055831-70d2619a20dacb52
parent: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 16:10:33 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.7
merged: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
parent: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
parent: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Fri 2006-08-11 16:10:24 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.7
merged: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
parent: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
parent: andrew.bennetts at canonical.com-20060811061006-964a36dfa7d697b2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Fri 2006-08-11 16:10:19 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.56
merged: andrew.bennetts at canonical.com-20060811055831-70d2619a20dacb52
parent: andrew.bennetts at canonical.com-20060811042234-d124075c84cf2952
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 15:58:31 +1000
message:
Make RemoteBzrDir raise NotBranchError on open_branch regardless of whether a repository exists.
------------------------------------------------------------
revno: 1739.1.13.2.55
merged: andrew.bennetts at canonical.com-20060811042234-d124075c84cf2952
parent: andrew.bennetts at canonical.com-20060810140623-32b82cb7b6ea1ef6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 14:22:34 +1000
message:
Replace another isinstance(made_repo, Repository) check.
------------------------------------------------------------
revno: 1739.1.13.2.54
merged: andrew.bennetts at canonical.com-20060810140623-32b82cb7b6ea1ef6
parent: andrew.bennetts at canonical.com-20060810134559-de169fa0f252d968
parent: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Fri 2006-08-11 00:06:23 +1000
message:
Merge from test-tweaks
------------------------------------------------------------
revno: 1739.1.13.2.42.1.6
merged: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
parent: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
parent: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Fri 2006-08-11 00:06:14 +1000
message:
Merge from test-tweaks
------------------------------------------------------------
revno: 1739.1.13.2.41.1.6
merged: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
parent: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
parent: andrew.bennetts at canonical.com-20060810135025-1105c1aaf5301044
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Fri 2006-08-11 00:06:03 +1000
message:
Merge from test-tweaks
------------------------------------------------------------
revno: 1739.1.13.2.53
merged: andrew.bennetts at canonical.com-20060810134559-de169fa0f252d968
parent: andrew.bennetts at canonical.com-20060810015246-f155b70b3aecb0c4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Thu 2006-08-10 23:45:59 +1000
message:
Add an XXX comment to the test suite hack.
------------------------------------------------------------
revno: 1739.1.13.2.52
merged: andrew.bennetts at canonical.com-20060810015246-f155b70b3aecb0c4
parent: andrew.bennetts at canonical.com-20060809053346-9828bf251a902895
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Thu 2006-08-10 11:52:46 +1000
message:
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
------------------------------------------------------------
revno: 1739.1.13.2.51
merged: andrew.bennetts at canonical.com-20060809053346-9828bf251a902895
parent: andrew.bennetts at canonical.com-20060809052723-1aeefb036ba10880
parent: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-09 15:33:46 +1000
message:
Merge from trivial
------------------------------------------------------------
revno: 1739.1.13.2.42.1.5
merged: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
parent: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
parent: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-09 15:33:40 +1000
message:
Merge from trivial
------------------------------------------------------------
revno: 1739.1.13.2.41.1.5
merged: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
parent: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
parent: andrew.bennetts at canonical.com-20060809053328-ccdb3e9a96032fc9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-09 15:33:34 +1000
message:
Merge from trivial
------------------------------------------------------------
revno: 1739.1.13.2.50
merged: andrew.bennetts at canonical.com-20060809052723-1aeefb036ba10880
parent: andrew.bennetts at canonical.com-20060809050834-41d4b6785c0a853a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-09 15:27:23 +1000
message:
Implement RemoteBzrDir.create_{branch,workingtree}
------------------------------------------------------------
revno: 1739.1.13.2.49
merged: andrew.bennetts at canonical.com-20060809050834-41d4b6785c0a853a
parent: andrew.bennetts at canonical.com-20060808062053-162d53230017d464
parent: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Wed 2006-08-09 15:08:34 +1000
message:
Merge from old remote working tree initialisation
------------------------------------------------------------
revno: 1739.1.13.2.42.1.4
merged: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
parent: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
parent: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Wed 2006-08-09 15:08:28 +1000
message:
Merge from old remote working tree initialisation
------------------------------------------------------------
revno: 1739.1.13.2.41.1.4
merged: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
parent: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
parent: andrew.bennetts at canonical.com-20060809050811-885fa7c9769a335f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Wed 2006-08-09 15:08:21 +1000
message:
Merge from old remote working tree initialisation
------------------------------------------------------------
revno: 1739.1.13.2.48
merged: andrew.bennetts at canonical.com-20060808062053-162d53230017d464
parent: andrew.bennetts at canonical.com-20060808061853-9153fa0d72fdf97f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 16:20:53 +1000
message:
Support stat
------------------------------------------------------------
revno: 1739.1.13.2.47
merged: andrew.bennetts at canonical.com-20060808061853-9153fa0d72fdf97f
parent: andrew.bennetts at canonical.com-20060808061458-9526a69776d67f71
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 16:18:53 +1000
message:
Fix SmartTransport.list_dir to return ascii.
------------------------------------------------------------
revno: 1739.1.13.2.46
merged: andrew.bennetts at canonical.com-20060808061458-9526a69776d67f71
parent: andrew.bennetts at canonical.com-20060808060527-edb1f37cf4930fa2
parent: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 16:14:58 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.42.1.3
merged: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
parent: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
parent: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Tue 2006-08-08 16:14:45 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.41.1.3
merged: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
parent: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
parent: andrew.bennetts at canonical.com-20060808061352-d7b8e85867309a8f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-08 16:14:36 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.45
merged: andrew.bennetts at canonical.com-20060808060527-edb1f37cf4930fa2
parent: andrew.bennetts at canonical.com-20060808045734-59e5ce5e81c7b697
parent: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 16:05:27 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.42.1.2
merged: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
parent: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
parent: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Tue 2006-08-08 16:04:28 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.41.1.2
merged: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
parent: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
parent: andrew.bennetts at canonical.com-20060808055529-3e6de5268b3d7cc7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-08 16:02:20 +1000
message:
Merge from list_dir return type
------------------------------------------------------------
revno: 1739.1.13.2.44
merged: andrew.bennetts at canonical.com-20060808045734-59e5ce5e81c7b697
parent: andrew.bennetts at canonical.com-20060808045253-800b1d99353e6a14
parent: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 14:57:34 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.42.1.1
merged: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
parent: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
parent: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Tue 2006-08-08 14:56:54 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.41.1.1
merged: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
parent: andrew.bennetts at canonical.com-20060808045418-aa1b64d384cff417
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-08 14:56:17 +1000
message:
Merge from test-tweaks.
------------------------------------------------------------
revno: 1739.1.13.2.43
merged: andrew.bennetts at canonical.com-20060808045253-800b1d99353e6a14
parent: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
parent: andrew.bennetts at canonical.com-20060808044415-c45ae6190e1acc50
parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote bzrdir
timestamp: Tue 2006-08-08 14:52:53 +1000
message:
Fix get_{branch,repository,workingtree}_transport.
------------------------------------------------------------
revno: 1739.1.13.2.42
merged: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add list_dir to smart transport
timestamp: Tue 2006-08-08 14:36:57 +1000
message:
Add list_dir and iter_files_recursive smart transport
------------------------------------------------------------
revno: 1739.1.13.2.41
merged: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
parent: andrew.bennetts at canonical.com-20060808022431-b6502cd7cd89993d
parent: andrew.bennetts at canonical.com-20060808023124-acc195a4317a5217
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-08 12:36:38 +1000
message:
Merge trivial change.
------------------------------------------------------------
revno: 1739.1.13.2.40
merged: andrew.bennetts at canonical.com-20060808022431-b6502cd7cd89993d
parent: mbp at sourcefrog.net-20060727082448-9ce17c5605763cb2
parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: high performance smart server
timestamp: Tue 2006-08-08 12:24:31 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.13.2.39
merged: mbp at sourcefrog.net-20060727082448-9ce17c5605763cb2
parent: mbp at sourcefrog.net-20060727074733-24a4872fb9c53486
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: high performance smart server
timestamp: Thu 2006-07-27 18:24:48 +1000
message:
[broken] implement upgrade apis on remote bzrdirs
------------------------------------------------------------
revno: 1739.1.13.2.38
merged: mbp at sourcefrog.net-20060727074733-24a4872fb9c53486
parent: mbp at sourcefrog.net-20060726054840-d3344049249fe894
parent: mbp at sourcefrog.net-20060727073915-0a90554790f072f0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: high performance smart server
timestamp: Thu 2006-07-27 17:47:33 +1000
message:
[merge] fixes for make_bzrdir etc
------------------------------------------------------------
revno: 1739.1.144.2.1
merged: mbp at sourcefrog.net-20060727073915-0a90554790f072f0
parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: selftest make_bzrdir should use transport
timestamp: Thu 2006-07-27 17:39:15 +1000
message:
make_bzrdir and make_branch now work on transports that aren't backed by local
disk.
Fix TestCase.get_url() so that it always returns either a path or a url, not
an invalid melange of both escaping rules.
------------------------------------------------------------
revno: 1739.1.13.2.37
merged: mbp at sourcefrog.net-20060726054840-d3344049249fe894
parent: mbp at sourcefrog.net-20060724042820-1b38096641f0207d
parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: high performance smart server
timestamp: Wed 2006-07-26 15:48:40 +1000
message:
[broken] merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.36
merged: mbp at sourcefrog.net-20060724042820-1b38096641f0207d
parent: mbp at sourcefrog.net-20060724042754-cf0ce2d60ca3c6a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 14:28:20 +1000
message:
More hpss transport-like operations
------------------------------------------------------------
revno: 1739.1.13.2.35
merged: mbp at sourcefrog.net-20060724042754-cf0ce2d60ca3c6a0
parent: mbp at sourcefrog.net-20060724033842-bc1bbeb746a824ef
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 14:27:54 +1000
message:
Transport test cleanups
Parameter to put() should be file-like, not a string.
Don't use stat() when has() will do.
------------------------------------------------------------
revno: 1739.1.13.2.34
merged: mbp at sourcefrog.net-20060724033842-bc1bbeb746a824ef
parent: mbp at sourcefrog.net-20060724032140-cdbbeab89c2a006f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 13:38:42 +1000
message:
Allow Transport.lock_read and lock_write to be not possible
------------------------------------------------------------
revno: 1739.1.13.2.33
merged: mbp at sourcefrog.net-20060724032140-cdbbeab89c2a006f
parent: mbp at sourcefrog.net-20060723235856-bef582197b5cfc9b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 13:21:40 +1000
message:
[broken] more hpss methods and adapt to bzrdir tests
------------------------------------------------------------
revno: 1739.1.13.2.32
merged: mbp at sourcefrog.net-20060723235856-bef582197b5cfc9b
parent: mbp at sourcefrog.net-20060723235045-3af213a793216784
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 09:58:56 +1000
message:
[broken] Run smart server connections in separate threads.
The test suite assumes servers will allow multiple simultaneous connections.
------------------------------------------------------------
revno: 1739.1.13.2.31
merged: mbp at sourcefrog.net-20060723235045-3af213a793216784
parent: mbp at sourcefrog.net-20060720110338-9b51dc9d5e67c08d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-07-24 09:50:45 +1000
message:
[broken] some support for write operations over hpss
------------------------------------------------------------
revno: 1739.1.13.2.30
merged: mbp at sourcefrog.net-20060720110338-9b51dc9d5e67c08d
parent: mbp at sourcefrog.net-20060720103537-dd993f46ddeec977
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-20 21:03:38 +1000
message:
Start adding a RemoteBzrDir, etc
------------------------------------------------------------
revno: 1739.1.13.2.29
merged: mbp at sourcefrog.net-20060720103537-dd993f46ddeec977
parent: mbp at sourcefrog.net-20060720061357-dd104c7ebe302f27
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-20 20:35:37 +1000
message:
Factor out BzrDir.open_from_transport()
------------------------------------------------------------
revno: 1739.1.13.2.28
merged: mbp at sourcefrog.net-20060720061357-dd104c7ebe302f27
parent: mbp at sourcefrog.net-20060720051118-b9c7e1ad249095e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-20 16:13:57 +1000
message:
Change all classes to SmartServer, etc; other cleanups
------------------------------------------------------------
revno: 1739.1.13.2.27
merged: mbp at sourcefrog.net-20060720051118-b9c7e1ad249095e8
parent: mbp at sourcefrog.net-20060720050307-fb5495f8f70d941c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-20 15:11:18 +1000
message:
Separate more smart server operations into a separate client class
------------------------------------------------------------
revno: 1739.1.13.2.26
merged: mbp at sourcefrog.net-20060720050307-fb5495f8f70d941c
parent: mbp at sourcefrog.net-20060719071534-52f79afc25f5d44b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-20 15:03:07 +1000
message:
test_read_bundle doesn't need to specially hold a connection open anymore
------------------------------------------------------------
revno: 1739.1.13.2.25
merged: mbp at sourcefrog.net-20060719071534-52f79afc25f5d44b
parent: mbp at sourcefrog.net-20060713084330-71c87c24d7b4e30b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Wed 2006-07-19 17:15:34 +1000
message:
Better url error message, doc
------------------------------------------------------------
revno: 1739.1.13.2.24
merged: mbp at sourcefrog.net-20060713084330-71c87c24d7b4e30b
parent: mbp at sourcefrog.net-20060713080053-fb3c173a141a408a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-13 18:43:30 +1000
message:
Fix up souk url handling during selftest
Server now treats paths as fs-absolute, as if it were run from ssh
Also some docs on future work
------------------------------------------------------------
revno: 1739.1.13.2.23
merged: mbp at sourcefrog.net-20060713080053-fb3c173a141a408a
parent: mbp at sourcefrog.net-20060713075546-b6b730c77e8f1ac5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-13 18:00:53 +1000
message:
Fix up reporting of bzr protocol errors
------------------------------------------------------------
revno: 1739.1.13.2.22
merged: mbp at sourcefrog.net-20060713075546-b6b730c77e8f1ac5
parent: mbp at sourcefrog.net-20060713071910-a10b703162003f0a
parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-13 17:55:46 +1000
message:
merge up with bzr.dev
------------------------------------------------------------
revno: 1739.1.13.2.21
merged: mbp at sourcefrog.net-20060713071910-a10b703162003f0a
parent: mbp at sourcefrog.net-20060621075603-d6761c384e5abcea
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-07-13 17:19:10 +1000
message:
Small cleanup for tests
------------------------------------------------------------
revno: 1739.1.13.2.20
merged: mbp at sourcefrog.net-20060621075603-d6761c384e5abcea
parent: mbp at sourcefrog.net-20060621060301-3f6bebead3c9bbcd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Wed 2006-06-21 17:56:03 +1000
message:
Reorganize SoukServer; implement basic get_bundle command.
------------------------------------------------------------
revno: 1739.1.13.2.19
merged: mbp at sourcefrog.net-20060621060301-3f6bebead3c9bbcd
parent: mbp at sourcefrog.net-20060621054811-3f46266f5f5372f8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Wed 2006-06-21 16:03:01 +1000
message:
Cleanup SFTPUrlHandling._unparse_url and callers
------------------------------------------------------------
revno: 1739.1.13.2.18
merged: mbp at sourcefrog.net-20060621054811-3f46266f5f5372f8
parent: mbp at sourcefrog.net-20060613083049-1908f2f4b2a0f707
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Wed 2006-06-21 15:48:11 +1000
message:
Formatting cleanups & docstrings
------------------------------------------------------------
revno: 1739.1.13.2.17
merged: mbp at sourcefrog.net-20060613083049-1908f2f4b2a0f707
parent: mbp at sourcefrog.net-20060613080740-fa9a5c9d58ef6118
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 18:30:49 +1000
message:
Get rid of old debug statements
------------------------------------------------------------
revno: 1739.1.13.2.16
merged: mbp at sourcefrog.net-20060613080740-fa9a5c9d58ef6118
parent: mbp at sourcefrog.net-20060613075434-364388512cc028e6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 18:07:40 +1000
message:
More fiddling with Souk transport paths
------------------------------------------------------------
revno: 1739.1.13.2.15
merged: mbp at sourcefrog.net-20060613075434-364388512cc028e6
parent: mbp at sourcefrog.net-20060613073909-05cdbb8837ff05b7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 17:54:34 +1000
message:
Remove LoopbackSoukConnection and cleanup tests.
Now more consistent with how other transports are tested
------------------------------------------------------------
revno: 1739.1.13.2.14
merged: mbp at sourcefrog.net-20060613073909-05cdbb8837ff05b7
parent: mbp at sourcefrog.net-20060613070553-82773518b7b911d4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 17:39:09 +1000
message:
Trying to clarify handling of paths in souk protocol
------------------------------------------------------------
revno: 1739.1.13.2.13
merged: mbp at sourcefrog.net-20060613070553-82773518b7b911d4
parent: mbp at sourcefrog.net-20060613023737-14b21a22c3162b1d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 17:05:53 +1000
message:
New bzr serve --port option
------------------------------------------------------------
revno: 1739.1.13.2.12
merged: mbp at sourcefrog.net-20060613023737-14b21a22c3162b1d
parent: mbp at sourcefrog.net-20060613015110-95485abc6dc722e0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 12:37:37 +1000
message:
New 'bzr serve --inet' runs souk server.
This is intended to be run across SSH.
Change buffering to work properly in this case.
------------------------------------------------------------
revno: 1739.1.13.2.11
merged: mbp at sourcefrog.net-20060613015110-95485abc6dc722e0
parent: mbp at sourcefrog.net-20060613014043-4ef82e3a11f09f2d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 11:51:10 +1000
message:
Rename from ssh to souk; most of this is not ssh-specific
------------------------------------------------------------
revno: 1739.1.13.2.10
merged: mbp at sourcefrog.net-20060613014043-4ef82e3a11f09f2d
parent: mbp at sourcefrog.net-20060613005316-a7100dc4096ae2ab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 11:40:43 +1000
message:
Get souk-over-tcp passing transport tests.
Rename ssh-specific classes to Souk.
Transports may indicate failure to connect from their constructor.
Register bzr:// transport.
Raise better error on failure to connect to souk server.
------------------------------------------------------------
revno: 1739.1.13.2.9
merged: mbp at sourcefrog.net-20060613005316-a7100dc4096ae2ab
parent: mbp at sourcefrog.net-20060612123914-9e23b388623b6e23
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Tue 2006-06-13 10:53:16 +1000
message:
Rename smart protocol to souk; start a simple tcp server
------------------------------------------------------------
revno: 1739.1.13.2.8
merged: mbp at sourcefrog.net-20060612123914-9e23b388623b6e23
parent: mbp at sourcefrog.net-20060612080529-9ba6ca259a740a99
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-06-12 22:39:14 +1000
message:
Enable more ssh tests.
------------------------------------------------------------
revno: 1739.1.13.2.7
merged: mbp at sourcefrog.net-20060612080529-9ba6ca259a740a99
parent: mbp at sourcefrog.net-20060612074137-5415381d179464fe
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-06-12 18:05:29 +1000
message:
SSH transport can now change directories and passes absolute paths.
------------------------------------------------------------
revno: 1739.1.13.2.6
merged: mbp at sourcefrog.net-20060612074137-5415381d179464fe
parent: mbp at sourcefrog.net-20060612064523-fd104e2ed22f5e4f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-06-12 17:41:37 +1000
message:
Fix and simplify MemoryTransport abspath code
------------------------------------------------------------
revno: 1739.1.13.2.5
merged: mbp at sourcefrog.net-20060612064523-fd104e2ed22f5e4f
parent: mbp at sourcefrog.net-20060611025000-3858575df398c073
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Mon 2006-06-12 16:45:23 +1000
message:
Add test for clone behaviour on SSHConnection
------------------------------------------------------------
revno: 1739.1.13.2.4
merged: mbp at sourcefrog.net-20060611025000-3858575df398c073
parent: mbp at sourcefrog.net-20060609000239-4fbe1c12ea0e551d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Sun 2006-06-11 12:50:00 +1000
message:
Refactor SFTP transport to allow code sharing with SSH.
Both use similar URL forms so move that to a common superclass.
Start adding some SSH tests for URL handling, currently disabled.
Clean up tests that assume URL returns are unicode, not 8-bit,
------------------------------------------------------------
revno: 1739.1.13.2.3
merged: mbp at sourcefrog.net-20060609000239-4fbe1c12ea0e551d
parent: mbp at sourcefrog.net-20060608233220-5d09725cc822399b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Fri 2006-06-09 01:02:39 +0100
message:
(ssh) more development of error handling
------------------------------------------------------------
revno: 1739.1.13.2.2
merged: mbp at sourcefrog.net-20060608233220-5d09725cc822399b
parent: mbp at sourcefrog.net-20060608204941-7e61050c6d73bed5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Fri 2006-06-09 00:32:20 +0100
message:
SSH get method; more development of framework.
------------------------------------------------------------
revno: 1739.1.13.2.1
merged: mbp at sourcefrog.net-20060608204941-7e61050c6d73bed5
parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.ssh
timestamp: Thu 2006-06-08 21:49:41 +0100
message:
Start implementation of a simple ssh server.
- test infrastructure
- act as a trivial Transport that can answer has()
(With thanks to robertc)
------------------------------------------------------------
revno: 1739.1.584.1.111
merged: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
parent: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
parent: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 09:09:02 +0100
message:
(robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
------------------------------------------------------------
revno: 1739.1.584.1.77.2.4
merged: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2007-04-20 17:38:20 +1000
message:
(robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
------------------------------------------------------------
revno: 1739.1.584.1.110
merged: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 08:40:25 +0100
message:
(robertc) Two minor misc-fixes.
------------------------------------------------------------
revno: 1739.1.584.1.77.2.3
merged: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
parent: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2007-04-20 17:06:54 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.584.1.77.2.2
merged: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
parent: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-04-05 18:44:49 +1000
message:
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
------------------------------------------------------------
revno: 1739.1.584.1.77.2.1
merged: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-04-05 13:07:06 +1000
message:
Split out the improvement to Transport.local_abspath to raise NotLocalURL from the hpss-faster-copy branch. (Martin Pool, Ian Clatworthy)
------------------------------------------------------------
revno: 1739.1.584.1.109
merged: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
parent: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
parent: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 23:46:37 +0100
message:
(John Arbash Meinel) Optimizations for MergeSorter
------------------------------------------------------------
revno: 1739.1.584.1.102.4.5
merged: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
parent: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Thu 2007-04-19 15:05:32 -0500
message:
Resolve NEWS conflict
------------------------------------------------------------
revno: 1739.1.584.1.102.4.4
merged: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
parent: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Thu 2007-04-19 11:03:00 -0500
message:
NEWS about the MergeSorter improvement.
------------------------------------------------------------
revno: 1739.1.584.1.102.4.3
merged: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
parent: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 19:03:01 -0500
message:
Inline self._pop_node and self._push_node
These are still separate functions, but rather than using self._a_stack.append
we assign a local variable a_stack_append, and call it directly.
This drops the merge_sort() time down to approx 385ms-400ms
With that large of a speed-up it seems worth the loss
in readability. (This is almost 50% of the original time)
------------------------------------------------------------
revno: 1739.1.584.1.102.4.2
merged: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
parent: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 18:37:37 -0500
message:
Change valid self._foo variables into local variables.
Using __slots__ changed sort time from ~700ms => ~600ms.
Using local variables drops it down to 530 - 550ms.
------------------------------------------------------------
revno: 1739.1.584.1.102.4.1
merged: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 18:24:48 -0500
message:
Use __slots__ for MergeSorter
------------------------------------------------------------
revno: 1739.1.584.1.108
merged: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
parent: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
parent: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 23:03:15 +0100
message:
(John Arbash Meinel) 'make api-docs' will generate api documentation using epydoc.
------------------------------------------------------------
revno: 1739.1.584.1.90.4.2
merged: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: api-doc-builders
timestamp: Tue 2007-04-17 09:29:05 -0500
message:
Remove the build-api script (as requested by Martin)
------------------------------------------------------------
revno: 1739.1.584.1.90.4.1
merged: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: api-doc-builders
timestamp: Thu 2007-04-12 15:27:42 -0500
message:
Cherrypick just the epydoc builder changes.
This is just the piece of change that makes 'make api-docs' work,
without any actual documentation changes.
------------------------------------------------------------
revno: 1739.1.584.1.107
merged: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
parent: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
parent: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 22:32:43 +0100
message:
(John Arbash Meinel) Remove the time dependency for a couple tests.
------------------------------------------------------------
revno: 1739.1.584.1.95.3.1
merged: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: xfail_no_time
timestamp: Fri 2007-04-13 15:29:23 -0500
message:
Remove timing dependencies from the selftest tests.
------------------------------------------------------------
revno: 1739.1.584.1.106
merged: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 21:30:13 +0100
message:
(John Arbash Meinel) Simple test cleanup for win32
------------------------------------------------------------
revno: 1739.1.584.1.102.3.1
merged: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Thu 2007-04-19 13:27:56 -0500
message:
Change the DirState.test_initialize test so that we don't try to read a locked file.
------------------------------------------------------------
revno: 1739.1.584.1.105
merged: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
parent: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
parent: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 10:52:56 +0100
message:
(bialix) some fixes for win32
------------------------------------------------------------
revno: 1739.1.584.1.100.2.3
merged: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
parent: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-04-18 22:46:50 +0300
message:
shutil no more needed in clean_selftest_output()
------------------------------------------------------------
revno: 1739.1.584.1.100.2.2
merged: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
parent: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-04-18 17:06:46 +0300
message:
Explicit error messages for test FTP server (Python 2.5 @ win32 compatibility)
------------------------------------------------------------
revno: 1739.1.584.1.100.2.1
merged: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Tue 2007-04-17 15:20:24 +0300
message:
Fix for walkdirs in missing dir with Py2.4 @ win32
------------------------------------------------------------
revno: 1739.1.584.1.104
merged: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
parent: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
parent: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 09:21:17 +0100
message:
(robertc) Merge see-also support for command help. (Robert Collins).
------------------------------------------------------------
revno: 1739.1.584.1.102.1.3
merged: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
parent: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-19 17:40:42 +1000
message:
Python 2.4 compatability change for the new help see-also tests.
------------------------------------------------------------
revno: 1739.1.584.1.102.1.2
merged: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
parent: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-19 17:13:17 +1000
message:
(robertc) Merge see-also support for command help. (Robert Collins).
------------------------------------------------------------
revno: 1739.1.584.1.102.2.4
merged: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
parent: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 15:32:24 +1000
message:
Update the doc_generate logic to include see-also help topics.
(Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.102.2.3
merged: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
parent: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 15:21:37 +1000
message:
Update existing builtin commands help text to use _see_also. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.102.2.2
merged: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
parent: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 14:54:08 +1000
message:
``bzr help`` now provides cross references to other help topics using the
_see_also facility on command classes. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.102.2.1
merged: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Wed 2007-04-18 18:39:02 +1000
message:
Command objects can now declare related help topics by having _see_also
set to a list of related topic. Updated the HACKING guide entry on
documentation to be more clear about how the help for commands is
generated and to reference this new feature. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.103
merged: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 08:09:06 +0100
message:
(robertc) ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388. (Robert Collins).
------------------------------------------------------------
revno: 1739.1.584.1.102.1.1
merged: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make-man1
timestamp: Thu 2007-04-19 12:27:44 +1000
message:
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.102
merged: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
parent: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
parent: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 09:04:15 +0100
message:
Also clear SmartTCPServer hooks from TestCase._clear_hooks
------------------------------------------------------------
revno: 1739.1.584.1.100.1.2
merged: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmarks
timestamp: Tue 2007-04-17 17:38:47 +1000
message:
Also clear SmartTCPServer hooks from TestCase._clear_hooks
------------------------------------------------------------
revno: 1739.1.584.1.100.1.1
merged: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmarks
timestamp: Tue 2007-04-17 16:51:02 +1000
message:
fix import order dependency that broke benchmarks
------------------------------------------------------------
revno: 1739.1.584.1.101
merged: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
parent: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 08:09:43 +0100
message:
Add -1 option to selftest
------------------------------------------------------------
revno: 1739.1.584.1.95.2.2
merged: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
parent: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Tue 2007-04-17 16:26:23 +1000
message:
Add -1 option to selftest
------------------------------------------------------------
revno: 1739.1.584.1.95.2.1
merged: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-04-16 14:38:58 +1000
message:
Add -f alias for selftest --first
------------------------------------------------------------
revno: 1739.1.584.1.100
merged: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
parent: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 01:59:30 +0100
message:
Fix ftp transport with servers that don't support atomic rename
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.4
merged: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
parent: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 17:12:29 -0400
message:
Revert now-unnecessary changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.3
merged: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
parent: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 17:03:45 -0400
message:
Separate FtpTransport.rename from FtpTransport.move
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.2
merged: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
parent: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 11:38:10 -0400
message:
FTP does not require atomic rename. Fixes #89436
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.1
merged: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 08:54:30 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.99
merged: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
parent: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
parent: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 22:05:46 +0100
message:
(bialix,r=john) win32-related selftest improvements
------------------------------------------------------------
revno: 1739.1.584.1.85.1.8
merged: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
parent: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Mon 2007-04-16 23:42:59 +0300
message:
forget to return tree
------------------------------------------------------------
revno: 1739.1.584.1.85.1.7
merged: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
parent: bialix at ukr.net-20070414121935-s673tupvwywawpwv
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 21:26:36 +0300
message:
Fix blackbox test_status_out_of_date: unlock WT before next command running
------------------------------------------------------------
revno: 1739.1.584.1.85.1.6
merged: bialix at ukr.net-20070414121935-s673tupvwywawpwv
parent: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:19:35 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.85.1.5
merged: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
parent: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:18:42 +0300
message:
John's patch for WT4 on Windows+Python2.4
------------------------------------------------------------
revno: 1739.1.584.1.85.1.4
merged: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
parent: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:17:31 +0300
message:
workingtree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 1739.1.584.1.85.1.3
merged: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
parent: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 14:55:51 +0300
message:
tree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 1739.1.584.1.85.1.2
merged: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
parent: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-13 10:03:32 +0300
message:
intertree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 1739.1.584.1.85.1.1
merged: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-13 10:02:10 +0300
message:
fix error handler in _rmtree_temp_dir()
------------------------------------------------------------
revno: 1739.1.584.1.98
merged: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
parent: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 19:08:53 +0100
message:
(Andrew Bennetts) Rename SmartClient to _SmartClient.
------------------------------------------------------------
revno: 1739.1.584.1.91.1.4
merged: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany-2
timestamp: Tue 2007-04-17 02:38:37 +1000
message:
Rename SmartClient to _SmartClient.
------------------------------------------------------------
revno: 1739.1.584.1.97
merged: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
parent: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 09:02:54 +0100
message:
(Andrew Bennetts) Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
------------------------------------------------------------
revno: 1739.1.584.1.91.1.3
merged: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
parent: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany-2
timestamp: Mon 2007-04-16 15:24:58 +1000
message:
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
------------------------------------------------------------
revno: 1739.1.584.1.91.1.2
merged: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
parent: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany-2
timestamp: Mon 2007-04-16 12:44:04 +1000
message:
Deal with review comments.
------------------------------------------------------------
revno: 1739.1.584.1.91.1.1
merged: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany-2
timestamp: Fri 2007-04-13 17:59:17 +1000
message:
Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
------------------------------------------------------------
revno: 1739.1.584.1.96
merged: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 06:45:15 +0100
message:
(robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
------------------------------------------------------------
revno: 1739.1.584.1.95.1.1
merged: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-16 13:26:30 +1000
message:
(robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
------------------------------------------------------------
revno: 1739.1.584.1.43.2.1
merged: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: mk-fix
timestamp: Tue 2007-03-20 17:49:23 -0500
message:
(trivial) Use 'python setup.py' instead of './setup.py'.
------------------------------------------------------------
revno: 1739.1.584.1.95
merged: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
parent: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 18:41:00 +0100
message:
(Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
------------------------------------------------------------
revno: 1739.1.584.1.94.1.1
merged: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
parent: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-04-13 11:37:47 -0500
message:
(Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
------------------------------------------------------------
revno: 1739.1.584.1.86.1.2
merged: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
parent: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Fri 2007-04-13 19:51:14 +0400
message:
Used one-line conditional expression instead of the multi-line one
------------------------------------------------------------
revno: 1739.1.584.1.86.1.1
merged: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Thu 2007-04-12 15:47:48 +0400
message:
Fixed _comparison_data() on Windows in case of the entry is None
------------------------------------------------------------
revno: 1739.1.584.1.94
merged: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
parent: pqm at pqm.ubuntu.com-20070413153758-6rwva0hs3h07wmpl
parent: john at arbash-meinel.com-20070413142902-28o8mnhj2sk5qcpg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 17:02:37 +0100
message:
(John Arbash Meinel) When shutting down the test FtpServer, trap EBADF
------------------------------------------------------------
revno: 1739.1.584.1.90.3.2
merged: john at arbash-meinel.com-20070413142902-28o8mnhj2sk5qcpg
parent: john at arbash-meinel.com-20070412213837-cim2mupcek5kjyw3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ftp_ignore_ebadf
timestamp: Fri 2007-04-13 09:29:02 -0500
message:
cleanup comment (from Martin)
------------------------------------------------------------
revno: 1739.1.584.1.90.3.1
merged: john at arbash-meinel.com-20070412213837-cim2mupcek5kjyw3
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ftp_ignore_ebadf
timestamp: Thu 2007-04-12 16:38:37 -0500
message:
Trap EBADF during shutdown of asyncore.loop()
------------------------------------------------------------
revno: 1739.1.584.1.93
merged: pqm at pqm.ubuntu.com-20070413153758-6rwva0hs3h07wmpl
parent: pqm at pqm.ubuntu.com-20070413143426-6aj60em3rta94aw0
parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 16:37:58 +0100
message:
(Andrew Bennetts) Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
------------------------------------------------------------
revno: 1739.1.584.1.90.2.1
merged: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: rename-SmartTransport
timestamp: Fri 2007-04-13 15:15:36 +1000
message:
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
------------------------------------------------------------
revno: 1739.1.584.1.92
merged: pqm at pqm.ubuntu.com-20070413143426-6aj60em3rta94aw0
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
parent: john at arbash-meinel.com-20070412211829-dduwktk8in0e6zpl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 15:34:26 +0100
message:
(John Arbash Meinel) Update FtpServer for setUp(vfs_server), and MedusaFeature
------------------------------------------------------------
revno: 1739.1.584.1.90.1.2
merged: john at arbash-meinel.com-20070412211829-dduwktk8in0e6zpl
parent: john at arbash-meinel.com-20070412205634-so7gafs8m0xc7v8x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_case_with_ftp_server
timestamp: Thu 2007-04-12 16:18:29 -0500
message:
Clean up test ordering
------------------------------------------------------------
revno: 1739.1.584.1.90.1.1
merged: john at arbash-meinel.com-20070412205634-so7gafs8m0xc7v8x
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_case_with_ftp_server
timestamp: Thu 2007-04-12 15:56:34 -0500
message:
Implement TestCaseWithFTPServer using the new shiny Feature mechanism.
Also update FtpServer so that it conforms to the expected setUp(vfs_server)
functionality.
------------------------------------------------------------
revno: 1739.1.584.1.91
merged: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 06:06:23 +0100
message:
(Andrew Bennetts, Robert Collins) Add a 'token' argument to lock_write.
------------------------------------------------------------
revno: 1739.1.540.7.13
merged: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
parent: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Fri 2007-04-13 11:09:47 +1000
message:
Add a brief explanation of what tokens are used for to lock_write docstrings.
------------------------------------------------------------
revno: 1739.1.540.7.12
merged: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
parent: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 18:26:51 +1000
message:
Update NEWS.
------------------------------------------------------------
revno: 1739.1.540.7.11
merged: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
parent: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 18:03:10 +1000
message:
Remove some XXXs.
------------------------------------------------------------
revno: 1739.1.540.7.10
merged: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
parent: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 17:43:31 +1000
message:
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). (copied from hpss branch)
------------------------------------------------------------
revno: 1739.1.540.7.9
merged: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
parent: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 17:37:25 +1000
message:
Remove some redundant code pointed out by Robert's review, and remove some unused imports while I'm there.
------------------------------------------------------------
revno: 1739.1.540.7.8
merged: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
parent: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 13:34:50 +1000
message:
Update NEWS
------------------------------------------------------------
revno: 1739.1.540.7.7
merged: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
parent: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-04-11 23:35:32 +1000
message:
LockDir, Repository and Branch lock token changes from the hpss branch.
------------------------------------------------------------
revno: 1739.1.540.7.6
merged: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
parent: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-04-11 16:40:05 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.540.7.5
merged: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
parent: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-03-29 15:14:01 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.540.7.4
merged: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
parent: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:54:03 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.540.7.3
merged: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
parent: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:38:53 +1000
message:
Some tweaks in response to review.
------------------------------------------------------------
revno: 1739.1.540.7.2
merged: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:08:42 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.540.7.1
merged: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Mon 2007-02-12 15:49:32 +1100
message:
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that
a seperate LockableFiles instance can share a lock if it has the right token.
(Andrew Bennetts, Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.90
merged: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
parent: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 16:03:56 +0100
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 1739.1.584.1.48.1.2
merged: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
parent: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
parent: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-12 09:39:44 -0500
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 1739.1.584.1.51.1.6
merged: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
parent: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:09:57 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 1739.1.584.1.51.1.5
merged: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
parent: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:01:05 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 1739.1.584.1.51.1.4
merged: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
parent: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Mon 2007-04-02 11:18:40 +1000
message:
Include feedback from mailing list.
------------------------------------------------------------
revno: 1739.1.584.1.51.1.3
merged: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Thu 2007-03-29 19:18:03 +1000
message:
Minor man page fixes for add, commit, export
------------------------------------------------------------
revno: 1739.1.584.1.89
merged: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 15:19:38 +0100
message:
(John Arbash Meinel) Add more get_file_mtime tests.
------------------------------------------------------------
revno: 1739.1.584.1.82.3.2
merged: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
parent: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Thu 2007-04-12 08:57:16 -0500
message:
Fix one test.
------------------------------------------------------------
revno: 1739.1.584.1.82.3.1
merged: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Wed 2007-04-11 17:14:59 -0500
message:
Add some tests for get_file_mtime, and clean up others.
------------------------------------------------------------
revno: 1739.1.584.1.88
merged: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:59:02 +0100
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 1739.1.584.1.82.2.3
merged: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Thu 2007-04-12 19:21:48 +1000
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 1739.1.584.1.87
merged: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:32:42 +0100
message:
(Andrew Bennetts) Add a brief Portability section to HACKING, build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 1739.1.584.1.82.2.2
merged: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
parent: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 20:46:19 +1000
message:
Add a brief section on portability to HACKING.
------------------------------------------------------------
revno: 1739.1.584.1.82.2.1
merged: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 18:09:06 +1000
message:
Build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 1739.1.584.1.86
merged: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 07:34:53 +0100
message:
Better tag upgrade message
------------------------------------------------------------
revno: 1739.1.584.1.59.2.4.1.1
merged: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
parent: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
parent: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-04-12 15:01:45 +1000
message:
Better tag upgrade message
------------------------------------------------------------
revno: 1739.1.584.1.59.3.1
merged: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.better-tag-msgs
timestamp: Thu 2007-03-29 12:28:31 +1000
message:
Better tag/tags error message (#97674)
------------------------------------------------------------
revno: 1739.1.584.1.85
merged: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 04:20:19 +0100
message:
(John Arbash Meinel) Fix bug #103870 by teaching show_diff_trees about modified files in renamed directories
------------------------------------------------------------
revno: 1739.1.584.1.82.1.4
merged: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
parent: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:08:39 -0500
message:
NEWS for fixing bug #103870
------------------------------------------------------------
revno: 1739.1.584.1.82.1.3
merged: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
parent: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:05:16 -0500
message:
Do a better fix, which recognizes that we should pass the correct old path.
------------------------------------------------------------
revno: 1739.1.584.1.82.1.2
merged: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
parent: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:02:15 -0500
message:
Fix bug #103870 by passing None instead of a (sometimes wrong) path
------------------------------------------------------------
revno: 1739.1.584.1.82.1.1
merged: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 16:57:36 -0500
message:
Add a bunch of direct tests for 'show_diff_trees'
------------------------------------------------------------
revno: 1739.1.584.1.84
merged: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:59:53 +0100
message:
(bialix,r=john) win32-related selftest improvements
------------------------------------------------------------
revno: 1739.1.584.1.56.6.4
merged: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
parent: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Tue 2007-04-10 15:44:09 +0300
message:
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific)
------------------------------------------------------------
revno: 1739.1.584.1.56.6.3
merged: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
parent: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 01:33:43 +0300
message:
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32
------------------------------------------------------------
revno: 1739.1.584.1.56.6.2
merged: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
parent: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 00:30:29 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.56.6.1
merged: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-28 17:48:07 +0300
message:
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
------------------------------------------------------------
revno: 1739.1.584.1.83
merged: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:33:51 +0100
message:
(Andrew Bennetts) Use repo.supports_rich_root() rather than repo._format.rich_root_data
------------------------------------------------------------
revno: 1739.1.566.2.4
merged: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
parent: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:43:39 +1000
message:
Reinstate checking of source & targer _serializer that I accidentally clobbered.
------------------------------------------------------------
revno: 1739.1.566.2.3
merged: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
parent: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:41:21 +1000
message:
Bring across test_repository improvements from the hpss branch to fix the last test failures.
------------------------------------------------------------
revno: 1739.1.566.2.2
merged: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
parent: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:37:53 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.566.2.1
merged: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Thu 2007-03-01 14:58:39 +1100
message:
Use repo.supports_rich_root() everywhere rather than
repo._format.rich_root_data.
This is needed for the smart server work, because a RemoteRepository's _format
doesn't know whether or not the actual repository supports rich root data or
not. But the RemoteRepository does (by asking the underlying repository it is
connected to).
This also removes some unnecessary isinstance(..., Repository), which also
hinders smart server work, because RemoteRepository doesn't inherit from
Repository, even though it implements the same interface.
------------------------------------------------------------
revno: 1739.1.584.1.82
merged: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
parent: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 05:48:55 +0100
message:
Fix bzr cat-revision REVISION_ID
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.18
merged: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-04-11 00:12:59 -0400
message:
Add copyright notice
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17
merged: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
parent: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 17:05:17 -0400
message:
Move cat-revision tests out of test_revision_info
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.16
merged: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
parent: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 16:46:57 -0400
message:
Fix cat-revision REVISION
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.15
merged: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-04-05 16:27:32 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.81
merged: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
parent: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
parent: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 03:23:59 +0100
message:
Use the Command pattern for smart server request handling
------------------------------------------------------------
revno: 1739.1.584.1.79.1.2
merged: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
parent: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-part-two-server-commands
timestamp: Wed 2007-04-11 12:01:18 +1000
message:
Deal with review comments.
------------------------------------------------------------
revno: 1739.1.584.1.79.1.1
merged: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-part-two-server-commands
timestamp: Wed 2007-04-11 00:12:35 +1000
message:
Use the Command pattern for handling smart server commands.
This improves readability and testability.
This change has been extracted from the hpss branch.
------------------------------------------------------------
revno: 1739.1.584.1.80
merged: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
parent: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 02:53:43 +0100
message:
(John Arbash Meinel) Fix bug #103757 by teaching common_ancestor to shortcut when a tip is in the other ancestry.
------------------------------------------------------------
revno: 1739.1.584.1.78.1.5
merged: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
parent: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 20:29:20 -0500
message:
[merge] bzr.dev 2402
------------------------------------------------------------
revno: 1739.1.584.1.78.1.4
merged: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
parent: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 14:15:41 -0500
message:
NEWS about fixing bug #103757
------------------------------------------------------------
revno: 1739.1.584.1.78.1.3
merged: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
parent: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 13:30:32 -0500
message:
We don't need to extract ancestry_b until we after we've checked for existence.
It seems to make sense to check 'b in ancestry_a' first, though we might consider checking
a in ancestry_b first.
b in a is merging something which has already been merged.
a in b is merging something which has merged you.
And 'a in b' may actually be more common.
The timing difference is fairly small, though.
------------------------------------------------------------
revno: 1739.1.584.1.78.1.2
merged: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
parent: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 13:13:05 -0500
message:
Ancestry checks can be done using the dictionaries
And we don't need to create 2 sets, one will do just fine.
------------------------------------------------------------
revno: 1739.1.584.1.78.1.1
merged: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 12:57:23 -0500
message:
Shortcut the common_ancestor code when one tip is in the ancestry of the other.
------------------------------------------------------------
revno: 1739.1.584.1.79
merged: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
parent: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-10 08:43:02 +0100
message:
(Andrew Bennetts) Split bzrlib/transport/smart.py into several smaller modules.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.9
merged: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
parent: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 17:20:43 +1000
message:
Fix blackbox/test_serve, there were some trivial changes that needed to be brought across from the hpss branch.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.8
merged: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
parent: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 15:54:15 +1000
message:
Add a NEWS entry.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.7
merged: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
parent: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 15:49:02 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.6
merged: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
parent: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 12:31:42 +1000
message:
Cosmetic changes to minimise the difference between this branch and the hpss branch.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.5
merged: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
parent: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 12:22:55 +1000
message:
Add some missing docstrings and copyright boilerplate.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.4
merged: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
parent: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Tue 2007-04-10 12:09:14 +1000
message:
Tidy up accidental changes.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.3
merged: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
parent: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Mon 2007-04-09 14:49:55 +1000
message:
Split smart transport code into several separate modules.
------------------------------------------------------------
revno: 1739.1.584.1.77.1.2
merged: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
parent: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Fri 2007-04-06 11:19:30 +1000
message:
Move SmartTCPServer classes into bzrlib/smart/server.py
------------------------------------------------------------
revno: 1739.1.584.1.77.1.1
merged: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: split-smart-part-1-rename
timestamp: Fri 2007-04-06 01:20:57 +1000
message:
Rename bzrlib/transport/smart.py to bzrlib/transport/remote.py.
First part of the code reorganisation from the hpss branch.
------------------------------------------------------------
revno: 1739.1.584.1.78
merged: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
parent: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-05 08:31:43 +0100
message:
(robertc) SmartServer startup and shutdown hooks, and smart server shutdown logic implementation. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.53.3.9
merged: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
parent: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Thu 2007-04-05 16:59:17 +1000
message:
Review comments.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.8
merged: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
parent: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Thu 2007-04-05 10:39:03 +1000
message:
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.7
merged: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
parent: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-04-04 18:50:28 +1000
message:
Avoid logging smart server errors when ctrl-C'd.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.6
merged: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
parent: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Wed 2007-04-04 15:19:38 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.5
merged: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
parent: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-28 07:40:48 +1000
message:
Fix Branch hook tests for the new eans of preserving hooks by the test suite.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.4
merged: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
parent: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:57:59 +1000
message:
Add more debugging code to the smart server to debug pqm failures.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.3
merged: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
parent: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:32:24 +1000
message:
Fix all smart_transport tests.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.2
merged: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
parent: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:21:26 +1000
message:
Convert unconvered SmartServer subclass to use the cached sockname.
------------------------------------------------------------
revno: 1739.1.584.1.53.3.1
merged: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 12:45:46 +1000
message:
New SmartServer hooks facility. There are two initial hooks documented in
bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
plugins to execute code upon server startup and shutdown.
(Robert Collins).
SmartServer in standalone mode will now close its listening socket when it
stops, rather than waiting for garbage collection. This primarily fixes
test suite hangs when a test tries to connect to a shutdown server. It
may also help improve behaviour when dealing with a server running on a
specific port (rather than dynamically assigned ports). (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.47.4.2
merged: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
parent: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Tue 2007-03-27 12:42:01 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 1739.1.584.1.47.4.1
merged: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Sun 2007-03-25 18:59:56 +1000
message:
New SmartServer hooks facility. There are two initial hooks documented
in bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
plugins to execute code upon server startup and shutdown.
(Robert Collins).
SmartServer in standalone mode will now close its listening socket
when it stops, rather than waiting for garbage collection. This primarily
fixes test suite hangs when a test tries to connect to a shutdown server.
It may also help improve behaviour when dealing with a server running
on a specific port (rather than dynamically assigned ports).
(Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.77
merged: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
parent: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
parent: john at arbash-meinel.com-20070402155001-70do43yebrb4mofq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 22:39:03 +0100
message:
(John Arbash Meinel) Some cleanups for tests failing on Mac OS X
------------------------------------------------------------
revno: 1739.1.584.1.63.1.3
merged: john at arbash-meinel.com-20070402155001-70do43yebrb4mofq
parent: john at arbash-meinel.com-20070329202002-lqyqp0edqitj9pca
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mac
timestamp: Mon 2007-04-02 10:50:01 -0500
message:
import errno in test_strace.py (recommended by Ian Clatworthy)
------------------------------------------------------------
revno: 1739.1.584.1.63.1.2
merged: john at arbash-meinel.com-20070329202002-lqyqp0edqitj9pca
parent: john at arbash-meinel.com-20070329191928-654ol08hdlfir4zj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mac
timestamp: Thu 2007-03-29 15:20:02 -0500
message:
Make sure errno is imported if we are going to use it later.
------------------------------------------------------------
revno: 1739.1.584.1.63.1.1
merged: john at arbash-meinel.com-20070329191928-654ol08hdlfir4zj
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mac
timestamp: Thu 2007-03-29 14:19:28 -0500
message:
Update test_unicode_bundle, since we know how it fails on Mac OSX
------------------------------------------------------------
revno: 1739.1.584.1.76
merged: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
parent: pqm at pqm.ubuntu.com-20070404130151-7d01ccd3ef215fad
parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 15:05:24 +0100
message:
Fix encoding bug generating error on already-versioned files
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.14
merged: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
parent: aaron.bentley at utoronto.ca-20070404023810-4gl2ygbehh15xjzn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 22:41:16 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.13
merged: aaron.bentley at utoronto.ca-20070404023810-4gl2ygbehh15xjzn
parent: aaron.bentley at utoronto.ca-20070404023125-jvo5vuvzf170kpyw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 22:38:10 -0400
message:
Fail if BzrError not raised
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.12
merged: aaron.bentley at utoronto.ca-20070404023125-jvo5vuvzf170kpyw
parent: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 22:31:25 -0400
message:
Fix encoding of 'already versioned' error
------------------------------------------------------------
revno: 1739.1.584.1.75
merged: pqm at pqm.ubuntu.com-20070404130151-7d01ccd3ef215fad
parent: pqm at pqm.ubuntu.com-20070404090456-ef02e7c65da4e4a7
parent: mbp at sourcefrog.net-20070404114026-mhlnmyk2x50rgti8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 14:01:51 +0100
message:
rename 'revision store' to 'repository' in bzr info
------------------------------------------------------------
revno: 1739.1.584.1.72.1.1
merged: mbp at sourcefrog.net-20070404114026-mhlnmyk2x50rgti8
parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-04-04 21:40:26 +1000
message:
rename 'revision store' to 'repository' in bzr info
------------------------------------------------------------
revno: 1739.1.584.1.74
merged: pqm at pqm.ubuntu.com-20070404090456-ef02e7c65da4e4a7
parent: pqm at pqm.ubuntu.com-20070404073743-9a3c82133f39e940
parent: mbp at sourcefrog.net-20070404061754-219dh4vrn8309pbp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 10:04:56 +0100
message:
Recommendation to delete bzrlib when installing
------------------------------------------------------------
revno: 1739.1.584.1.59.2.6
merged: mbp at sourcefrog.net-20070404061754-219dh4vrn8309pbp
parent: mbp at sourcefrog.net-20070404061731-tt2xrzllqhbodn83
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-04 16:17:54 +1000
message:
Recommendation to delete bzrlib when installing
------------------------------------------------------------
revno: 1739.1.584.1.59.2.5
merged: mbp at sourcefrog.net-20070404061731-tt2xrzllqhbodn83
parent: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-04 16:17:31 +1000
message:
Contents of TODO file moved into bug tracker
------------------------------------------------------------
revno: 1739.1.584.1.59.2.4
merged: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
parent: mbp at sourcefrog.net-20070404011507-l854uqbc192pnbgj
parent: elliot.murphy at canonical.com-20070403225812-yopxs3blqm1ed1uq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-04 11:22:11 +1000
message:
merge trunk and doc fix from elliot
------------------------------------------------------------
revno: 1739.1.584.1.70.1.1
merged: elliot.murphy at canonical.com-20070403225812-yopxs3blqm1ed1uq
parent: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
committer: Elliot Murphy <elliot.murphy at canonical.com>
branch nick: bzr.docs
timestamp: Tue 2007-04-03 18:58:12 -0400
message:
Use double quotes instead of single quotes for bzr whoami examples to keep
windows systems happy. https://answers.launchpad.net/bzr/+ticket/4604
------------------------------------------------------------
revno: 1739.1.584.1.59.2.3
merged: mbp at sourcefrog.net-20070404011507-l854uqbc192pnbgj
parent: mbp at sourcefrog.net-20070404011452-zu2bwb9ajc78m37s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-04 11:15:07 +1000
message:
Link from INSTALL to faq and wiki
------------------------------------------------------------
revno: 1739.1.584.1.59.2.2
merged: mbp at sourcefrog.net-20070404011452-zu2bwb9ajc78m37s
parent: mbp at sourcefrog.net-20070329041656-u4j50rtp4e01aej4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-04 11:14:52 +1000
message:
Move some TODO items into the bug tracker
------------------------------------------------------------
revno: 1739.1.584.1.59.2.1
merged: mbp at sourcefrog.net-20070329041656-u4j50rtp4e01aej4
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-03-29 14:16:56 +1000
message:
Move old NEWS.developers entries into NEWS
------------------------------------------------------------
revno: 1739.1.584.1.73
merged: pqm at pqm.ubuntu.com-20070404073743-9a3c82133f39e940
parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
parent: andrew.bennetts at canonical.com-20070404014241-swk0f9ec602dnezm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 08:37:43 +0100
message:
(Andrew Bennetts) Wait for strace to attach before running the function we want to trace.
------------------------------------------------------------
revno: 1739.1.584.1.71.1.1
merged: andrew.bennetts at canonical.com-20070404014241-swk0f9ec602dnezm
parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: strace-attach
timestamp: Wed 2007-04-04 11:42:41 +1000
message:
Wait for strace to attach before running the function we want to trace.
------------------------------------------------------------
revno: 1739.1.584.1.72
merged: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
parent: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 03:29:46 +0100
message:
Update expectFailure docs
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.11
merged: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
parent: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 21:15:02 -0400
message:
Update docs
------------------------------------------------------------
revno: 1739.1.584.1.71
merged: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
parent: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
parent: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 01:54:11 +0100
message:
Implement TestCase.expectFailure
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.10
merged: aaron.bentley at utoronto.ca-20070404001113-9w9ovclmn9eczzid
parent: aaron.bentley at utoronto.ca-20070403233827-rhogvzi85d6pctik
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 20:11:13 -0400
message:
Changes from review (poolie)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.9
merged: aaron.bentley at utoronto.ca-20070403233827-rhogvzi85d6pctik
parent: aaron.bentley at utoronto.ca-20070403231215-qt3qtjx2n5t61dyp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 19:38:27 -0400
message:
Implement TestCase.expectFailure
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.8
merged: aaron.bentley at utoronto.ca-20070403231215-qt3qtjx2n5t61dyp
parent: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
parent: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-03 19:12:15 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.70
merged: pqm at pqm.ubuntu.com-20070402183941-55dc90797840300e
parent: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
parent: abentley at panoramicfeedback.com-20070402175502-uzqmbqr5gcwjuio9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-02 19:39:41 +0100
message:
Implement WorkingTree.apply_inventory_delta
------------------------------------------------------------
revno: 1739.1.584.1.53.2.9
merged: abentley at panoramicfeedback.com-20070402175502-uzqmbqr5gcwjuio9
parent: abentley at panoramicfeedback.com-20070402173506-46nv1j0udc9c4u1d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:55:02 -0400
message:
Cleanup from review
------------------------------------------------------------
revno: 1739.1.584.1.53.2.8
merged: abentley at panoramicfeedback.com-20070402173506-46nv1j0udc9c4u1d
parent: abentley at panoramicfeedback.com-20070402173240-odyocjetx9dsmvrf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:35:06 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1739.1.584.1.53.2.7
merged: abentley at panoramicfeedback.com-20070402173240-odyocjetx9dsmvrf
parent: abentley at panoramicfeedback.com-20070402171811-bz7y2b2h1m1k4n7x
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:32:40 -0400
message:
Add another test case (suggested by John Meinel)
------------------------------------------------------------
revno: 1739.1.584.1.53.2.6
merged: abentley at panoramicfeedback.com-20070402171811-bz7y2b2h1m1k4n7x
parent: abentley at panoramicfeedback.com-20070326193914-quycobjtiy7js5hl
parent: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-04-02 13:18:11 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.53.2.5
merged: abentley at panoramicfeedback.com-20070326193914-quycobjtiy7js5hl
parent: abentley at panoramicfeedback.com-20070326190617-bclsdw1gm75ynf05
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 15:39:14 -0400
message:
Clean up apply methods
------------------------------------------------------------
revno: 1739.1.584.1.53.2.4
merged: abentley at panoramicfeedback.com-20070326190617-bclsdw1gm75ynf05
parent: abentley at panoramicfeedback.com-20070326184431-xhil1b1d301pi7f2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 15:06:17 -0400
message:
Switch TreeTransform to use WT.apply_inventory_delta
------------------------------------------------------------
revno: 1739.1.584.1.53.2.3
merged: abentley at panoramicfeedback.com-20070326184431-xhil1b1d301pi7f2
parent: abentley at panoramicfeedback.com-20070326180617-s3mevl1o55wsnbwo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 14:44:31 -0400
message:
Fix root replacement for apply_inventory_delta
------------------------------------------------------------
revno: 1739.1.584.1.53.2.2
merged: abentley at panoramicfeedback.com-20070326180617-s3mevl1o55wsnbwo
parent: abentley at panoramicfeedback.com-20070326151523-zjnptbt4y573q6b7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 14:06:17 -0400
message:
Reduce lock to tree lock
------------------------------------------------------------
revno: 1739.1.584.1.53.2.1
merged: abentley at panoramicfeedback.com-20070326151523-zjnptbt4y573q6b7
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: inventory-delta
timestamp: Mon 2007-03-26 11:15:23 -0400
message:
Implement MutableTree.apply_inventory_delta
------------------------------------------------------------
revno: 1739.1.584.1.69
merged: pqm at pqm.ubuntu.com-20070401162926-2718905ae3092110
parent: pqm at pqm.ubuntu.com-20070401155243-5f4a82698a76858e
parent: aaron.bentley at utoronto.ca-20070401160801-n54jkqz3q2hpys0s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 17:29:26 +0100
message:
Fixes #98510: bundle selftest fails if email has 'two' embedded (Clatworthy)
------------------------------------------------------------
revno: 1739.1.584.1.59.1.2
merged: aaron.bentley at utoronto.ca-20070401160801-n54jkqz3q2hpys0s
parent: ian.clatworthy at internode.on.net-20070329085111-fcuzqsgdrtfsa1t3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-04-01 12:08:01 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1739.1.584.1.59.1.1
merged: ian.clatworthy at internode.on.net-20070329085111-fcuzqsgdrtfsa1t3
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.bundle-test-fix
timestamp: Thu 2007-03-29 18:51:11 +1000
message:
Fixes #98510 - bundle selftest fails if email has 'two' embedded
------------------------------------------------------------
revno: 1739.1.584.1.68
merged: pqm at pqm.ubuntu.com-20070401155243-5f4a82698a76858e
parent: pqm at pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
parent: ian.clatworthy at internode.on.net-20070323002400-sxtf5qae678nd83b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 16:52:43 +0100
message:
Minor fixes to help on checkouts
------------------------------------------------------------
revno: 1739.1.584.1.47.2.2
merged: ian.clatworthy at internode.on.net-20070323002400-sxtf5qae678nd83b
parent: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-23 10:24:00 +1000
message:
Minor fixes to help on checkouts
------------------------------------------------------------
revno: 1739.1.584.1.67
merged: pqm at pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
parent: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: mbp at sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 07:48:38 +0100
message:
merge 0.15 back to dev
------------------------------------------------------------
revno: 1739.1.584.1.66.1.1
merged: mbp at sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
parent: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: mbp at sourcefrog.net-20070401052429-z2q259d3su4mjwnx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-to-trunk
timestamp: Sun 2007-04-01 16:19:16 +1000
message:
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes,
------------------------------------------------------------
revno: 1739.1.584.2.3.1.20
merged: mbp at sourcefrog.net-20070401052429-z2q259d3su4mjwnx
parent: mbp at sourcefrog.net-20070401044010-yj4r918takfk8dwp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 15:24:29 +1000
message:
Prepare 0.15 final release
------------------------------------------------------------
revno: 1739.1.584.2.3.1.19
merged: mbp at sourcefrog.net-20070401044010-yj4r918takfk8dwp
parent: mbp at sourcefrog.net-20070401013825-zggofbeun985u2ri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 14:40:10 +1000
message:
No upgrade recommendation on source when cloning
------------------------------------------------------------
revno: 1739.1.584.2.3.1.18
merged: mbp at sourcefrog.net-20070401013825-zggofbeun985u2ri
parent: mbp at sourcefrog.net-20070331040410-lcpffybfv91cn16x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-04-01 11:38:25 +1000
message:
(jam) trim st_ino to 32 bits in dirstate to avoid warning on win32
------------------------------------------------------------
revno: 1739.1.584.2.3.1.17
merged: mbp at sourcefrog.net-20070331040410-lcpffybfv91cn16x
parent: mbp at sourcefrog.net-20070331031939-3bc0km32p5gko14w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-31 14:04:10 +1000
message:
Add supports_tree_reference to all repo formats (robert)
------------------------------------------------------------
revno: 1739.1.584.2.3.1.16
merged: mbp at sourcefrog.net-20070331031939-3bc0km32p5gko14w
parent: mbp at sourcefrog.net-20070330092254-oyqkn935rqnyj9ev
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-31 13:19:39 +1000
message:
rename support_tree_reference to supports_
------------------------------------------------------------
revno: 1739.1.584.2.3.1.15
merged: mbp at sourcefrog.net-20070330092254-oyqkn935rqnyj9ev
parent: mbp at sourcefrog.net-20070330090622-cmsu31j7bihg1jwl
parent: john at arbash-meinel.com-20070328201125-l1y0uyia91q56pmf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 19:22:54 +1000
message:
better dirstate lock contention messages (jam)
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3.2.1.1.1
merged: john at arbash-meinel.com-20070328201125-l1y0uyia91q56pmf
parent: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking_errors
timestamp: Wed 2007-03-28 15:11:25 -0500
message:
Raise LockContetion rather than LockError
------------------------------------------------------------
revno: 1739.1.584.2.3.1.14
merged: mbp at sourcefrog.net-20070330090622-cmsu31j7bihg1jwl
parent: mbp at sourcefrog.net-20070330085522-sl5x8bwok1mtuhx2
parent: abentley at panoramicfeedback.com-20070328205332-z8vubwp2rve7jii0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 19:06:22 +1000
message:
Better message on icompatible repositories
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3.2.3
merged: abentley at panoramicfeedback.com-20070328205332-z8vubwp2rve7jii0
parent: abentley at panoramicfeedback.com-20070328135645-0nucuw6ijokpe076
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.0.15
timestamp: Wed 2007-03-28 16:53:32 -0400
message:
Reduce scope of try/except, update NEWS
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3.2.2
merged: abentley at panoramicfeedback.com-20070328135645-0nucuw6ijokpe076
parent: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.0.15
timestamp: Wed 2007-03-28 09:56:45 -0400
message:
Give a nicer error on fetch when repos are in incompatible formats
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3.2.1
merged: pqm at pqm.ubuntu.com-20070326124437-6f0ae3c58fa4b765
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Mon 2007-03-26 13:44:37 +0100
message:
(mbp) integrated 0.15 fixes: http redirection, dirstate validation, move in dirstate
------------------------------------------------------------
revno: 1739.1.584.2.3.1.13
merged: mbp at sourcefrog.net-20070330085522-sl5x8bwok1mtuhx2
parent: mbp at sourcefrog.net-20070330083338-re6beh0iucji0g6k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 18:55:22 +1000
message:
TemporaryWriteLock should be exclusive (jam, marienz)
------------------------------------------------------------
revno: 1739.1.584.2.3.1.12
merged: mbp at sourcefrog.net-20070330083338-re6beh0iucji0g6k
parent: mbp at sourcefrog.net-20070326125653-268eg0uw9tuib9ix
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-30 18:33:38 +1000
message:
doc
------------------------------------------------------------
revno: 1739.1.584.2.3.1.11
merged: mbp at sourcefrog.net-20070326125653-268eg0uw9tuib9ix
parent: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 22:56:53 +1000
message:
fix up news for 0.15 release
------------------------------------------------------------
revno: 1739.1.584.2.3.1.10
merged: mbp at sourcefrog.net-20070326122611-shyb9gf2l18i8scn
parent: mbp at sourcefrog.net-20070326092947-bumoacwocgexpqpc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 22:26:11 +1000
message:
DirState._validate must raise AssertionError rather than using assert
so that it still passes tests when run with python -O.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.9
merged: mbp at sourcefrog.net-20070326092947-bumoacwocgexpqpc
parent: mbp at sourcefrog.net-20070326091217-00bjase6jntc12zm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 19:29:47 +1000
message:
Clear up assertRaises (r=robert)
------------------------------------------------------------
revno: 1739.1.584.2.3.1.8
merged: mbp at sourcefrog.net-20070326091217-00bjase6jntc12zm
parent: mbp at sourcefrog.net-20070326081645-o8epw58i1hk0mexj
parent: v.ladeuil+lp at free.fr-20070326073459-jlcqpqsrmhpmpk5b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 19:12:17 +1000
message:
merge http redirection fix
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3.1.1
merged: v.ladeuil+lp at free.fr-20070326073459-jlcqpqsrmhpmpk5b
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: v.ladeuil+lp at free.fr-20070314170125-ywny47g3rz2u4nba
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: redirection
timestamp: Mon 2007-03-26 09:34:59 +0200
message:
merge bzr.0.15
------------------------------------------------------------
revno: 1739.1.425.2.32
merged: v.ladeuil+lp at free.fr-20070314170125-ywny47g3rz2u4nba
parent: v.ladeuil+lp at free.fr-20070314165731-ro7aeu2k3jedut0k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 18:01:25 +0100
message:
Cleanup
------------------------------------------------------------
revno: 1739.1.425.2.31
merged: v.ladeuil+lp at free.fr-20070314165731-ro7aeu2k3jedut0k
parent: v.ladeuil+lp at free.fr-20070314165507-ilkas6hcb1ih3a2m
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:57:31 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.30
merged: v.ladeuil+lp at free.fr-20070314165507-ilkas6hcb1ih3a2m
parent: v.ladeuil+lp at free.fr-20070314163924-5xoey9mkxe6qaptd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:55:07 +0100
message:
Cleanup
------------------------------------------------------------
revno: 1739.1.425.2.29
merged: v.ladeuil+lp at free.fr-20070314163924-5xoey9mkxe6qaptd
parent: v.ladeuil+lp at free.fr-20070314081220-b7rce9vi16r9yd0b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 17:39:24 +0100
message:
Test the http redirection at the request level even if it's not
used anymore, so far.
* bzrlib/transport/http/_urllib2_wrappers.py
(HTTPRedirectHandler.http_error_302): Renamed from http_error_30x.
(HTTPRedirectHandler.http_error_301): Deleted. Finally, that's the
easiest way to fix bug #88780 :) In retrospect, that code was a
first attempt to handle this whole redirection handling by
providing the final target to the first request. This is not
needed anymore.
* bzrlib/tests/test_http.py:
(RedirectedRequest, TestHTTPSilentRedirections_urllib): Test the
_urllib2_wrappers redirection at the request level.
* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler.parse_request): Delegate the redirection
handling to the test_case_server.
(HTTPServerRedirecting.is_redirected): Handle redirections by
searching a matching directive.
(HTTPServerRedirecting.redirect_to): Redefined to use the nre
redirections definitions.
------------------------------------------------------------
revno: 1739.1.425.2.28
merged: v.ladeuil+lp at free.fr-20070314081220-b7rce9vi16r9yd0b
parent: v.ladeuil+lp at free.fr-20070313170020-d0oimozr96pwconh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Wed 2007-03-14 09:12:20 +0100
message:
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
------------------------------------------------------------
revno: 1739.1.425.2.27
merged: v.ladeuil+lp at free.fr-20070313170020-d0oimozr96pwconh
parent: v.ladeuil+lp at free.fr-20070313162730-5xm7siq59snms8h3
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 18:00:20 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.26
merged: v.ladeuil+lp at free.fr-20070313162730-5xm7siq59snms8h3
parent: v.ladeuil+lp at free.fr-20070313153837-3nsxxqn229b1exe4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 17:27:30 +0100
message:
Delete obsolete note in doc string.
------------------------------------------------------------
revno: 1739.1.425.2.25
merged: v.ladeuil+lp at free.fr-20070313153837-3nsxxqn229b1exe4
parent: v.ladeuil+lp at free.fr-20070301214621-zq5wh150p7qampsu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-03-13 16:38:37 +0100
message:
Fix typos noticed by Aaron.
------------------------------------------------------------
revno: 1739.1.425.2.24
merged: v.ladeuil+lp at free.fr-20070301214621-zq5wh150p7qampsu
parent: v.ladeuil+lp at free.fr-20070301212940-z63krdqjpbn0sgar
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:46:21 +0100
message:
Fix typos in NEWS
------------------------------------------------------------
revno: 1739.1.425.2.23
merged: v.ladeuil+lp at free.fr-20070301212940-z63krdqjpbn0sgar
parent: v.ladeuil+lp at free.fr-20070301212657-bclmihdfnxgfy0sw
parent: v.ladeuil+lp at free.fr-20070228231040-yx4119b16r5pjmyp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:29:40 +0100
message:
Merge #88780 fix
------------------------------------------------------------
revno: 1739.1.566.1.1
merged: v.ladeuil+lp at free.fr-20070228231040-yx4119b16r5pjmyp
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 88780
timestamp: Thu 2007-03-01 00:10:40 +0100
message:
Fix bug #88780.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPRedirectHandler.http_error_301): Fix wrong indentation and
wrong variable name.
------------------------------------------------------------
revno: 1739.1.425.2.22
merged: v.ladeuil+lp at free.fr-20070301212657-bclmihdfnxgfy0sw
parent: v.ladeuil+lp at free.fr-20070225183336-ifty38ijssbqkcli
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Thu 2007-03-01 22:26:57 +0100
message:
Take Aaron's review comments into account.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPRedirectHandler.http_error_301): Fix bug #88780.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._get): Fix doc string.
* bzrlib/transport/__init__.py:
(do_catching_redirections): Raise TooManyRedirections instead of
requiring an exception as a parameter.
* bzrlib/tests/test_http.py:
(TestHTTPRedirections.setUp): Simplified.
(TestHTTPRedirections.test_read_redirected_bundle_from_url): New test.
(TestDoCatchRedirections): New tests.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithRedirectedWebserver): New class factored out from
test_http.TestHTTPRedirections.
* bzrlib/errors.py:
(TooManyRedirections): New exception.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport.redirected): Catch TooManyRedirections.
* bzrlib/bundle/__init__.py:
(read_bundle_from_url.redirected_transport): Catch TooManyRedirections.
------------------------------------------------------------
revno: 1739.1.425.2.21
merged: v.ladeuil+lp at free.fr-20070225183336-ifty38ijssbqkcli
parent: v.ladeuil+lp at free.fr-20070225154955-0zcc6vbuyx0kab7y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 19:33:36 +0100
message:
Take bundles into account.
* bzrlib/transport/__init__.py:
(do_catching_redirections): Factored out from
BzrDir.open_from_transport.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Simplified.
* bzrlib/bundle/__init__.py:
(read_bundle_from_url): Follow redirections if needed.
Revert BzrDirFormat1 registering.
* bzrlib/bzrdir.py:
Register BzrDirFormat as control format.
------------------------------------------------------------
revno: 1739.1.425.2.20
merged: v.ladeuil+lp at free.fr-20070225154955-0zcc6vbuyx0kab7y
parent: v.ladeuil+lp at free.fr-20070225154720-iazxg33pvg5hwa4y
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 16:49:55 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.19
merged: v.ladeuil+lp at free.fr-20070225154720-iazxg33pvg5hwa4y
parent: v.ladeuil+lp at free.fr-20070213221044-a79y2pyxzjskmkd5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-25 16:47:20 +0100
message:
Revert BzrDirFormat1 registering.
* bzrlib/bzrdir.py:
Register BzrDirFormat as control format.
------------------------------------------------------------
revno: 1739.1.425.2.18
merged: v.ladeuil+lp at free.fr-20070213221044-a79y2pyxzjskmkd5
parent: v.ladeuil+lp at free.fr-20070212141359-yb92gzmyvam8izsz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Tue 2007-02-13 23:10:44 +0100
message:
Take Aaron comments into account.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Use for... else idiom.
------------------------------------------------------------
revno: 1739.1.425.2.17
merged: v.ladeuil+lp at free.fr-20070212141359-yb92gzmyvam8izsz
parent: v.ladeuil+lp at free.fr-20070212140201-khf5tnm6skh2ic0k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Mon 2007-02-12 15:13:59 +0100
message:
Add comments and fix typos
------------------------------------------------------------
revno: 1739.1.425.2.16
merged: v.ladeuil+lp at free.fr-20070212140201-khf5tnm6skh2ic0k
parent: v.ladeuil+lp at free.fr-20070211160613-9k1vwo0e1x0si26z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Mon 2007-02-12 15:02:01 +0100
message:
Add tests.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.has): Ignores 302 error code, it is already
handled.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.has): Set headers acquisition. Pass headers to
_curl_perform. Ignores 302 error code, it is already
handled.
(PyCurlTransport._get_full, PyCurlTransport._get_ranged): Pass
headers to _curl_perform.
(PyCurlTransport._post): Pass headers to _curl_perform.
(PyCurlTransport._set_curl_options): Do not follow redirections
anymore.
(PyCurlTransport._curl_perform): Handle redirections by raising
* bzrlib/tests/test_http.py:
(TestHTTPRedirections): Simplified.
(TestHTTPRedirections_pycurl): New class.
* bzrlib/tests/test_bzrdir.py:
(TestHTTPRedirectionLoop, TestHTTPRedirections_urllib,
TestHTTPRedirections_pycurl): New classes to test redirection
loops when opening bzrdirs.
* bzrlib/tests/HTTPTestUtil.py:
(HTTPServerRedirecting.redirect_to,
HTTPServerRedirecting.redirected_to_address): New methods.
* bzrlib/bzrdir.py:
(BzrDirMetaFormat1.probe_transport): Deleted.
------------------------------------------------------------
revno: 1739.1.425.2.15
merged: v.ladeuil+lp at free.fr-20070211160613-9k1vwo0e1x0si26z
parent: v.ladeuil+lp at free.fr-20070208145219-7mdy3d2r3hqybamz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-11 17:06:13 +0100
message:
Http redirections are not followed by default. Do not use hints
anymore.
* bzrlib/transport/smart.py:
(SmartTransport.get): Do not use hints.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Do not use hints.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Do not use hints.
* bzrlib/transport/local.py:
(LocalTransport.get): Do not use hints.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Redirections are *not* followed by default.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Do not use hints.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Do not use hints.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get, HttpTransportBase._get): Do not use hints.
Fix _get doc anyway.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Do not use hints.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Do not use hints.
* bzrlib/transport/decorator.py
(TransportDecorator.get): Do not use hints.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Do not use hints.
* bzrlib/tests/test_transport_hints.py:
Deleted.
* bzrlib/tests/__init__.py:
(test_suite): Do not test hints.
* bzrlib/errors.py:
(UnknownHint): Deleted.
* bzrlib/bzrdir.py:
(BzrDirMetaFormat1.probe_transport): Do not use hints.
------------------------------------------------------------
revno: 1739.1.425.2.14
merged: v.ladeuil+lp at free.fr-20070208145219-7mdy3d2r3hqybamz
parent: v.ladeuil+lp at free.fr-20070204174112-iv6gxzinnjddlaxj
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Thu 2007-02-08 15:52:19 +0100
message:
Typo in comment
------------------------------------------------------------
revno: 1739.1.425.2.13
merged: v.ladeuil+lp at free.fr-20070204174112-iv6gxzinnjddlaxj
parent: vila at vilabuntu-20070125100028-uahmvcdfxro7ye9x
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Sun 2007-02-04 18:41:12 +0100
message:
Add tests for redirection. Preserve transport decorations.
* bzrlib/tests/test_http.py:
(TestRedirections): new tests.
* bzrlib/tests/HttpServer.py:
(HttpServer): Make server host and port public once the socket
have been established.
* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler, HTTPServerRedirecting): New http test
server for redirections. Only a whole host can be redirected, so
far.
* bzrlib/errors.py:
(RedirectRequested.__init__): Add a 'qual_proto' oso that
transport decorations can be transmitted to redirected transport.
(RedirectRequested._requalify_url,
RedirectRequested.get_source_url,
RedirectRequested.get_target_url): New methods providing fully
decorated urls.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): The redirection should preserve
transport decorations.
(BzrDirMetaFormat1): To be able to specialize bzr branches from
foreign branches, we need to register BzrDirMetaFormat1 as the
default control format (instead of BzrDirMetaFormat which is
abstract and can still be used by foreign branches).
------------------------------------------------------------
revno: 1739.1.425.2.12
merged: vila at vilabuntu-20070125100028-uahmvcdfxro7ye9x
parent: vila at vilabuntu-20070125095850-0g2ggjjtvq13o8e7
parent: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Thu 2007-01-25 11:00:28 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.11
merged: vila at vilabuntu-20070125095850-0g2ggjjtvq13o8e7
parent: vila at vilabuntu-20070123142936-gyxoqeyfqzkf6r3r
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Thu 2007-01-25 10:58:50 +0100
message:
Explicit tests.
* bzrlib/transport/__init__.py:
(register_lazy_transport._loader): Provide a better localisation
of the get declaration.
* bzrlib/tests/test_transport_implementations.py:
(_append): Deleted. Nobody use it anymore.
* bzrlib/tests/test_transport.py:
(TestTransportAPI): Test the get compatibility wrapping.
------------------------------------------------------------
revno: 1739.1.425.2.10
merged: vila at vilabuntu-20070123142936-gyxoqeyfqzkf6r3r
parent: v.ladeuil+lp at free.fr-20070110104208-m510xzaw55nca20d
parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
committer: Vincent Ladeuil <vila at vilabuntu>
branch nick: redir
timestamp: Tue 2007-01-23 15:29:36 +0100
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.9
merged: v.ladeuil+lp at free.fr-20070110104208-m510xzaw55nca20d
parent: v.ladeuil+lp at free.fr-20070109154423-lyvr5gmkwv6e0v6h
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2007-01-10 11:42:08 +0100
message:
Simplify the get wrapping and restrict redirection to bzr branches.
* bzrlib/transport/local.py:
(LocalTransport.get): Really declare the hint parameters or the
deprecation warning make some tests fail (they rely on a specific
output from the command issued, with is, IMHO, bad, but that's not
the problem I try to address now).
* bzrlib/transport/__init__.py:
(_inject_get_with_hints): Deleted.
(_add_hints_to_get.get): Renamed from _check_get_with_hints and
simplified. KISS principle is good, use it.
(register_lazy_transport._loader): Issue a deprecation warning if
needed.
(Transport.create_get_hints): Usage is to use the name 'klass' for
class methods.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): Leave that one alone.
(BzrDirMetaFormat1.probe_transport): New method so that
redirection is applied to bzr branches only.
------------------------------------------------------------
revno: 1739.1.425.2.8
merged: v.ladeuil+lp at free.fr-20070109154423-lyvr5gmkwv6e0v6h
parent: v.ladeuil+lp at free.fr-20070109153336-8iucozbcxmpb1az6
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Tue 2007-01-09 16:44:23 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.7
merged: v.ladeuil+lp at free.fr-20070109153336-8iucozbcxmpb1az6
parent: v.ladeuil+lp at free.fr-20070108142722-722eundbwxzyra00
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Tue 2007-01-09 16:33:36 +0100
message:
First implementation of transport hints.
* bzrlib/tests/test_transport_hints.py:
New file.
* bzrlib/transport/__init__.py:
(TransportHints, TransportGetHints): New hints classes.
(Transport.create_get_hints): New method creating a suitable hints
object.
* bzrlib/tests/__init__.py:
(test_suite): Add test_transport_hints.
* bzrlib/errors.py:
(RedirectRequested.__init__): Fix typo.
(UnknownHint): New exception class.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): Pass a hints object to
transport.get.
------------------------------------------------------------
revno: 1739.1.425.2.6
merged: v.ladeuil+lp at free.fr-20070108142722-722eundbwxzyra00
parent: v.ladeuil+lp at free.fr-20070108141242-nhuevwtx8216ymgz
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 15:27:22 +0100
message:
Fix typo.
* bzrlib/transport/__init__.py:
(register_lazy_transport): Oops, module is a mandatory attribute
for _loader. Add classname too to make good measure.
------------------------------------------------------------
revno: 1739.1.425.2.5
merged: v.ladeuil+lp at free.fr-20070108141242-nhuevwtx8216ymgz
parent: v.ladeuil+lp at free.fr-20070108102120-rhp9vvuhmshrrd92
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 15:12:42 +0100
message:
Simpler implementation using inspect. 'hints' is a kwargs.
* bzrlib/transport/smart.py:
(SmartTransport.get): Make hints a kwargs.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Make hints a kwargs.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Make hints a kwargs.
* bzrlib/transport/local.py:
(LocalTransport.get): Make hints a kwargs (but still commented out).
* bzrlib/transport/ftp.py:
(FtpTransport.get): Make hints a kwargs (but still commented out).
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Make hints a kwargs.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Make hints a kwargs. Still nothing done
with it.
(PyCurlTransport._get_full): Delete hints parameter until we need
it.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get, HttpTransportBase._get): Make hints a
kwargs.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/decorator.py:
(TransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Make hints a kwargs.
* bzrlib/transport/__init__.py:
Python provides inspect: use it.
(_get_prototype_infos, _build_arglist): Deleted.
(_inject_get_with_hints, _check_get_with_hints): Simplified.
(_inject_get_with_hints): Make _get_without_hints a private
method.
(Transport.get, TransportLogger.get): Make hints a kwargs.
* bzrlib/bzrdir.py:
(BzrDirFormat.probe_transport): get's hint is a kwargs.
------------------------------------------------------------
revno: 1739.1.425.2.4
merged: v.ladeuil+lp at free.fr-20070108102120-rhp9vvuhmshrrd92
parent: v.ladeuil+lp at free.fr-20070103155403-wfbwe5w5md9jzked
parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Mon 2007-01-08 11:21:20 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.425.2.3
merged: v.ladeuil+lp at free.fr-20070103155403-wfbwe5w5md9jzked
parent: v.ladeuil+lp at free.fr-20061221102819-308frw80r38lluqa
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2007-01-03 16:54:03 +0100
message:
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Make MAX_REDIRECTIONS a static class
variable.
------------------------------------------------------------
revno: 1739.1.425.2.2
merged: v.ladeuil+lp at free.fr-20061221102819-308frw80r38lluqa
parent: v.ladeuil+lp at free.fr-20061213173707-a1gflgoke6b3eboc
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Thu 2006-12-21 11:28:19 +0100
message:
Automates the 'hints' parameter addition to get transport prototypes.
* bzrlib/transport/__init__.py:
(_get_prototype_infos, _build_arglist, _inject_get_with_hints,
_check_get_with_hints): New methods to ensure the compatibility
with old code while adding a new parameter to the transport.get
method.
* bzrlib/transport/local.py:
(LocalTransport.get): Delete the 'hints' parameter to demonstrate
the solution.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Delete the 'hints' parameter to demonstrate
the solution.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Try to not use magic values. Clean
up transport.follow_redirections uses.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): dict objects already provides a 'get'
with a default value, you silly.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_full): Give a default value to the hints
parameter as this is called explicitely without it.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Forward the 'hints' parameter.
------------------------------------------------------------
revno: 1739.1.425.2.1
merged: v.ladeuil+lp at free.fr-20061213173707-a1gflgoke6b3eboc
parent: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.redirection
timestamp: Wed 2006-12-13 18:37:07 +0100
message:
First rough http branch redirection implementation.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Unless told otherwise, redirections are
followed silently.
(HTTPRedirectHandler.http_error_30x): Follow redirection or return
a 30x error.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Raises RedirectRequested if the
request requires it.
(HttpTransport_urllib._get): Update the request from the hints
parameter if needed.
* bzrlib/errors.py:
(RedirectRequested): New TransportError.
* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): Catch RedirectRequested and retry
with the redirected url until we get to the final destination.
(BzrDirFormat.probe_transport): Hints get to not follow the
redirections but instead tell us where this branch is redirected.
* bzrlib/transport/smart.py:
(SmartTransport.get): Add a 'hint' parameter.
* bzrlib/transport/sftp.py:
(SFTPTransport.get): Add a 'hint' parameter.
* bzrlib/transport/memory.py:
(MemoryTransport.get): Add a 'hint' parameter.
* bzrlib/transport/local.py:
(LocalTransport.get): Add a 'hint' parameter.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get): Add a 'hint' parameter and pass it to
_get_full.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.get): Add a 'hint' parameter and pass
it to _get.
* bzrlib/transport/ftp.py:
(FtpTransport.get): Add a 'hint' parameter.
* bzrlib/transport/fakevfat.py:
(FakeVFATTransportDecorator.get): Add a 'hint' parameter and pass
it to the decorated transport.
* bzrlib/transport/decorator.py:
(TransportDecorator.get): Add a 'hint' parameter and pass it to the
decorated transport.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Add a 'hint' parameter. Delete a
duplicated definition of the method.
* bzrlib/transport/__init__.py:
(Transport.get): Add a 'hint' parameter.
(TransportLogger.get): Add a 'hint' parameter and pass it to the
------------------------------------------------------------
revno: 1739.1.584.2.3.1.7
merged: mbp at sourcefrog.net-20070326081645-o8epw58i1hk0mexj
parent: mbp at sourcefrog.net-20070326054413-16tep1hw0h1dx2lh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 18:16:45 +1000
message:
Better DirState._validate and tests for it.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.6
merged: mbp at sourcefrog.net-20070326054413-16tep1hw0h1dx2lh
parent: mbp at sourcefrog.net-20070326020040-sa23lls1uavv0lvz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 15:44:13 +1000
message:
Add some tests and better messages for DirState._validate
------------------------------------------------------------
revno: 1739.1.584.2.3.1.5
merged: mbp at sourcefrog.net-20070326020040-sa23lls1uavv0lvz
parent: mbp at sourcefrog.net-20070326013304-98dx5c6gzhadf369
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 12:00:40 +1000
message:
override TestCase.assertRaises to return the exception
------------------------------------------------------------
revno: 1739.1.584.2.3.1.4
merged: mbp at sourcefrog.net-20070326013304-98dx5c6gzhadf369
parent: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Mon 2007-03-26 11:33:04 +1000
message:
Move some dirstate test setup methods into the base class
so they can be reused.
Add a simple DirState._validate test for correct dirstates.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.3
merged: pqm at pqm.ubuntu.com-20070325130603-35a88369597194ee
parent: pqm at pqm.ubuntu.com-20070323235555-58270f32490599ea
parent: mbp at sourcefrog.net-20070325124716-u9b3xr49h1kpjj7l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Sun 2007-03-25 14:06:03 +0100
message:
(mbp) more integrated 0.15 fixes
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.15
merged: mbp at sourcefrog.net-20070325124716-u9b3xr49h1kpjj7l
parent: mbp at sourcefrog.net-20070325124604-sabilbi5m4902ot8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 22:47:16 +1000
message:
Disable some questionable checks in Dirstate._validate
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.14
merged: mbp at sourcefrog.net-20070325124604-sabilbi5m4902ot8
parent: mbp at sourcefrog.net-20070325081559-uhe1bo23m9kqltm3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 22:46:04 +1000
message:
clearer test data for test merge_swapping_rename
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.13
merged: mbp at sourcefrog.net-20070325081559-uhe1bo23m9kqltm3
parent: mbp at sourcefrog.net-20070325081533-enj6iq0mp5a0sn33
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 18:15:59 +1000
message:
Fix some tests that need to lock dirstate before validating
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.12
merged: mbp at sourcefrog.net-20070325081533-enj6iq0mp5a0sn33
parent: mbp at sourcefrog.net-20070324000657-fkotsej7quseardh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sun 2007-03-25 18:15:33 +1000
message:
These changes still intended for 0.15 branch
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.11
merged: mbp at sourcefrog.net-20070324000657-fkotsej7quseardh
parent: mbp at sourcefrog.net-20070324000213-3iiz8gtjfebxt5ht
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 11:06:57 +1100
message:
prepare rc3
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.10
merged: mbp at sourcefrog.net-20070324000213-3iiz8gtjfebxt5ht
parent: mbp at sourcefrog.net-20070323234558-rcdpyv3h6b0um0t8
parent: john at arbash-meinel.com-20070322235912-fd5dehajuqhg64em
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 11:02:13 +1100
message:
merge john's directory-move fix
------------------------------------------------------------
revno: 1739.1.584.1.48.2.3
merged: john at arbash-meinel.com-20070322235912-fd5dehajuqhg64em
parent: john at arbash-meinel.com-20070322235549-q802rg14wurej850
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:59:12 -0500
message:
NEWS for fixing bug #94037
------------------------------------------------------------
revno: 1739.1.584.1.48.2.2
merged: john at arbash-meinel.com-20070322235549-q802rg14wurej850
parent: john at arbash-meinel.com-20070322234720-re8l7jtva8msgbsv
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:55:49 -0500
message:
[merge] bzr.dev 2374
------------------------------------------------------------
revno: 1739.1.584.1.48.2.1
merged: john at arbash-meinel.com-20070322234720-re8l7jtva8msgbsv
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: move_children_correctly
timestamp: Thu 2007-03-22 18:47:20 -0500
message:
Update DirState._validate() to detect rename errors.
WorkingTree.move() would incorrectly update children of a renamed directory.
(Some of the references would point to the directory instead of the child)
This also adds WorkingTree._validate() which is a no-op for most trees,
and just calls self._dirstate._validate() for WT4 trees.
It then updates test_move() to have the WT validate itself after all tests.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.9
merged: mbp at sourcefrog.net-20070323234558-rcdpyv3h6b0um0t8
parent: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
parent: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 10:45:58 +1100
message:
merge aaron's empty merge directive fix
------------------------------------------------------------
revno: 1739.1.584.2.3.1.2
merged: pqm at pqm.ubuntu.com-20070323235555-58270f32490599ea
parent: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
parent: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Fri 2007-03-23 23:55:55 +0000
message:
(mbp) various integrated fixes for 0.15
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.8
merged: mbp at sourcefrog.net-20070323231411-22dcr2pg0kulg3px
parent: mbp at sourcefrog.net-20070323214646-zfvwiprkvbhuvz6o
parent: john at arbash-meinel.com-20070323202928-e39fjjn3u1ktj2t5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Sat 2007-03-24 10:14:11 +1100
message:
merge john's fix for committing kind changes
------------------------------------------------------------
revno: 1739.1.584.1.51.2.4
merged: john at arbash-meinel.com-20070323202928-e39fjjn3u1ktj2t5
parent: john at arbash-meinel.com-20070323202323-u2rkmkkcily01t6o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:29:28 -0500
message:
Another workaround for trees that are already in the broken state.
If the kind has changed from a parent, we know that this cannot be
a copy of that parent.
------------------------------------------------------------
revno: 1739.1.584.1.51.2.3
merged: john at arbash-meinel.com-20070323202323-u2rkmkkcily01t6o
parent: john at arbash-meinel.com-20070323201901-2m5hfkh8xe26wywh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:23:23 -0500
message:
NEWS for fixing bug 90111
------------------------------------------------------------
revno: 1739.1.584.1.51.2.2
merged: john at arbash-meinel.com-20070323201901-2m5hfkh8xe26wywh
parent: john at arbash-meinel.com-20070323192548-f81b8vw3irmyclhe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:19:01 -0500
message:
Fix the small bug that ie.snapshot() didn't think about kind changes.
------------------------------------------------------------
revno: 1739.1.584.1.51.2.1
merged: john at arbash-meinel.com-20070323192548-f81b8vw3irmyclhe
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 14:25:48 -0500
message:
(broken) merge a test case showing that commiting a merge of a kind change fails.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.7
merged: mbp at sourcefrog.net-20070323214646-zfvwiprkvbhuvz6o
parent: mbp at sourcefrog.net-20070323075854-5o2n6k8a8kuejges
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tester
timestamp: Sat 2007-03-24 08:46:46 +1100
message:
Don't warn about old wt format when getting bzr's version
This fixes selftest when bzr is run from an old-format tree
(as pqm does)
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.6
merged: mbp at sourcefrog.net-20070323075854-5o2n6k8a8kuejges
parent: mbp at sourcefrog.net-20070323073333-d17401ai6jvjkqup
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15-integration
timestamp: Fri 2007-03-23 18:58:54 +1100
message:
merge jam's integrated changes from trunk
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.5
merged: mbp at sourcefrog.net-20070323073333-d17401ai6jvjkqup
parent: mbp at sourcefrog.net-20070323014137-7rvpygb42i2tyrfc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 18:33:33 +1100
message:
Recommended-upgrade message should give base dir not the control dir url
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.4
merged: mbp at sourcefrog.net-20070323014137-7rvpygb42i2tyrfc
parent: mbp at sourcefrog.net-20070322235658-kkdu0drfwmok2l3y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 12:41:37 +1100
message:
BzrDir._check_supported now also takes care of recommending upgrades, which
should be less disruptive to other workingtree formats.
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.3
merged: mbp at sourcefrog.net-20070322235658-kkdu0drfwmok2l3y
parent: mbp at sourcefrog.net-20070322070404-zzhbluric9k4wox1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Fri 2007-03-23 10:56:58 +1100
message:
bound-branch ui tests should now use the default branch format
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.2
merged: mbp at sourcefrog.net-20070322070404-zzhbluric9k4wox1
parent: mbp at sourcefrog.net-20070322052708-t4g4iv46n2dcjjaa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Thu 2007-03-22 18:04:04 +1100
message:
Move responsibility for suggesting upgrades to ui object
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1.1.1
merged: mbp at sourcefrog.net-20070322052708-t4g4iv46n2dcjjaa
parent: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: please-upgrade
timestamp: Thu 2007-03-22 16:27:08 +1100
message:
(broken) Give a message when opening old workingtree formats suggesting upgrade
This breaks some blackbox tests of old formats that don't expect to see this
message.
Add WorkingTree._after_opening callback
------------------------------------------------------------
revno: 1739.1.584.2.3.1.1
merged: pqm at pqm.ubuntu.com-20070321043308-436d9f24274a7e49
parent: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Wed 2007-03-21 04:33:08 +0000
message:
(robertc) Merge (hopefully the last time) mainline fixes for 0.15.
------------------------------------------------------------
revno: 1739.1.584.1.66
merged: pqm at pqm.ubuntu.com-20070401051140-280aed4369df0386
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
parent: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-04-01 06:11:40 +0100
message:
merge and pull support merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.13
merged: aaron.bentley at utoronto.ca-20070401043208-trrrj3rmubg9b785
parent: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:32:08 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.12
merged: aaron.bentley at utoronto.ca-20070401040614-3f0tytdrc2jtv8f6
parent: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:06:14 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.11
merged: aaron.bentley at utoronto.ca-20070401040347-0raf64jx909yhs6q
parent: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-04-01 00:03:47 -0400
message:
rename rev_id and other_rev_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.10
merged: aaron.bentley at utoronto.ca-20070401035812-bankq62dvnuyq0gx
parent: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:58:12 -0400
message:
Remove 'manual' from test names
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.9
merged: aaron.bentley at utoronto.ca-20070401035231-w87zy7hrpre4v81m
parent: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-31 23:52:31 -0400
message:
rename get_target_revision to install_revisions
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.8
merged: aaron.bentley at utoronto.ca-20070319010545-1n2gkcvcr76sb6lx
parent: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-18 21:05:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.7
merged: abentley at panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
parent: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 13:47:16 -0400
message:
test suite fixes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.6
merged: abentley at panoramicfeedback.com-20070316152110-crvg8yllxe1zt105
parent: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:21:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.5
merged: abentley at panoramicfeedback.com-20070316151629-g2p2eyd85juh3a9k
parent: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:16:29 -0400
message:
cleanup
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.4
merged: abentley at panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
parent: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-16 11:14:40 -0400
message:
Change bundle reader and merge directive to both be 'mergeables'
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.3
merged: abentley at panoramicfeedback.com-20070313182421-cdkkqs8lltdfzr4d
parent: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 14:24:21 -0400
message:
Remove unused include
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.2
merged: abentley at panoramicfeedback.com-20070313174130-uyqqjc9erz4ej3cd
parent: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:41:30 -0400
message:
Support manual merge from merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54.1.1
merged: abentley at panoramicfeedback.com-20070313171325-8x3xsmisicrpam53
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 13:13:25 -0400
message:
Allow pull from a merge directive
------------------------------------------------------------
revno: 1739.1.584.1.65
merged: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
parent: robertc at robertcollins.net-20070330060600-c3p4tucl0q77al2d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-30 07:40:22 +0100
message:
(robertc) Remove the --basis parameter to clone etc. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.64.1.2
merged: robertc at robertcollins.net-20070330060600-c3p4tucl0q77al2d
parent: robertc at robertcollins.net-20070330023636-v6k82rwz5isl6k3a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: unbasis
timestamp: Fri 2007-03-30 16:06:00 +1000
message:
Mention fixed bugs as per reviewer feedback.
------------------------------------------------------------
revno: 1739.1.584.1.64.1.1
merged: robertc at robertcollins.net-20070330023636-v6k82rwz5isl6k3a
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: unbasis
timestamp: Fri 2007-03-30 12:36:36 +1000
message:
Remove the --basis parameter to clone etc. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.64
merged: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
parent: john at arbash-meinel.com-20070329184742-npx69aia97o6qc0v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 20:10:09 +0100
message:
(Robert Widhopf-Fenk, bug #98591) Remove '--verbose' flag from 'bzr bundle'
------------------------------------------------------------
revno: 1739.1.584.1.56.5.2
merged: john at arbash-meinel.com-20070329184742-npx69aia97o6qc0v
parent: john at arbash-meinel.com-20070329140749-8pb42n6lu0k96z3y
parent: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remove_bundle_verbose
timestamp: Thu 2007-03-29 13:47:42 -0500
message:
[merge] bzr.dev 2386
------------------------------------------------------------
revno: 1739.1.584.1.56.5.1
merged: john at arbash-meinel.com-20070329140749-8pb42n6lu0k96z3y
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remove_bundle_verbose
timestamp: Thu 2007-03-29 09:07:49 -0500
message:
(Robert Widhopf-Fenk, bug #98591) Remove --verbose flag from 'bzr bundle'.
The old changeset code used to use --verbose to change the output format slightly.
By making a rename pair be a full delete + add. But it is no longer used, and
is not even a parameter for run() anymore.
------------------------------------------------------------
revno: 1739.1.584.1.63
merged: pqm at pqm.ubuntu.com-20070329173056-ace36f6e5a0e3b1c
parent: pqm at pqm.ubuntu.com-20070329142155-a485b446dd1ae203
parent: john at arbash-meinel.com-20070329162349-3g8dxtgpbrzlqir0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 18:30:56 +0100
message:
(John Arbash Meinel) Make it clearer what to do if you have a (very) old branch.
------------------------------------------------------------
revno: 1739.1.584.1.56.4.1
merged: john at arbash-meinel.com-20070329162349-3g8dxtgpbrzlqir0
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unsupported_formats
timestamp: Thu 2007-03-29 11:23:49 -0500
message:
(John Arbash Meinel) Make it clearer what to do if you have a (very) old branch.
------------------------------------------------------------
revno: 1739.1.584.1.62
merged: pqm at pqm.ubuntu.com-20070329142155-a485b446dd1ae203
parent: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
parent: john at arbash-meinel.com-20070329140138-md8j2y6tm6g43xuc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 15:21:55 +0100
message:
(John Arbash Meinel) A couple of OS Lock fixes.
------------------------------------------------------------
revno: 1739.1.584.1.56.3.1
merged: john at arbash-meinel.com-20070329140138-md8j2y6tm6g43xuc
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking_0_16_errors
timestamp: Thu 2007-03-29 09:01:38 -0500
message:
Cherry-pick the 2 locking fixes from the 0.15 branch.
------------------------------------------------------------
revno: 1739.1.584.1.61
merged: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
parent: robertc at robertcollins.net-20070329062419-opz8c5abjdxxakg6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 07:45:15 +0100
message:
(robertc) Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.58.2.2
merged: robertc at robertcollins.net-20070329062419-opz8c5abjdxxakg6
parent: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-03-29 16:24:19 +1000
message:
(robertc) Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.58.2.1
merged: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: format-attributes
timestamp: Thu 2007-03-29 11:36:44 +1000
message:
Ensure that all Repository formats declare their require attributes. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.60
merged: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 05:35:40 +0100
message:
(robertc) Various test suite changes and cleanups in preparation for the next hpss branch. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.584.1.58.1.4
merged: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 11:41:54 +1000
message:
Unbreak lockdir tests after adding fast lockdir timeouts to the test suite default environment.
------------------------------------------------------------
revno: 1739.1.584.1.58.1.3
merged: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
parent: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 08:31:41 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 1739.1.584.1.58.1.2
merged: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
parent: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Wed 2007-03-28 23:33:58 +1000
message:
Fixup the test changes made for hpss to be clean and self contained.
------------------------------------------------------------
revno: 1739.1.584.1.58.1.1
merged: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Wed 2007-03-28 17:33:07 +1000
message:
Split out hpss test fixes which dont depend on new or altered API's.
------------------------------------------------------------
revno: 1739.1.584.1.59
merged: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
parent: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 02:44:24 +0100
message:
deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.7
merged: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
parent: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:28:21 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.6
merged: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:22:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.5
merged: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
parent: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:26:24 -0400
message:
Deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.4
merged: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:23:55 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.58
merged: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
parent: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-28 07:58:22 +0100
message:
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.584.1.56.2.3
merged: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
parent: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 15:19:01 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 1739.1.584.1.56.2.2
merged: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
parent: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 13:32:35 +1000
message:
Further test-usability for chroots.
------------------------------------------------------------
revno: 1739.1.584.1.56.2.1
merged: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-chroot
timestamp: Wed 2007-03-28 13:02:32 +1000
message:
Rewritten chroot transport that prevents accidental chroot escapes when
using urlutils against the transport's url.
(Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 1739.1.584.1.57
merged: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
parent: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-28 03:28:09 +0100
message:
(robertc) urlutils improvements split out from the hpss branch (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.56.1.1
merged: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-urlutils
timestamp: Wed 2007-03-28 07:43:17 +1000
message:
urlutils improvements from hpss.
------------------------------------------------------------
revno: 1739.1.584.1.56
merged: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
parent: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: robertc at robertcollins.net-20070327075834-51wgidn6o63h8lqo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 09:18:02 +0100
message:
(robertc) Merge bzrlib.strace module which adds support for stracing individual callables from within bzrlib.
------------------------------------------------------------
revno: 1739.1.584.1.55.1.1
merged: robertc at robertcollins.net-20070327075834-51wgidn6o63h8lqo
parent: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: robertc at robertcollins.net-20070327073712-6v27yeyl9unj6p9o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 17:58:34 +1000
message:
(robertc) Merge bzrlib.strace module which adds support for stracing individual callables from within bzrlib.
------------------------------------------------------------
revno: 1739.1.584.1.44.1.9
merged: robertc at robertcollins.net-20070327073712-6v27yeyl9unj6p9o
parent: robertc at robertcollins.net-20070327070732-jrx0o1jgqond0xpb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Tue 2007-03-27 17:37:12 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 1739.1.584.1.44.1.8
merged: robertc at robertcollins.net-20070327070732-jrx0o1jgqond0xpb
parent: robertc at robertcollins.net-20070323001831-czc15dtustiat7j7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Tue 2007-03-27 17:07:32 +1000
message:
Whitespace.
------------------------------------------------------------
revno: 1739.1.584.1.44.1.7
merged: robertc at robertcollins.net-20070323001831-czc15dtustiat7j7
parent: robertc at robertcollins.net-20070322214342-58nmsg7pvh6ghc8b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark-strace
timestamp: Fri 2007-03-23 11:18:31 +1100
message:
Added ``bzrlib.strace.strace`` which will strace a single callable and
return a StraceResult object which contains just the syscalls involved
in running it. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.44.1.6
merged: robertc at robertcollins.net-20070322214342-58nmsg7pvh6ghc8b
parent: robertc at robertcollins.net-20070322121903-8sqxzfr5eqvsx5yp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Fri 2007-03-23 08:43:42 +1100
message:
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.44.1.5
merged: robertc at robertcollins.net-20070322121903-8sqxzfr5eqvsx5yp
parent: robertc at robertcollins.net-20070322105438-gt9qu83u9ml5aubo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 23:19:03 +1100
message:
Implement reporting of Unsupported tests in the bzr test result and runner
classes. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.44.1.4
merged: robertc at robertcollins.net-20070322105438-gt9qu83u9ml5aubo
parent: robertc at robertcollins.net-20070322100744-96m81fcue8hgsfnd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 21:54:38 +1100
message:
Add operating system Feature model to bzrlib.tests to allow writing tests
that can declare their needed dependencies and be cleanly disabled.
------------------------------------------------------------
revno: 1739.1.584.1.44.1.3
merged: robertc at robertcollins.net-20070322100744-96m81fcue8hgsfnd
parent: robertc at robertcollins.net-20070322090459-q0gjq21qgrj453hf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 21:07:44 +1100
message:
Add support for calling addNotSupported on TestResults to bzr TestCase's
when _test_needs_features contains unavailable features. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.44.1.2
merged: robertc at robertcollins.net-20070322090459-q0gjq21qgrj453hf
parent: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-prereqs
timestamp: Thu 2007-03-22 20:04:59 +1100
message:
Some minor cleanups of test code, and implement KnownFailure support as
per http://bazaar-vcs.org/BzrExtendTestSuite. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.55
merged: pqm at pqm.ubuntu.com-20070327070037-cd7e6fa939b1d08d
parent: pqm at pqm.ubuntu.com-20070327061205-24256d9f15f6757d
parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 08:00:37 +0100
message:
(ianc) manual and documentation improvements
------------------------------------------------------------
revno: 1739.1.584.1.51.1.2
merged: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
parent: ian.clatworthy at internode.on.net-20070326095949-mbs36oe73rer2l3r
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Tue 2007-03-27 10:35:29 +1000
message:
Improved after feedback from reviewers
------------------------------------------------------------
revno: 1739.1.584.1.51.1.1
merged: ian.clatworthy at internode.on.net-20070326095949-mbs36oe73rer2l3r
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Mon 2007-03-26 19:59:49 +1000
message:
Help and man page fixes
------------------------------------------------------------
revno: 1739.1.584.1.54
merged: pqm at pqm.ubuntu.com-20070327061205-24256d9f15f6757d
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070327055302-bvzpk1bmf6jxxpau
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-27 07:12:05 +0100
message:
(robertc) Merge 0.8 API removal cleanup.
------------------------------------------------------------
revno: 1739.1.584.1.53.1.1
merged: robertc at robertcollins.net-20070327055302-bvzpk1bmf6jxxpau
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070321013441-x99h538fq62wwt46
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 15:53:02 +1000
message:
(robertc) Merge 0.8 API removal cleanup.
------------------------------------------------------------
revno: 1739.1.584.1.44.2.1
merged: robertc at robertcollins.net-20070321013441-x99h538fq62wwt46
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: cleanup-0.8
timestamp: Wed 2007-03-21 12:34:41 +1100
message:
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
------------------------------------------------------------
revno: 1739.1.584.1.53
merged: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: pqm at pqm.ubuntu.com-20070324001115-e8868e5d82612556
parent: andrew.bennetts at canonical.com-20070326071140-s1ldac8zkl1b417h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-26 08:30:03 +0100
message:
(Andrew Bennetts) Replace Branch.get_transaction and associated infrastructure with simpler caching of revision history.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.7
merged: andrew.bennetts at canonical.com-20070326071140-s1ldac8zkl1b417h
parent: andrew.bennetts at canonical.com-20070326063215-roox9zrjgwbyggrt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 17:11:40 +1000
message:
Fix test_snapshot_new_revision to use branch.repository.get_transaction instead of branch.get_transaction.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.6
merged: andrew.bennetts at canonical.com-20070326063215-roox9zrjgwbyggrt
parent: andrew.bennetts at canonical.com-20070326062401-k3nbefzje5332jaf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 16:32:15 +1000
message:
Rename _clear_cached_data to _clear_cached_state.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.5
merged: andrew.bennetts at canonical.com-20070326062401-k3nbefzje5332jaf
parent: andrew.bennetts at canonical.com-20070326051152-1q3ntmsj2b4dv9k5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 16:24:01 +1000
message:
Deal with review comments from Robert:
* Add my name to the NEWS file
* Move the test case to a new module in branch_implementations
* Remove revision_history cruft from identitymap and test_identitymap
* Improve some docstrings
Also, this fixes a bug where revision_history was not returning a copy of the
cached data, allowing the cache to be corrupted.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.4
merged: andrew.bennetts at canonical.com-20070326051152-1q3ntmsj2b4dv9k5
parent: andrew.bennetts at canonical.com-20070326045509-mdnlny5ge3sevuns
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 15:11:52 +1000
message:
Remote Branch.get_transaction and friends.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.3
merged: andrew.bennetts at canonical.com-20070326045509-mdnlny5ge3sevuns
parent: andrew.bennetts at canonical.com-20070326014152-yym3dec6270pxjc3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 14:55:09 +1000
message:
Don't use Branch.get_transaction to cache revision history.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.2
merged: andrew.bennetts at canonical.com-20070326014152-yym3dec6270pxjc3
parent: andrew.bennetts at canonical.com-20070326010253-7w19g5fpc4os7pkf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 11:41:52 +1000
message:
More tests for Branch revision history caching.
------------------------------------------------------------
revno: 1739.1.584.1.52.1.1
merged: andrew.bennetts at canonical.com-20070326010253-7w19g5fpc4os7pkf
parent: pqm at pqm.ubuntu.com-20070324001115-e8868e5d82612556
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remove-branch-transaction
timestamp: Mon 2007-03-26 11:02:53 +1000
message:
Start some tests for the caching of branch revision_history.
------------------------------------------------------------
revno: 1739.1.584.1.52
merged: pqm at pqm.ubuntu.com-20070324001115-e8868e5d82612556
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
parent: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-24 00:11:15 +0000
message:
Correctly handle empty merge directive texts
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.59
merged: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective-fixes
timestamp: Thu 2007-03-22 23:37:01 -0400
message:
Correctly handle empty merge directive texts
------------------------------------------------------------
revno: 1739.1.584.1.51
merged: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
parent: pqm at pqm.ubuntu.com-20070322225147-c274f2efe3564edc
parent: john at arbash-meinel.com-20070322200752-4b29yobz92a38tqp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-22 23:08:20 +0000
message:
(John Arbash Meinel) bug #93854, 'bzr checkout' should create branches in the same format as the source.
------------------------------------------------------------
revno: 1739.1.584.1.47.3.2
merged: john at arbash-meinel.com-20070322200752-4b29yobz92a38tqp
parent: john at arbash-meinel.com-20070322194159-fxl08l4zah9df24r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: checkout_uses_branch_format_93854
timestamp: Thu 2007-03-22 15:07:52 -0500
message:
Use BzrDir.set_branch_format() rather than setting it directly.
------------------------------------------------------------
revno: 1739.1.584.1.47.3.1
merged: john at arbash-meinel.com-20070322194159-fxl08l4zah9df24r
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: checkout_uses_branch_format_93854
timestamp: Thu 2007-03-22 14:41:59 -0500
message:
(John Arbash Meinel) Fix bug #93854, make 'bzr checkout' create branches in the same format as the source.
------------------------------------------------------------
revno: 1739.1.584.1.50
merged: pqm at pqm.ubuntu.com-20070322225147-c274f2efe3564edc
parent: pqm at pqm.ubuntu.com-20070322213654-32f24e19910c30ef
parent: john at arbash-meinel.com-20070322195543-2eo6deu0aynnstaq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-22 22:51:47 +0000
message:
(John Arbash Meinel) Change WorkingTree to not read the inventory until we have a lock.
------------------------------------------------------------
revno: 1739.1.584.1.11.1.6
merged: john at arbash-meinel.com-20070322195543-2eo6deu0aynnstaq
parent: john at arbash-meinel.com-20070322195430-wi92c7jpx17kiagr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Thu 2007-03-22 14:55:43 -0500
message:
NEWS for performance fix.
------------------------------------------------------------
revno: 1739.1.584.1.11.1.5
merged: john at arbash-meinel.com-20070322195430-wi92c7jpx17kiagr
parent: john at arbash-meinel.com-20070322151814-fs1m2j0inf8nu7w0
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Thu 2007-03-22 14:54:30 -0500
message:
[merge] bzr.dev 2371
------------------------------------------------------------
revno: 1739.1.584.1.11.1.4
merged: john at arbash-meinel.com-20070322151814-fs1m2j0inf8nu7w0
parent: john at arbash-meinel.com-20070321212157-3hmll50umf1nz1z3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Thu 2007-03-22 10:18:14 -0500
message:
WT2 needs to have an _inventory without a lock.
------------------------------------------------------------
revno: 1739.1.584.1.11.1.3
merged: john at arbash-meinel.com-20070321212157-3hmll50umf1nz1z3
parent: john at arbash-meinel.com-20070321181557-09nrfljkinlmyjmp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Wed 2007-03-21 16:21:57 -0500
message:
When upgrading, we can't assume that WorkingTree._inventory is valid, because that is now
done during tree.lock_*
------------------------------------------------------------
revno: 1739.1.584.1.11.1.2
merged: john at arbash-meinel.com-20070321181557-09nrfljkinlmyjmp
parent: john at arbash-meinel.com-20070321175142-052tm470fx9s0obl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Wed 2007-03-21 13:15:57 -0500
message:
we don't need _inventory_fp.
The bug is that calling self.read_working_inventory() acquires a read lock,
which has a side effect of reading the working inventory,
and then it reads the working inventory,
and then because the overall tree is not locked (this is all happening in WorkingTree.__init__)
all of this is being thrown away.
So we end up with 2 inventory reads which will be completely thrown away.
------------------------------------------------------------
revno: 1739.1.584.1.11.1.1
merged: john at arbash-meinel.com-20070321175142-052tm470fx9s0obl
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Wed 2007-03-21 12:51:42 -0500
message:
Lazily read working inventory in workingtree.py,
this exposes code paths that are not locking the tree before
processing, because they are directly accessing tree._inventory somehow
(one case is Tree.path2id())
------------------------------------------------------------
revno: 1739.1.584.1.49
merged: pqm at pqm.ubuntu.com-20070322213654-32f24e19910c30ef
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
parent: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-22 21:36:54 +0000
message:
(Matthew Fuller) Update 'bzr init-repo' help
------------------------------------------------------------
revno: 1739.1.584.1.48.1.1
merged: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
parent: fullermd at over-yonder.net-20070321043951-0i5v9kc7tosonk9g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-22 14:07:03 -0500
message:
(Matthew Fuller) Update 'bzr init-repo' help
------------------------------------------------------------
revno: 1739.1.584.1.43.1.2
merged: fullermd at over-yonder.net-20070321043951-0i5v9kc7tosonk9g
parent: fullermd at over-yonder.net-20070321040149-1c8b4mwco7llas7z
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: init-repo-help
timestamp: Tue 2007-03-20 23:39:51 -0500
message:
Shared-capable formats are standard, and have been for a good long
while, so don't make a big deal of it in the help summary for
init-repo.
------------------------------------------------------------
revno: 1739.1.584.1.43.1.1
merged: fullermd at over-yonder.net-20070321040149-1c8b4mwco7llas7z
parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: init-repo-help
timestamp: Tue 2007-03-20 23:01:49 -0500
message:
Missing space in --no-trees help.
------------------------------------------------------------
revno: 1739.1.584.1.48
merged: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: john at arbash-meinel.com-20070322141340-wq5w000eof7tpmgj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-22 15:25:22 +0000
message:
(Ian Clatworthy) Minor corrections to HACKING.
------------------------------------------------------------
revno: 1739.1.584.1.47.1.1
merged: john at arbash-meinel.com-20070322141340-wq5w000eof7tpmgj
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-22 09:13:40 -0500
message:
(Ian Clatworthy) Minor corrections to HACKING.
------------------------------------------------------------
revno: 1739.1.584.1.47.2.1
merged: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Thu 2007-03-22 11:02:07 +1000
message:
Minor corrections to HACKING
------------------------------------------------------------
revno: 1739.1.584.1.47
merged: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: pqm at pqm.ubuntu.com-20070321060530-12465d0010713245
parent: bialix at ukr.net-20070312223326-nf01nnhr04nav3v0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 07:12:19 +0000
message:
(bialix) win32 installer improvements
------------------------------------------------------------
revno: 1739.1.582.2.7
merged: bialix at ukr.net-20070312223326-nf01nnhr04nav3v0
parent: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-03-13 00:33:26 +0200
message:
win32 standalone installer improvements:
* admin privileges is not required for install (but there is some limitations)
* CA certificates bundle automatically packed if needed and found
* Check for MFC71.dll is omitted if paramiko.ctypes version is used
------------------------------------------------------------
revno: 1739.1.584.1.46
merged: pqm at pqm.ubuntu.com-20070321060530-12465d0010713245
parent: pqm at pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
parent: andrew.bennetts at canonical.com-20070316010828-1o6m7ec9n9mtr3lx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 06:05:30 +0000
message:
(Andrew Bennetts) Don't use automatically use psyco just by importing a module. It has the nasty side-effect of breaking pdb.
------------------------------------------------------------
revno: 1739.1.584.1.38.1.1
merged: andrew.bennetts at canonical.com-20070316010828-1o6m7ec9n9mtr3lx
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: dont-use-psyco
timestamp: Fri 2007-03-16 12:08:28 +1100
message:
Don't use automatically use psyco just by importing a module. It has the nasty side-effect of breaking pdb.
------------------------------------------------------------
revno: 1739.1.584.1.45
merged: pqm at pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 04:49:05 +0000
message:
Update NEWS to match bzr 0.15.
------------------------------------------------------------
revno: 1739.1.584.1.44.1.1
merged: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-21 15:28:02 +1100
message:
Update NEWS to match bzr 0.15.
------------------------------------------------------------
revno: 1739.1.584.2.4
merged: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
parent: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 15:14:35 +1100
message:
Merge (hopefully the last time) mainline fixes for 0.15.
------------------------------------------------------------
revno: 1739.1.584.2.3
merged: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070310024746-9892781e4718edaf
parent: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 14:31:37 +1100
message:
Merge Martins 0.15rc2 release branch.
------------------------------------------------------------
revno: 1739.1.584.1.35.2.1
merged: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15rc2
timestamp: Wed 2007-03-14 20:33:38 +1100
message:
prepare to release 0.15rc2
------------------------------------------------------------
revno: 1739.1.584.2.2
merged: pqm at pqm.ubuntu.com-20070310024746-9892781e4718edaf
parent: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
parent: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Sat 2007-03-10 02:47:46 +0000
message:
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
------------------------------------------------------------
revno: 1739.1.584.2.1.1.2
merged: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
parent: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.0.15
timestamp: Fri 2007-03-09 12:52:01 +1100
message:
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
------------------------------------------------------------
revno: 1739.1.584.2.1.1.1
merged: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
parent: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.0.15
timestamp: Fri 2007-03-09 10:55:12 +1100
message:
dirstate correctness: allow adding paths present in the basis.
------------------------------------------------------------
revno: 1739.1.584.2.1
merged: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
parent: robertc at robertcollins.net-20070307113448-75xm18n66vrs31s3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Wed 2007-03-07 11:54:04 +0000
message:
(Robert Collins) Release bzr 0.15 RC 1
------------------------------------------------------------
revno: 1739.1.584.3.1
merged: robertc at robertcollins.net-20070307113448-75xm18n66vrs31s3
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-07 22:34:48 +1100
message:
(Robert Collins) Release bzr 0.15 RC 1
------------------------------------------------------------
revno: 1739.1.584.1.44
merged: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:39:38 +0000
message:
(John Arbash Meinel) allow win32 to grab a write lock after 'bzr status', so that we can record the updated stat values.
------------------------------------------------------------
revno: 1739.1.584.1.40.3.4
merged: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
parent: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Tue 2007-03-20 16:59:59 -0500
message:
NEWS
------------------------------------------------------------
revno: 1739.1.584.1.40.3.3
merged: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
parent: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 17:11:28 -0500
message:
make Write locks not block on Read locks, so that revert tests don't fail
Specifically:
test_revert.TestRevert.test_preserve_execute
test_revert.TestRevert.test_revert_executable
fail if we fail to take a Write lock if we have a Read lock.
------------------------------------------------------------
revno: 1739.1.584.1.40.3.2
merged: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
parent: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 16:45:03 -0500
message:
Disable read locks blocking on write locks.
This requires some small test updates to disable that sort of check.
But it should allow the rest of the test suite to pass on non-win32
------------------------------------------------------------
revno: 1739.1.584.1.40.3.1
merged: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 15:56:18 -0500
message:
[merge] locking changes into bzr.dev tip
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.11
merged: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
parent: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Mon 2007-03-19 15:45:46 -0500
message:
Remove the unused _ignore_write_lock parameter.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.10
merged: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
parent: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:39:05 -0500
message:
[merge] Alexander Belchenko: forgotten import of TestSkipped
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.8.1.1
merged: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: jam-locking-bialix
timestamp: Fri 2007-03-16 01:27:43 +0200
message:
forgotten import of TestSkipped
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.9
merged: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:24:59 -0500
message:
[merge] bzr.dev 2359
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.8
merged: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:15:20 -0600
message:
Use the right lock object.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.7
merged: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
parent: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:55:59 -0500
message:
Change the temporary_write_lock api, so that it always returns a lock object,
and a flag indicating whether it was able to grab a write lock.
This is because callers don't know whether it had to unlock the original lock, so it
should always return something that lets callers maintain proper state.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.6
merged: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
parent: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:14:45 -0500
message:
ctypes locks should return ctypes locks.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.5
merged: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
parent: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:02:16 -0500
message:
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.4
merged: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
parent: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 12:19:48 -0500
message:
Implement temporary_write_lock, and restore_read_lock for win32 locks.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.3
merged: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
parent: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 18:40:34 -0500
message:
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process.
Implement it for _fcntl.
This is the api that can be used when we want to update a dirty dirstate
even though we only have a read lock.
On win32, this will actually unlock and re-lock the file. Which is part of
the api description. But we don't have to limit ourselves to the lowest
common denominator on all platforms.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.2
merged: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
parent: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 17:31:38 -0500
message:
[merge] LockCleanup changes.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8.1.1
merged: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:39:14 -0600
message:
(broken) Change fcntl locks to be properly exclusive within the same process.
This exposes the location where we are opening the same WorkingTree in both read and write
mode, which breaks several tests.
------------------------------------------------------------
revno: 1739.1.584.1.43
merged: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:23:07 +0000
message:
(John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.
------------------------------------------------------------
revno: 1739.1.584.1.40.2.5
merged: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
parent: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Tue 2007-03-20 16:54:06 -0500
message:
[merge] bzr.dev 2365
------------------------------------------------------------
revno: 1739.1.584.1.40.2.4
merged: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 20:00:14 -0500
message:
NEWS for fixing bug #93681
------------------------------------------------------------
revno: 1739.1.584.1.40.2.3
merged: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
parent: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:55:43 -0500
message:
Just check if the entry is absent before calling _make_absent.
------------------------------------------------------------
revno: 1739.1.584.1.40.2.2
merged: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
parent: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:49:11 -0500
message:
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.
------------------------------------------------------------
revno: 1739.1.584.1.40.2.1
merged: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:41:04 -0500
message:
(broken) Add a simplified test which exposes the bug.
------------------------------------------------------------
revno: 1739.1.584.1.42
merged: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 20:21:00 +0000
message:
(John Arbash Meinel, Wouter van Heyst) Handle ERROR_DIRECTORY on win32 when doing 'bzr status filename'
------------------------------------------------------------
revno: 1739.1.584.1.40.1.4
merged: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
parent: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Tue 2007-03-20 14:19:16 -0500
message:
Handle ERROR_DIRECTORY for python 2.5
------------------------------------------------------------
revno: 1739.1.584.1.40.1.3
merged: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
parent: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:27:36 -0500
message:
NEWS entry for fixing bug #90819
------------------------------------------------------------
revno: 1739.1.584.1.40.1.2
merged: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
parent: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:24:56 -0500
message:
Clean up the error.
------------------------------------------------------------
revno: 1739.1.584.1.40.1.1
merged: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:10:30 -0500
message:
Catch Windows ERROR_DIRECTORY when doing os.listdir('file')
------------------------------------------------------------
revno: 1739.1.584.1.41
merged: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-19 07:26:06 +0000
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.3
merged: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-19 03:08:04 -0400
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 1739.1.584.1.40
merged: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-17 01:53:05 +0000
message:
(John Arbash Meinel) Update dirstate._iter_changes to return unicode for all paths (bug #92608)
------------------------------------------------------------
revno: 1739.1.584.1.37.1.8
merged: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
parent: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 20:34:14 -0500
message:
Update the tests to handle when fs is non-unicode.
------------------------------------------------------------
revno: 1739.1.584.1.37.1.7
merged: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
parent: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 16:00:04 -0600
message:
NEWS on fixing bug #92608
------------------------------------------------------------
revno: 1739.1.584.1.37.1.6
merged: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
parent: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 14:13:40 -0500
message:
Change utf8_decode_with_None to return what we care about.
Re-use utf8_decode_with_None in the outer loop to avoid decoding in the inner
process_entry
Change the name of the local variable, to make it clear what we are doing.
------------------------------------------------------------
revno: 1739.1.584.1.37.1.5
merged: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
parent: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 11:55:16 -0500
message:
Split out the unicode tests properly.
------------------------------------------------------------
revno: 1739.1.584.1.37.1.4
merged: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
parent: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:22:08 -0500
message:
Clean up of test_compare code.
Change helpers to return locked trees, so we have less copied code.
------------------------------------------------------------
revno: 1739.1.584.1.37.1.3
merged: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
parent: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:10:20 -0500
message:
Start splitting up the overzealous test into focused tests.
And find the bug in add (I was decoding the wrong parameter)
------------------------------------------------------------
revno: 1739.1.584.1.37.1.2
merged: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
parent: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 17:35:35 -0500
message:
Add an overzealous test, for Unicode support of _iter_changes.
For both knowns and unknowns.
And include a basic, if suboptimal, fix.
I would rather defer the decoding until we've determined that we are going to return the tuple.
There is still something broken with added files, but I'll get to that.
------------------------------------------------------------
revno: 1739.1.584.1.37.1.1
merged: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 15:51:12 -0500
message:
Basic implementation test that makes sure _iter_changes handles unknown files.
------------------------------------------------------------
revno: 1739.1.584.1.39
merged: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-16 04:17:59 +0000
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 1739.1.584.1.30.3.14
merged: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 18:25:18 -0500
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 1739.1.584.1.38
merged: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 23:19:15 +0000
message:
(John Arbash Meinel, Alexander Belchenko) some small cleanups for the new lock code.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.13
merged: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 14:22:25 -0500
message:
Cleanup according to Alexander's review comments.
------------------------------------------------------------
revno: 1739.1.584.1.37
merged: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 15:12:45 +0000
message:
(John Arbash Meinel) Clean up OS locks, and implement per-lock implementation tests.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.12
merged: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 18:13:41 -0500
message:
Don't create the alternative lock types unless we are on windows.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.11
merged: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
parent: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:57:03 -0500
message:
Code cleanup
------------------------------------------------------------
revno: 1739.1.584.1.30.3.10
merged: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
parent: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:47:17 -0500
message:
Cleanup errors, and change ReadOnlyLockError to pass around more details.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.9
merged: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:15:52 -0500
message:
Update the lock code and test code so that if more than one
lock implementation is available, they will both be tested.
It is quite a bit of overhead, for a case where we are likely to only have 1
real lock implementation per platform, but hey, for now we have 2.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.8
merged: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
parent: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:18:12 -0500
message:
Fix Copyright in lock.py
------------------------------------------------------------
revno: 1739.1.584.1.30.3.7
merged: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
parent: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:17:37 -0500
message:
Remove the msvc lock type, since it can no longer be used.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.6
merged: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
parent: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:11:51 -0500
message:
On Win32 if you have a file opened in read+write mode, you must call seek() when switching
------------------------------------------------------------
revno: 1739.1.584.1.30.3.5
merged: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
parent: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:35:38 -0500
message:
Fall back on ctypes to get LockFileEx, because msvcrt.locking()
------------------------------------------------------------
revno: 1739.1.584.1.30.3.4
merged: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
parent: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 15:28:27 -0500
message:
Clean up the lock.py code to use less indenting, and conform to better coding practise.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.3
merged: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
parent: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:39:27 -0600
message:
Define an explicit error when trying to grab a write lock on a readonly file.
Add some future tests that ensure write and read locks exclude eachother.
Currently fcntl locks do not exclude.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.2
merged: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
parent: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:15:57 -0600
message:
Add a tests that multiple write locks raise the right kind of error.
------------------------------------------------------------
revno: 1739.1.584.1.30.3.1
merged: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:11:05 -0600
message:
Add some basic locking tests which should currently pass on all platforms.
------------------------------------------------------------
revno: 1739.1.584.1.36
merged: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 15:50:44 +0000
message:
Fixes for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.58
merged: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
parent: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 11:22:51 -0400
message:
Clean up NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.57
merged: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
parent: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:54:34 -0400
message:
Ensure server default works, too
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.56
merged: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
parent: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:46:22 -0400
message:
Merge fix from Vincent
------------------------------------------------------------
revno: 1739.1.584.1.35.1.1
merged: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 92195
timestamp: Wed 2007-03-14 11:37:18 +0100
message:
Fix bug #92195.
* tests/blackbox/test_merge_directive.py:
(TestMergeDirective.prepare_merge_directive): Set smtp_server in
branch config.
(TestMergeDirective.test_mail): Check that the smtp_server is
taken into account.
* builtins.py:
(cmd_merge_directive.run): Provide config smtp_server to
SMTP.connect().
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.55
merged: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:42:57 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54
merged: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:59:44 -0400
message:
Decoded revision ids are utf-8
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.53
merged: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:18:51 -0400
message:
Fix deserialization of merge directives with no patch
------------------------------------------------------------
revno: 1739.1.584.1.35
merged: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 05:08:55 +0000
message:
Hide dirstate-with-subtree, introduce dirstate-tags
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.2
merged: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
parent: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-14 00:43:45 -0400
message:
Hide dirstate-with-subtree format
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.1
merged: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 23:42:40 -0400
message:
Introduce dirstate-tags format
------------------------------------------------------------
revno: 1739.1.584.1.34
merged: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 01:56:49 +0000
message:
(Andrew Bennetts) Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 1739.1.584.1.15.5.1
merged: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: memory-transport-rmdir
timestamp: Tue 2007-03-13 16:27:12 +1100
message:
Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 1739.1.584.1.33
merged: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: bialix at ukr.net-20070313201805-pgocxg341h7156vk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 21:14:39 +0000
message:
(bialix) fixes for selftest on win32
------------------------------------------------------------
revno: 1739.1.582.2.4.1.10
merged: bialix at ukr.net-20070313201805-pgocxg341h7156vk
parent: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 22:18:05 +0200
message:
Explanation about Python 2.5 and StandardError.message attribute
------------------------------------------------------------
revno: 1739.1.582.2.4.1.9
merged: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
parent: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:16:17 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.582.2.4.1.8
merged: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:12:11 +0200
message:
Cleanup patch after John's review
------------------------------------------------------------
revno: 1739.1.582.2.4.1.7
merged: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
parent: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:03:19 +0200
message:
fixes for passing test_sftp_transport on win32 (thankyou John)
------------------------------------------------------------
revno: 1739.1.582.2.4.1.6
merged: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
parent: bialix at ukr.net-20070310230145-inyu15nildow8w5z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:36:55 +0200
message:
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute
------------------------------------------------------------
revno: 1739.1.582.2.4.1.5
merged: bialix at ukr.net-20070310230145-inyu15nildow8w5z
parent: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:01:45 +0200
message:
TestCase.assertFileEqual: separate open/read file operations
to achieve more precise locating the problems on win32
------------------------------------------------------------
revno: 1739.1.582.2.4.1.4
merged: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
parent: bialix at ukr.net-20070308002046-cab3assbe0chebdp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:33:18 +0200
message:
test intertree_implementations: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 1739.1.582.2.4.1.3
merged: bialix at ukr.net-20070308002046-cab3assbe0chebdp
parent: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:20:46 +0200
message:
test_dirstate: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 1739.1.582.2.4.1.2
merged: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
parent: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:00:05 +0200
message:
numbered dirs: printErrorList show test number for NUMBERED_DIRS
------------------------------------------------------------
revno: 1739.1.582.2.4.1.1
merged: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 01:28:52 +0200
message:
merge bzr.dev (pre-0.15/pre-0.16). It should be mergeable to both
------------------------------------------------------------
revno: 1739.1.584.1.32
merged: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:44:43 +0000
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 1739.1.584.1.30.2.1
merged: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-03-13 12:11:45 -0600
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 1739.1.518.2.2
merged: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
parent: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 17:05:51 +0100
message:
Actually test that `bzr init-repo --{no,}-trees` still works
------------------------------------------------------------
revno: 1739.1.518.2.1
merged: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 13:24:10 +0100
message:
Change the ui level default for init-repo to --trees.
------------------------------------------------------------
revno: 1739.1.584.1.31
merged: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:28:58 +0000
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 1739.1.584.1.30.1.1
merged: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-03-13 14:11:58 -0400
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 1739.1.584.1.27.1.1
merged: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-13 23:20:19 +0900
message:
Add NEWS entry for status versioned.
------------------------------------------------------------
revno: 1739.1.584.1.30
merged: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 17:57:55 +0000
message:
Merge autodetects line ending for conflict markers
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.40
merged: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 12:45:23 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39
merged: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 10:07:07 -0400
message:
Add news entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.38
merged: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-12 15:56:41 -0400
message:
merge3 auto-detects line endings for conflict markers
------------------------------------------------------------
revno: 1739.1.584.1.29
merged: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:53:40 +0000
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 1739.1.584.1.25.2.1
merged: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
committer: Marien Zwart <marienz at gentoo.org>
branch nick: push-tags
timestamp: Tue 2007-03-13 02:00:34 +0100
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 1739.1.584.1.28
merged: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:38:34 +0000
message:
(John Arbash Meinel) Some small fixes for win32 and dirstate.
------------------------------------------------------------
revno: 1739.1.584.1.2.3.5
merged: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
parent: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2007-03-09 15:14:22 -0600
message:
is_executable needs a read lock.
------------------------------------------------------------
revno: 1739.1.584.1.2.3.4
merged: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
parent: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 18:52:52 -0600
message:
Rather than setting the executable bit for every file, properly create the working inventory to include it.
------------------------------------------------------------
revno: 1739.1.584.1.2.3.3
merged: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
parent: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 17:50:59 -0600
message:
We need to set 'executability' for all files, because on win32, executability=None => executability=False, not executability=nochange
------------------------------------------------------------
revno: 1739.1.584.1.2.3.2
merged: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
parent: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:58:01 -0600
message:
Implement is_executable for WorkingTree4 and win32
------------------------------------------------------------
revno: 1739.1.584.1.2.3.1
merged: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:32:36 -0600
message:
New helper function for merge, which allows us to re-use the existing workingtree, rather than opening it again.
------------------------------------------------------------
revno: 1739.1.584.1.27
merged: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 12:01:34 +0000
message:
Add support for status --versioned
------------------------------------------------------------
revno: 1739.1.579.2.4
merged: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
parent: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Sun 2007-03-11 22:44:18 +0900
message:
merge bzr.dev
------------------------------------------------------------
revno: 1739.1.579.2.3
merged: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-03-07 23:49:00 +0900
message:
merged bzr.dev
------------------------------------------------------------
revno: 1739.1.579.2.2
merged: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:36 +0900
message:
Apply bug 86451 patch
------------------------------------------------------------
revno: 1739.1.579.2.1
merged: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:00 +0900
message:
Apply status versioned patch
------------------------------------------------------------
revno: 1739.1.584.1.26
merged: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 05:55:15 +0000
message:
(marienz,r=john,r=mbp) fix error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 1739.1.584.1.25.1.2
merged: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
parent: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:58:37 +1100
message:
update news
------------------------------------------------------------
revno: 1739.1.584.1.25.1.1
merged: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:57:47 +1100
message:
(marienz) fixes for error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 1739.1.584.1.15.4.10
merged: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
parent: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 21:55:23 +0100
message:
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.9
merged: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
parent: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:31:12 +0100
message:
More tests for symlinks in tree inventories.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.8
merged: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
parent: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:30:07 +0100
message:
Fix a bug in selftest causing tearDown to run twice for skipped tests.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.7
merged: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
parent: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:43 +0100
message:
Remove dead code.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.6
merged: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
parent: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:23 +0100
message:
Move some tests that do not need a working tree from workingtree_implementations to tree_implementations.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.5
merged: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
parent: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 02:02:16 +0100
message:
Make an assert actually assert something.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.4
merged: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
parent: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 01:37:52 +0100
message:
Increase test coverage.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.3
merged: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
parent: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:23:35 +0100
message:
Make the workingtree inventory tests actually use the different workingtree implementations.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.2
merged: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
parent: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:05:49 +0100
message:
Move the workingtree-related inventory tests to a separate file.
------------------------------------------------------------
revno: 1739.1.584.1.15.4.1
merged: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Sun 2007-03-11 23:15:59 +0100
message:
Fix committing merges in a dirstate tree with a symlink.
------------------------------------------------------------
revno: 1739.1.584.1.25
merged: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 22:22:22 +0000
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 1739.1.584.1.24.1.1
merged: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 16:57:13 -0500
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 1739.1.584.1.1.3.3
merged: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
parent: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:04:19 -0700
message:
Merged bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.1.3.2
merged: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:02:37 -0700
message:
Added blackbox test for bzr version.
------------------------------------------------------------
revno: 1739.1.584.1.1.3.1
merged: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Wed 2007-03-07 17:17:49 -0800
message:
Reveal location of .bazaar directory in 'bzr version'
------------------------------------------------------------
revno: 1739.1.584.1.24
merged: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 21:28:25 +0000
message:
NEWS fixes for post 0.15-rc1
------------------------------------------------------------
revno: 1739.1.584.1.21.1.4
merged: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
parent: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:37:44 -0500
message:
NEWS for fixing bug #88842
------------------------------------------------------------
revno: 1739.1.584.1.21.1.3
merged: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
parent: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:32:40 -0500
message:
NEWS for fixing bug #90501
------------------------------------------------------------
revno: 1739.1.584.1.21.1.2
merged: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:29:59 -0500
message:
Clean up NEWS to fix what actually came after 0.15-rc1 was released.
------------------------------------------------------------
revno: 1739.1.584.1.23
merged: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:56:24 +0000
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 1739.1.584.1.21.1.1
merged: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 11:31:06 -0600
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 1739.1.584.1.10.1.1
merged: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: small.fixes
timestamp: Sun 2007-03-11 14:13:32 +0300
message:
Fixed typo and removed some trailing whitespaces
------------------------------------------------------------
revno: 1739.1.584.1.22
merged: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:30:53 +0000
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 1739.1.584.1.15.3.1
merged: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: hide-nested
timestamp: Mon 2007-03-12 12:08:52 -0400
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 1739.1.584.1.21
merged: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:16:24 +0000
message:
Fix TT._iter_changes bug with kind=None
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.37
merged: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:34:48 -0400
message:
recommit of TreeTransform._iter_changes fix with missing files
------------------------------------------------------------
revno: 1739.1.584.1.20
merged: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:01:44 +0000
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 1739.1.584.1.17.1.1
merged: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 10:29:47 -0600
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 1739.1.584.1.2.2.5
merged: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
parent: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2007-03-11 19:14:44 +0100
message:
Call osutils.safe_revision_id instead of duplicating it.
------------------------------------------------------------
revno: 1739.1.584.1.2.2.4
merged: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
parent: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:29:01 +0100
message:
Rename rev_id to revision_id because HACKING says so.
------------------------------------------------------------
revno: 1739.1.584.1.2.2.3
merged: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
parent: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:27:06 +0100
message:
Make the revid RevisionSpec also support utf8-encoded bytestrings.
------------------------------------------------------------
revno: 1739.1.584.1.2.2.2
merged: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
parent: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 19:51:09 +0100
message:
Make the revid RevisionSpec always return a str object, not a unicode object.
------------------------------------------------------------
revno: 1739.1.584.1.2.2.1
merged: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 18:13:57 +0100
message:
Make the test suite failure reporting a bit more robust.
------------------------------------------------------------
revno: 1739.1.584.1.19
merged: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:46:21 +0000
message:
Small tweaks for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.52
merged: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
parent: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Mon 2007-03-12 09:31:42 -0400
message:
speling fix
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.51
merged: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
parent: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-11 12:16:00 -0400
message:
Allow leading junk before merge directive header
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.50
merged: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
parent: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 20:22:51 -0500
message:
Use public location of submit branch if possible
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.49
merged: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 19:47:07 -0500
message:
Proper error when deserializing junk
------------------------------------------------------------
revno: 1739.1.584.1.18
merged: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:31:21 +0000
message:
(John Arbash Meinel) raise more helpful errors when detecting Knit corruption.
------------------------------------------------------------
revno: 1739.1.584.1.6.1.2
merged: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
parent: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:17:39 -0600
message:
Remove some spurious whitespace changes.
------------------------------------------------------------
revno: 1739.1.584.1.6.1.1
merged: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
parent: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:14:55 -0600
message:
Update _KnitData parser to raise more helpful errors when it detects corruption.
------------------------------------------------------------
revno: 1739.1.584.1.17
merged: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:15:18 +0000
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 1739.1.584.1.16.1.1
merged: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:56:04 -0600
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 1739.1.584.1.15.2.1
merged: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-mail-test
timestamp: Mon 2007-03-12 04:48:18 +0100
message:
Make the merge directive tests work if there is no smtpd running on localhost.
------------------------------------------------------------
revno: 1739.1.584.1.16
merged: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 15:42:17 +0000
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 1739.1.584.1.15.1.1
merged: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:14:04 -0600
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 1739.1.584.1.15
merged: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 21:12:06 +0000
message:
(bialix) 0.15 NEWS cleanup
------------------------------------------------------------
revno: 1739.1.582.2.6
merged: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 22:30:46 +0200
message:
0.15 NEWS cleanup
------------------------------------------------------------
revno: 1739.1.584.1.14
merged: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:57:10 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.36
merged: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:30:45 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1739.1.584.1.13
merged: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:42:22 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.35
merged: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
parent: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:25:39 -0400
message:
Add note about which branch is selected by submit:
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.34
merged: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
parent: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:10:57 -0400
message:
Fix tag: help
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.33
merged: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
parent: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:08:34 -0400
message:
Updates from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.32
merged: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 23:53:13 -0500
message:
Add submit: specifier, for merge-directive-like diffs
------------------------------------------------------------
revno: 1739.1.584.1.12
merged: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:21:33 +0000
message:
(bialix,r=aaron,r=john) fixes for selftest on win32
------------------------------------------------------------
revno: 1739.1.582.2.5
merged: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 21:39:37 +0200
message:
external diff: no need for special code path for win32 (suggested by John Meinel)
------------------------------------------------------------
revno: 1739.1.582.2.4
merged: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 12:52:29 +0200
message:
numbered dirs: default value for function args is None to prevent changing NUMBERED_DIRS during selftesting
------------------------------------------------------------
revno: 1739.1.582.2.3
merged: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
parent: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 03:54:13 +0200
message:
fix for check_repo_format_for_funky_id_on_win32 after Martin's refactoring of repository format
------------------------------------------------------------
revno: 1739.1.582.2.2
merged: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
parent: bialix at ukr.net-20070306230900-mbyylf39npkof72m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 02:57:40 +0200
message:
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
------------------------------------------------------------
revno: 1739.1.584.1.11
merged: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 23:25:35 +0000
message:
Fix WorkingTree4._iter_changes with pending merges and deleted files
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.31
merged: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 16:39:07 -0500
message:
Fix WorkingTree4._iter_changes with pending merges and deleted files
------------------------------------------------------------
revno: 1739.1.584.1.10
merged: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 21:21:10 +0000
message:
Add + kind marker for tree references
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.30
merged: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
parent: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 15:35:58 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.29
merged: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
parent: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-03-09 22:12:59 -0500
message:
Fix tree.list_files when file kind changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.28
merged: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
parent: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 21:33:27 -0500
message:
change kind marker to '+'
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.27
merged: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 19:51:21 -0500
message:
Add a kind marker for subtrees
------------------------------------------------------------
revno: 1739.1.584.1.9
merged: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
parent: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 05:01:04 +0000
message:
(robertc) Forward port of dirstate correctness committed to bzr 0.15.
------------------------------------------------------------
revno: 1739.1.584.1.8.1.1
merged: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2007-03-10 15:37:39 +1100
message:
(robertc) Forward port of dirstate correctness committed to bzr 0.15.
------------------------------------------------------------
revno: 1739.1.584.1.8
merged: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
parent: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
parent: aaron.bentley at utoronto.ca-20070310032935-e89x8257lu2xl0ur
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 04:18:34 +0000
message:
Allow files to change kind in Tree.list_files
------------------------------------------------------------
revno: 1739.1.584.1.7.1.1
merged: aaron.bentley at utoronto.ca-20070310032935-e89x8257lu2xl0ur
parent: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-03-09 22:29:35 -0500
message:
Allow files to change kind in Tree.list_files
------------------------------------------------------------
revno: 1739.1.584.1.7
merged: pqm at pqm.ubuntu.com-20070309225721-d395866527ca9a47
parent: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 22:57:21 +0000
message:
Add support for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.48
merged: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
parent: abentley at panoramicfeedback.com-20070309220446-584nkt937ce2t6x5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:41:47 -0500
message:
Fix patch time formatting
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.47
merged: abentley at panoramicfeedback.com-20070309220446-584nkt937ce2t6x5
parent: abentley at panoramicfeedback.com-20070309220228-fsmagyzqizejudw2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:04:46 -0500
message:
Add NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.46
merged: abentley at panoramicfeedback.com-20070309220228-fsmagyzqizejudw2
parent: abentley at panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 17:02:28 -0500
message:
Import highres date functions to old location
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.45
merged: abentley at panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
parent: abentley at panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:51:41 -0500
message:
Change format marker to not experimental
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.44
merged: abentley at panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
parent: abentley at panoramicfeedback.com-20070309212019-1tczqufaqn490bxg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:46:40 -0500
message:
Add (set|get)_public_branch
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.43
merged: abentley at panoramicfeedback.com-20070309212019-1tczqufaqn490bxg
parent: abentley at panoramicfeedback.com-20070309210541-8i1zu6gl1zo51b17
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:20:19 -0500
message:
Misc changes from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.42
merged: abentley at panoramicfeedback.com-20070309210541-8i1zu6gl1zo51b17
parent: abentley at panoramicfeedback.com-20070309204148-vmtkocitp2er21r7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 16:05:41 -0500
message:
Clean up blackbox tests
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.41
merged: abentley at panoramicfeedback.com-20070309204148-vmtkocitp2er21r7
parent: abentley at panoramicfeedback.com-20070309200141-22zi853yb73m0w8h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 15:41:48 -0500
message:
Clean up tests, add serialization text test
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.40
merged: abentley at panoramicfeedback.com-20070309200141-22zi853yb73m0w8h
parent: aaron.bentley at utoronto.ca-20070309065057-6fhwzmcmq6gsnvph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-09 15:01:41 -0500
message:
Do not show prefixes in diffs
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.39
merged: aaron.bentley at utoronto.ca-20070309065057-6fhwzmcmq6gsnvph
parent: aaron.bentley at utoronto.ca-20070309063954-kla33k312hc97fkg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-09 01:50:57 -0500
message:
Re-design patch handling to use a dict
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.38
merged: aaron.bentley at utoronto.ca-20070309063954-kla33k312hc97fkg
parent: aaron.bentley at utoronto.ca-20070309040235-fg2w16vld49hn9v8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-09 01:39:54 -0500
message:
Add docs for MergeDirective and RIO-patch functions
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.37
merged: aaron.bentley at utoronto.ca-20070309040235-fg2w16vld49hn9v8
parent: abentley at panoramicfeedback.com-20070307201406-5bxjy8wlmmcxy0eh
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-08 23:02:35 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.36
merged: abentley at panoramicfeedback.com-20070307201406-5bxjy8wlmmcxy0eh
parent: abentley at panoramicfeedback.com-20070307193308-0d4e2jx8m14w5n99
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-03-07 15:14:06 -0500
message:
Fix failing tests
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.35
merged: abentley at panoramicfeedback.com-20070307193308-0d4e2jx8m14w5n99
parent: abentley at panoramicfeedback.com-20070306173820-gm6h3evc1wq5hmcq
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-03-07 14:33:08 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.34
merged: abentley at panoramicfeedback.com-20070306173820-gm6h3evc1wq5hmcq
parent: abentley at panoramicfeedback.com-20070306173229-f5rqgyxswuetgzn5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:38:20 -0500
message:
Check public branch only if not using a bundle
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.33
merged: abentley at panoramicfeedback.com-20070306173229-f5rqgyxswuetgzn5
parent: abentley at panoramicfeedback.com-20070306171830-a8t6u8zqi0dngymt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:32:29 -0500
message:
Take public_branch as a string, not object
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.32
merged: abentley at panoramicfeedback.com-20070306171830-a8t6u8zqi0dngymt
parent: abentley at panoramicfeedback.com-20070306170240-0y7u12fgon0pj4n2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:18:30 -0500
message:
Improve merge directive help
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.31
merged: abentley at panoramicfeedback.com-20070306170240-0y7u12fgon0pj4n2
parent: abentley at panoramicfeedback.com-20070306160259-dunx5d9kztvjdl3q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 12:02:40 -0500
message:
Tweak merge-directive help text
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.30
merged: abentley at panoramicfeedback.com-20070306160259-dunx5d9kztvjdl3q
parent: abentley at panoramicfeedback.com-20070306160225-m505tm2meq7dolg3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 11:02:59 -0500
message:
Use patch-style dates for timestamps in merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.29
merged: abentley at panoramicfeedback.com-20070306160225-m505tm2meq7dolg3
parent: abentley at panoramicfeedback.com-20070306143648-21mk65sacviz0cxn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 11:02:25 -0500
message:
Copy and extend patch date formatting code, add patch-date parsing
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.28
merged: abentley at panoramicfeedback.com-20070306143648-21mk65sacviz0cxn
parent: aaron.bentley at utoronto.ca-20070306064336-faqn0n4uc9cmsny4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-06 09:36:48 -0500
message:
Move bundle timestamp code to timestamp
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.27
merged: aaron.bentley at utoronto.ca-20070306064336-faqn0n4uc9cmsny4
parent: aaron.bentley at utoronto.ca-20070306063419-ils9x2j89l1sz2u4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Tue 2007-03-06 01:43:36 -0500
message:
support custom message everywhere
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.26
merged: aaron.bentley at utoronto.ca-20070306063419-ils9x2j89l1sz2u4
parent: aaron.bentley at utoronto.ca-20070306024029-xq5xqmzn0yrcoo1g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Tue 2007-03-06 01:34:19 -0500
message:
Get email working, with optional message
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.25
merged: aaron.bentley at utoronto.ca-20070306024029-xq5xqmzn0yrcoo1g
parent: abentley at panoramicfeedback.com-20070302202706-mriia2sdekme12af
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Mon 2007-03-05 21:40:29 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.24
merged: abentley at panoramicfeedback.com-20070302202706-mriia2sdekme12af
parent: abentley at panoramicfeedback.com-20070302160831-awgljsprb3y5lm6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 15:27:06 -0500
message:
Add RegistryOption.from_swargs to simplify simple registry options
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.23
merged: abentley at panoramicfeedback.com-20070302160831-awgljsprb3y5lm6f
parent: abentley at panoramicfeedback.com-20070302160033-24rk2wsej7212y0f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 11:08:31 -0500
message:
Indent line continuations in Patch-RIO, to improve readability
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.22
merged: abentley at panoramicfeedback.com-20070302160033-24rk2wsej7212y0f
parent: abentley at panoramicfeedback.com-20070302150307-zg8n768fzowijv7l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 11:00:33 -0500
message:
Fix handling of whitespace-stripping without newline munging
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.21
merged: abentley at panoramicfeedback.com-20070302150307-zg8n768fzowijv7l
parent: aaron.bentley at utoronto.ca-20070302050016-m6m8kh6f6ev6sby4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Fri 2007-03-02 10:03:07 -0500
message:
Patch-RIO does line breaks in slightly more readable places
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.20
merged: aaron.bentley at utoronto.ca-20070302050016-m6m8kh6f6ev6sby4
parent: aaron.bentley at utoronto.ca-20070302045725-gwstbhhzjko37t7h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Fri 2007-03-02 00:00:16 -0500
message:
Pull directive registry into command class
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.19
merged: aaron.bentley at utoronto.ca-20070302045725-gwstbhhzjko37t7h
parent: aaron.bentley at utoronto.ca-20070302045310-a4jr2qd18xuzqz25
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:57:25 -0500
message:
Clean up patch-selection options
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.18
merged: aaron.bentley at utoronto.ca-20070302045310-a4jr2qd18xuzqz25
parent: aaron.bentley at utoronto.ca-20070302043147-ig72y3cqimym5mv4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:53:10 -0500
message:
Allow RegistryOption to omit the value-taking option
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.17
merged: aaron.bentley at utoronto.ca-20070302043147-ig72y3cqimym5mv4
parent: aaron.bentley at utoronto.ca-20070302040759-5xs52rvht12z9pld
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:31:47 -0500
message:
add revision selection to mergedirective
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.16
merged: aaron.bentley at utoronto.ca-20070302040759-5xs52rvht12z9pld
parent: aaron.bentley at utoronto.ca-20070302035817-hetup3803ogn6f3n
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 23:07:59 -0500
message:
Enable signing merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.15
merged: aaron.bentley at utoronto.ca-20070302035817-hetup3803ogn6f3n
parent: aaron.bentley at utoronto.ca-20070302024626-nxb07lxv8k162wwd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 22:58:17 -0500
message:
add header/trailer to fake clearsigned texts
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.14
merged: aaron.bentley at utoronto.ca-20070302024626-nxb07lxv8k162wwd
parent: abentley at panoramicfeedback.com-20070301220239-912wunnt0ibdxwv8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 21:46:26 -0500
message:
Get merge-directive command basically working
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.13
merged: abentley at panoramicfeedback.com-20070301220239-912wunnt0ibdxwv8
parent: abentley at panoramicfeedback.com-20070301184936-yqh784phreoj8frm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 17:02:39 -0500
message:
Rename fields
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.12
merged: abentley at panoramicfeedback.com-20070301184936-yqh784phreoj8frm
parent: abentley at panoramicfeedback.com-20070301183050-g05fxlw903g99b1h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:49:36 -0500
message:
Add format header
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.11
merged: abentley at panoramicfeedback.com-20070301183050-g05fxlw903g99b1h
parent: abentley at panoramicfeedback.com-20070301181600-vs3elfjgigoskuuk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:30:50 -0500
message:
Handle trailing whitepace cleanly
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.10
merged: abentley at panoramicfeedback.com-20070301181600-vs3elfjgigoskuuk
parent: aaron.bentley at utoronto.ca-20070301060310-0pt01rqke20k7ynr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Thu 2007-03-01 13:16:00 -0500
message:
Reduce max width to 72
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.9
merged: aaron.bentley at utoronto.ca-20070301060310-0pt01rqke20k7ynr
parent: aaron.bentley at utoronto.ca-20070301060307-a6se6653vx5fi65s
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 01:03:10 -0500
message:
force patch-rio to 76 characters
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.8
merged: aaron.bentley at utoronto.ca-20070301060307-a6se6653vx5fi65s
parent: aaron.bentley at utoronto.ca-20070301045143-w3isp2hojzyvd2px
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Thu 2007-03-01 01:03:07 -0500
message:
Add merge-directive command
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.7
merged: aaron.bentley at utoronto.ca-20070301045143-w3isp2hojzyvd2px
parent: aaron.bentley at utoronto.ca-20070301044855-ywj2umovp9uid2w6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:51:43 -0500
message:
Fix use of public location/branch
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.6
merged: aaron.bentley at utoronto.ca-20070301044855-ywj2umovp9uid2w6
parent: aaron.bentley at utoronto.ca-20070301041436-cyfzmqrtau2qs4fk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:48:55 -0500
message:
Force times to be floats
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.5
merged: aaron.bentley at utoronto.ca-20070301041436-cyfzmqrtau2qs4fk
parent: abentley at panoramicfeedback.com-20070301013455-4i2rtr2x7ykhedt6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Wed 2007-02-28 23:14:36 -0500
message:
Get MergeDirective.from_objects working
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.4
merged: abentley at panoramicfeedback.com-20070301013455-4i2rtr2x7ykhedt6
parent: abentley at panoramicfeedback.com-20070228225845-01l214kd4xeb681q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 20:34:55 -0500
message:
Add failing test
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.3
merged: abentley at panoramicfeedback.com-20070228225845-01l214kd4xeb681q
parent: abentley at panoramicfeedback.com-20070228185118-9m1ko9deqtokocil
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 17:58:45 -0500
message:
Add timestamps to merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.2
merged: abentley at panoramicfeedback.com-20070228185118-9m1ko9deqtokocil
parent: abentley at panoramicfeedback.com-20070228165118-1v8tiziwwq5wzr1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 13:51:18 -0500
message:
Got directives round-tripping, with bundles and everything
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.1
merged: abentley at panoramicfeedback.com-20070228165118-1v8tiziwwq5wzr1z
parent: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Wed 2007-02-28 11:51:18 -0500
message:
Basic RIO patch-compatible format is working
------------------------------------------------------------
revno: 1739.1.584.1.6
merged: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: john at arbash-meinel.com-20070309211043-ln4hotho1vm2v5ur
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 21:27:15 +0000
message:
(Dmitry Vasiliev) Improvements to osutils functions.
------------------------------------------------------------
revno: 1739.1.584.1.5.1.1
merged: john at arbash-meinel.com-20070309211043-ln4hotho1vm2v5ur
parent: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: dima at hlabs.spb.ru-20070307153731-2en9aa3ymzx4ltnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-09 15:10:43 -0600
message:
(Dmitry Vasiliev) Improvements to osutils functions.
------------------------------------------------------------
revno: 1739.1.584.1.1.2.4
merged: dima at hlabs.spb.ru-20070307153731-2en9aa3ymzx4ltnn
parent: dima at hlabs.spb.ru-20070307151756-ryfruec1tq9g8344
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 18:37:31 +0300
message:
Fixed test_unicode__walkdirs_utf8 test
------------------------------------------------------------
revno: 1739.1.584.1.1.2.3
merged: dima at hlabs.spb.ru-20070307151756-ryfruec1tq9g8344
parent: dima at hlabs.spb.ru-20070307144251-ogtxgcax84659wb0
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 18:17:56 +0300
message:
Fixed is_inside_* methods implementation
------------------------------------------------------------
revno: 1739.1.584.1.1.2.2
merged: dima at hlabs.spb.ru-20070307144251-ogtxgcax84659wb0
parent: dima at hlabs.spb.ru-20070307143607-na1fu8ut20td0i1u
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 17:42:51 +0300
message:
Fixed lexists() implementation
------------------------------------------------------------
revno: 1739.1.584.1.1.2.1
merged: dima at hlabs.spb.ru-20070307143607-na1fu8ut20td0i1u
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Wed 2007-03-07 17:36:07 +0300
message:
kind_marker() optimization
------------------------------------------------------------
revno: 1739.1.584.1.5
merged: pqm at pqm.ubuntu.com-20070309020838-1dd7e652bc5c30ff
parent: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: john at arbash-meinel.com-20070309004524-fz8byjfqklnzvi6h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 02:08:38 +0000
message:
(Dmitry Vasiliev) Support for Putty SSH, and improved vendor support
------------------------------------------------------------
revno: 1739.1.584.1.4.1.1
merged: john at arbash-meinel.com-20070309004524-fz8byjfqklnzvi6h
parent: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: dima at hlabs.spb.ru-20070307134747-clcmwlfck4g9yqh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 18:45:24 -0600
message:
(Dmitry Vasiliev) Support for Putty SSH, and improved vendor support
------------------------------------------------------------
revno: 1739.1.482.5.22
merged: dima at hlabs.spb.ru-20070307134747-clcmwlfck4g9yqh3
parent: dima at hlabs.spb.ru-20070307132025-kgv55i7xvp7rp7pv
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 16:47:47 +0300
message:
Updated note about registry.Registry
------------------------------------------------------------
revno: 1739.1.482.5.21
merged: dima at hlabs.spb.ru-20070307132025-kgv55i7xvp7rp7pv
parent: dima at hlabs.spb.ru-20070307124531-yom9s6p3rb1npeet
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 16:20:25 +0300
message:
Reverted trailing whitespace removal
------------------------------------------------------------
revno: 1739.1.482.5.20
merged: dima at hlabs.spb.ru-20070307124531-yom9s6p3rb1npeet
parent: dima at hlabs.spb.ru-20070307121040-ekqnz95gtv2iq4jb
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 15:45:31 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 1739.1.482.5.19
merged: dima at hlabs.spb.ru-20070307121040-ekqnz95gtv2iq4jb
parent: dima at hlabs.spb.ru-20070302153843-9hks8px50lwukdcm
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Wed 2007-03-07 15:10:40 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 1739.1.482.5.18
merged: dima at hlabs.spb.ru-20070302153843-9hks8px50lwukdcm
parent: dima at hlabs.spb.ru-20070302141015-sjn7kthbdgylt3bp
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 18:38:43 +0300
message:
Fixed variable name
------------------------------------------------------------
revno: 1739.1.482.5.17
merged: dima at hlabs.spb.ru-20070302141015-sjn7kthbdgylt3bp
parent: dima at hlabs.spb.ru-20070302134414-9mqpmmsii6llb9of
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 17:10:15 +0300
message:
Added comments for test_get_vendor_search_order
------------------------------------------------------------
revno: 1739.1.482.5.16
merged: dima at hlabs.spb.ru-20070302134414-9mqpmmsii6llb9of
parent: dima at hlabs.spb.ru-20070302132658-m844rgyc8smzhw3y
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 16:44:14 +0300
message:
Added comments for test_cached_vendor
------------------------------------------------------------
revno: 1739.1.482.5.15
merged: dima at hlabs.spb.ru-20070302132658-m844rgyc8smzhw3y
parent: dima at hlabs.spb.ru-20070302122819-c5cfkd4nnp5tzksp
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 16:26:58 +0300
message:
Added docstrings for all SSHVendorManager's methods
------------------------------------------------------------
revno: 1739.1.482.5.14
merged: dima at hlabs.spb.ru-20070302122819-c5cfkd4nnp5tzksp
parent: dima at hlabs.spb.ru-20070302122200-5oqpv72nae2tr8sl
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:28:19 +0300
message:
Wrapped long lines
------------------------------------------------------------
revno: 1739.1.482.5.13
merged: dima at hlabs.spb.ru-20070302122200-5oqpv72nae2tr8sl
parent: dima at hlabs.spb.ru-20070302120557-vasdqot44qytav50
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:22:00 +0300
message:
Fixed expected message in test
------------------------------------------------------------
revno: 1739.1.482.5.12
merged: dima at hlabs.spb.ru-20070302120557-vasdqot44qytav50
parent: dima at hlabs.spb.ru-20070302115124-xpya6q8087zrzb5z
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 15:05:57 +0300
message:
Added note about SSHVendorManager
------------------------------------------------------------
revno: 1739.1.482.5.11
merged: dima at hlabs.spb.ru-20070302115124-xpya6q8087zrzb5z
parent: dima at hlabs.spb.ru-20070206185152-qk1p2p0tjn9uf4nm
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Putty SSH implementation support
timestamp: Fri 2007-03-02 14:51:24 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 1739.1.482.5.10
merged: dima at hlabs.spb.ru-20070206185152-qk1p2p0tjn9uf4nm
parent: dima at hlabs.spb.ru-20070206184530-4rtd41xpm9ksgbo5
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:51:52 +0300
message:
Imports placed in alphabetical order
------------------------------------------------------------
revno: 1739.1.482.5.9
merged: dima at hlabs.spb.ru-20070206184530-4rtd41xpm9ksgbo5
parent: dima at hlabs.spb.ru-20070206182410-knuhr3u2s4xm3upb
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:45:30 +0300
message:
Removed trailing whitespaces and wrapped all long lines
------------------------------------------------------------
revno: 1739.1.482.5.8
merged: dima at hlabs.spb.ru-20070206182410-knuhr3u2s4xm3upb
parent: dima at hlabs.spb.ru-20070203080847-3mnn4704lz6f2djs
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Tue 2007-02-06 21:24:10 +0300
message:
Added SSHVendorManager.clear_cache() method
------------------------------------------------------------
revno: 1739.1.482.5.7
merged: dima at hlabs.spb.ru-20070203080847-3mnn4704lz6f2djs
parent: dima at hlabs.spb.ru-20070113135005-he6e52rif5rym8hv
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-02-03 11:08:47 +0300
message:
Merged bzr.dev
------------------------------------------------------------
revno: 1739.1.482.5.6
merged: dima at hlabs.spb.ru-20070113135005-he6e52rif5rym8hv
parent: dima at hlabs.spb.ru-20070113132723-7b42wbkb488nf725
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:50:05 +0300
message:
Changed tests to make sure the vendor manager returns the same object as was registered
------------------------------------------------------------
revno: 1739.1.482.5.5
merged: dima at hlabs.spb.ru-20070113132723-7b42wbkb488nf725
parent: dima at hlabs.spb.ru-20070113131305-ncebrfkhqacbbnjf
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:27:23 +0300
message:
Added 'register_default_vendor' method to the SSHVendorManager
------------------------------------------------------------
revno: 1739.1.482.5.4
merged: dima at hlabs.spb.ru-20070113131305-ncebrfkhqacbbnjf
parent: dima at hlabs.spb.ru-20070113130821-78gaqgwsmyxprr12
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:13:05 +0300
message:
Removed trailing whitespace
------------------------------------------------------------
revno: 1739.1.482.5.3
merged: dima at hlabs.spb.ru-20070113130821-78gaqgwsmyxprr12
parent: dima at hlabs.spb.ru-20070105161006-r0x531easfpft0k6
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Sat 2007-01-13 16:08:21 +0300
message:
Fixed plink's arguments order. Added tests for such a case.
------------------------------------------------------------
revno: 1739.1.482.5.2
merged: dima at hlabs.spb.ru-20070105161006-r0x531easfpft0k6
parent: dima at hlabs.spb.ru-20070105154416-z0s48q431s86rm5j
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Fri 2007-01-05 19:10:06 +0300
message:
Added note to the NEWS file
------------------------------------------------------------
revno: 1739.1.482.5.1
merged: dima at hlabs.spb.ru-20070105154416-z0s48q431s86rm5j
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small Fixes
timestamp: Fri 2007-01-05 18:44:16 +0300
message:
Added support for Putty's SSH implementation
------------------------------------------------------------
revno: 1739.1.584.1.4
merged: pqm at pqm.ubuntu.com-20070309003830-14e9b007ad653905
parent: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: john at arbash-meinel.com-20070308220808-3gdl6wjgje0ydbv5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-09 00:38:30 +0000
message:
(Vincent Ladeuil) Improved infrastructure for password handling.
------------------------------------------------------------
revno: 1739.1.584.1.3.1.1
merged: john at arbash-meinel.com-20070308220808-3gdl6wjgje0ydbv5
parent: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: v.ladeuil+lp at free.fr-20070221144606-qoy01pue1p187j3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 16:08:08 -0600
message:
(Vincent Ladeuil) Improved infrastructure for password handling.
------------------------------------------------------------
revno: 1739.1.555.4.4
merged: v.ladeuil+lp at free.fr-20070221144606-qoy01pue1p187j3b
parent: v.ladeuil+lp at free.fr-20070220080240-ti00ro17rxfqe86z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Wed 2007-02-21 15:46:06 +0100
message:
Provide a better implementation for testing passwords.
* bzrlib/ui/__init__.py:
(UIFactory.get_login): Deleted.
(CLIUIFactory.get_non_echoed_password): New method allowing
overriding.
* bzrlib/tests/__init__.py:
(TestUIFactory.get_non_echoed_password): Allows password testing
without worrying about echo echo.
* bzrlib/tests/__init__.py:
(TestUIFactory): Moved from bzrlib/tests/blackbox/__init__.py
(FakeStdin): Deleted.
(TestCase.run_bzr_captured): Set and reuse ui.ui_factory.stdin.
* bzrlib/ui/text.py:
(TextUIFactory.get_login): Deleted.
(TextUIFactory.get_password): Moved to CLIUIFactory.
* bzrlib/tests/test_ui.py:
(UITests): Delete get_login tests.
(FakeTextUIFactory): Deleted. Better implementation in
TestUIFactory.
* bzrlib/tests/blackbox/__init__.py:
(TestUIFactory): Moved to bzrlib/tests/__init__.py.
------------------------------------------------------------
revno: 1739.1.555.4.3
merged: v.ladeuil+lp at free.fr-20070220080240-ti00ro17rxfqe86z
parent: v.ladeuil+lp at free.fr-20070220075141-92289xpd1mcfmjaq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Tue 2007-02-20 09:02:40 +0100
message:
Fix typo.
------------------------------------------------------------
revno: 1739.1.555.4.2
merged: v.ladeuil+lp at free.fr-20070220075141-92289xpd1mcfmjaq
parent: v.ladeuil+lp at free.fr-20070219210827-qcz46is44zdpfjxr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Tue 2007-02-20 08:51:41 +0100
message:
Take Martin's review comments into account.
------------------------------------------------------------
revno: 1739.1.555.4.1
merged: v.ladeuil+lp at free.fr-20070219210827-qcz46is44zdpfjxr
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fakestdin
timestamp: Mon 2007-02-19 22:08:27 +0100
message:
Add a UIFactory.get_login method, fix tests.
* bzrlib/ui/text.py:
(TextUIFactory.prompt): Made usable for more than get_boolean by
deleting the [y/n] part.
(TextUIFactory.get_login): New method.
* bzrlib/ui/__init__.py:
(UIFactory.get_login): New method.
(CLIUIFactory.get_boolean): Add the [y/n] part deleted from
prompt().
* bzrlib/tests/test_ui.py:
(FakeTextUIFactory): New test class.
(UITests.test_silent_factory): Add no output testing.
(UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password,
UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password): New tests replacing
test_text_factory.
(UITests.test_text_factory_prompts_and_clears): Use a
DotsProgressBar so that we can run the tests from a dumb terminal
too.
* bzrlib/tests/__init__.py:
(FakeStdin): New test class.
------------------------------------------------------------
revno: 1739.1.584.1.3
merged: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-08 21:53:22 +0000
message:
(Dmitry Vasiliev) Small fixes to cmd_diff
------------------------------------------------------------
revno: 1739.1.584.1.2.1.2
merged: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
parent: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 11:46:44 -0600
message:
Add (eg "old/:new/") to errors to make it a little clearer.
------------------------------------------------------------
revno: 1739.1.584.1.2.1.1
merged: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 11:40:53 -0600
message:
[merge] Dmitry's updates to cmd_diff
------------------------------------------------------------
revno: 1739.1.584.1.1.1.2
merged: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
parent: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Thu 2007-03-08 12:41:14 +0300
message:
Added test for bzr diff --prefix illegal_value
------------------------------------------------------------
revno: 1739.1.584.1.1.1.1
merged: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: Small fixes
timestamp: Thu 2007-03-08 09:19:32 +0300
message:
Small fixes for bzr diff
------------------------------------------------------------
revno: 1739.1.584.1.2
merged: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 23:31:24 +0000
message:
fixes for 0.15
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.26
merged: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
parent: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:15:35 -0500
message:
Allow extract when tree is locked
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.25
merged: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
parent: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:15:10 -0500
message:
Make ChangeReporter private
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.24
merged: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-07 18:14:36 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1739.1.584.1.1
merged: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
parent: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 12:18:52 +0000
message:
(robertc) Setup for 0.16 development.
Diff too large for email (32928 lines, the limit is 1000).
More information about the bazaar-commits
mailing list