Rev 2054: Merge bzr.dev. in sftp://rookery/~/public_html/baz2.0/transport
Robert Collins
robertc at robertcollins.net
Wed Jul 4 09:08:46 BST 2007
At sftp://rookery/~/public_html/baz2.0/transport
------------------------------------------------------------
revno: 2054
revision-id: robertc at robertcollins.net-20070704080813-wzebx0r88fvwj5rq
parent: robertc at robertcollins.net-20060929062403-7e8b779181d8766c
parent: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transport-get-file
timestamp: Wed 2007-07-04 18:08:13 +1000
message:
Merge bzr.dev.
removed:
NEWS.developers NEWS.developers-20050919074335-ad69ad48eec18028
build-api build-api-20050309064830-a0be0dc1452cda87
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_info.py bench_info.py-20060719045551-x5ixdrwbw57cg19z-1
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/tree_creator/many_commit.py many_commit.py-20060819021600-khvri55v4f6edzsl-1
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/breakin.py breakin.py-20070417043829-so46nevf978u713k-1
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/ repofmt-20070124052833-mplndq0aywl30b35-1
bzrlib/repofmt/__init__.py __init__.py-20070206060649-j4kznrq6xkjmy092-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-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/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_last_revision_info.py test_last_revision_i-20070201133317-51mzi40m8hv1i0i9-1
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-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/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_https_ca_bundle.py test_https_ca_bundle-20070226095439-x5899kvqg7xsbk8e-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lazy_regex.py test_lazy_regex.py-20061009091222-fyettq6z5qomdl9e-2
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-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_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
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_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
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/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_list_files.py test_list_files.py-20070216005501-cjh6fzprbe9lbs2t-1
bzrlib/tests/tree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-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/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/tests/workingtree_implementations/test_basis_tree.py test_basis_tree.py-20070216005613-85tsdbzarlx088wg-1
bzrlib/tests/workingtree_implementations/test_flush.py test_flush.py-20061005073432-585uyj0sua6r7i9v-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/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_paths2ids.py test_paths2ids.py-20070222011621-kesvovdwm69nndtx-1
bzrlib/tests/workingtree_implementations/test_read_working_inventory.py test_read_working_in-20061005073432-585uyj0sua6r7i9v-2
bzrlib/tests/workingtree_implementations/test_readonly.py test_readonly.py-20061219164256-7imbl63m4j15n0es-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-2
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml7.py xml7.py-20061029182747-d5tiiny21bvrd2jj-1
doc/bazaar-vcs.org.kid bazaarvcs.org.kid-20060929181918-huv7bgmdey0ktqci-1
doc/developers/ docdevelopers-20070507164002-62r0es2b29myxges-1
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-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
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/win32/info.txt info.txt-20061014084411-x9dr721ue9blowkc-1
renamed:
HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_command.py => bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/transport/smart.py => bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/win32console.py => bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/__init__.py __init__.py-20060815024128-b16a7pn542u6b13k-4
bzrlib/benchmarks/tree_creator/heavily_merged.py heavily_merged.py-20060815024128-b16a7pn542u6b13k-3
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/benchmarks/tree_creator/simple_many_commit.py simple_many_commits.-20060815024128-b16a7pn542u6b13k-2
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
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/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/doc/api/branch.txt branch.txt-20060130010728-d96c35d50b205aed
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/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inspect_for_copy.py inspect_for_copy.py-20060912223659-9ccpdogzwxqznpq1-1
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/iterablefile.py iterablefile.py-20051225230610-c93e5550a82115ed
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/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/patiencediff.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/__init__.py __init__.py-20050815170346-d9190986cecb91f5
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_ignored.py test_ignored.py-20060518234732-373c9c3035c3558f
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_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
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_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
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_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
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_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
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_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
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/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
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_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
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/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_identitymap.py testidentitymap.py-20051007040721-37936d473bd1ac51
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
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_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_patch.py test_patch.py-20060416172603-65c8e3b6c4783426
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_textfile.py test_textfile.py-20060415001558-256482b2206362aa
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_tuned_gzip.py test_tuned_gzip.py-20060418042056-c576dfc708984968
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_version.py test_version.py-20060816024207-ves6ult9a11taj9t-2
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/workingtree_implementations/test_changes_from.py test_delta.py-20060721145444-xlj6hoiipa8ekkwj-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_put_file.py test_put_file.py-20060907214856-4omn6hf1u7fvrart-4
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/textui.py textui.py-20050309040759-5d0cebe09c528e7d
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_pycurl_errors.py _pycurl_errors.py-20060714003436-4zste49ltg697ft9-1
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/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/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
doc/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py* setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
tools/win32/start_bzr.bat start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2052.1.520
revision-id: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: andrew.bennetts at canonical.com-20070703041219-4zsjgrup4k6sdlzk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 06:24:58 +0100
message:
(Andrew Bennetts, Aaron Bentley) Add container format as described in doc/developers/container-format.txt
------------------------------------------------------------
revno: 2052.1.454.2.12
revision-id: andrew.bennetts at canonical.com-20070703041219-4zsjgrup4k6sdlzk
parent: andrew.bennetts at canonical.com-20070703040601-62bbp6gt9ivf3vja
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:12:19 +1000
message:
Update docstring for Aaron's changes.
------------------------------------------------------------
revno: 2052.1.454.2.11
revision-id: andrew.bennetts at canonical.com-20070703040601-62bbp6gt9ivf3vja
parent: andrew.bennetts at canonical.com-20070703040508-11q9cdef4og1qry8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:06:01 +1000
message:
Keep container-format.txt up to date with changes to the code.
------------------------------------------------------------
revno: 2052.1.454.2.10
revision-id: andrew.bennetts at canonical.com-20070703040508-11q9cdef4og1qry8
parent: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:05:08 +1000
message:
Add '(introduced in 0.18)' to pack format string.
------------------------------------------------------------
revno: 2052.1.454.2.9
revision-id: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
parent: abentley at panoramicfeedback.com-20070628165006-m7bd56ngqs26rd91
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: container-format
timestamp: Thu 2007-06-28 13:13:06 -0400
message:
Use file-like objects as container input, not callables
------------------------------------------------------------
revno: 2052.1.454.2.8
revision-id: abentley at panoramicfeedback.com-20070628165006-m7bd56ngqs26rd91
parent: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: container-format
timestamp: Thu 2007-06-28 12:50:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.454.2.7
revision-id: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
parent: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
parent: andrew.bennetts at canonical.com-20070614125513-nua0p6bw9cw3jeaq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 23:28:02 +1000
message:
Change read/iter_records to return a callable, add more validation, and
improve docstrings.
------------------------------------------------------------
revno: 2052.1.454.2.6.1.2
revision-id: andrew.bennetts at canonical.com-20070614125513-nua0p6bw9cw3jeaq
parent: andrew.bennetts at canonical.com-20070614112338-6u3900u6nkag66u8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 22:55:13 +1000
message:
Docstring improvements.
------------------------------------------------------------
revno: 2052.1.454.2.6.1.1
revision-id: andrew.bennetts at canonical.com-20070614112338-6u3900u6nkag66u8
parent: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 21:23:38 +1000
message:
Return a callable instead of a str from read, and add more validation.
------------------------------------------------------------
revno: 2052.1.454.2.6
revision-id: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
parent: andrew.bennetts at canonical.com-20070614022816-ne4h4qk0j50x6n26
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 15:52:45 +1000
message:
Add validate method to ContainerReader and BytesRecordReader.
------------------------------------------------------------
revno: 2052.1.454.2.5
revision-id: andrew.bennetts at canonical.com-20070614022816-ne4h4qk0j50x6n26
parent: andrew.bennetts at canonical.com-20070614015707-hncvkzg0mn4w0w31
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 12:28:16 +1000
message:
Update format marker in container-format.txt to be in sync with the code.
------------------------------------------------------------
revno: 2052.1.454.2.4
revision-id: andrew.bennetts at canonical.com-20070614015707-hncvkzg0mn4w0w31
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
parent: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 11:57:07 +1000
message:
Some small improvements to the pack format, and also merge in bzr.dev.
------------------------------------------------------------
revno: 2052.1.454.2.3.1.4
revision-id: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
parent: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:56:02 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2052.1.454.2.3.1.3
revision-id: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:54:46 +1000
message:
Change format marker to use the word 'Bazaar' rather than 'bzr'.
------------------------------------------------------------
revno: 2052.1.454.2.3.1.2
revision-id: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
parent: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:53:12 +1000
message:
Raise InvalidRecordError on invalid names.
------------------------------------------------------------
revno: 2052.1.454.2.3.1.1
revision-id: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 17:58:35 +1000
message:
Remove duplicate definition of ContainerWriter.
------------------------------------------------------------
revno: 2052.1.454.2.3
revision-id: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
parent: andrew.bennetts at canonical.com-20070611072208-9p73cf5vcu7zh0ys
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Tue 2007-06-12 11:56:39 +1000
message:
Fix docstring markup, remove obsolete comment.
------------------------------------------------------------
revno: 2052.1.454.2.2.1.1
revision-id: andrew.bennetts at canonical.com-20070611072208-9p73cf5vcu7zh0ys
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Mon 2007-06-11 17:22:08 +1000
message:
Fix docstring markup, remove obsolete comment.
------------------------------------------------------------
revno: 2052.1.454.2.2
revision-id: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
parent: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
parent: andrew.bennetts at canonical.com-20070609034525-j9d7i5dlk6ou97eb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Sat 2007-06-09 13:48:20 +1000
message:
More improvements, especially in error handling.
------------------------------------------------------------
revno: 2052.1.454.2.1.1.3
revision-id: andrew.bennetts at canonical.com-20070609034525-j9d7i5dlk6ou97eb
parent: andrew.bennetts at canonical.com-20070608064547-vzhyegqx2vl6pni3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Sat 2007-06-09 13:45:25 +1000
message:
Deal with EOF in the middle of a bytes record.
------------------------------------------------------------
revno: 2052.1.454.2.1.1.2
revision-id: andrew.bennetts at canonical.com-20070608064547-vzhyegqx2vl6pni3
parent: andrew.bennetts at canonical.com-20070608063359-s5ps81a8i85w7by0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 16:45:47 +1000
message:
Test docstring tweaks, inspired by looking over the output of jml's testdoc tool.
------------------------------------------------------------
revno: 2052.1.454.2.1.1.1
revision-id: andrew.bennetts at canonical.com-20070608063359-s5ps81a8i85w7by0
parent: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 16:33:59 +1000
message:
More progress:
* Rename container.py to pack.py
* Refactor bytes record reading into a separate class for ease of unit testing.
* Start handling error conditions such as invalid content lengths in byte
records.
------------------------------------------------------------
revno: 2052.1.454.2.1
revision-id: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 02:09:34 +1000
message:
Start implementing container format reading and writing.
------------------------------------------------------------
revno: 2052.1.519
revision-id: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
parent: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 19:36:15 +0100
message:
(John Arbash Meinel) A couple small updates for pushing over ftp.
------------------------------------------------------------
revno: 2052.1.518.1.1
revision-id: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 12:35:53 -0500
message:
(John Arbash Meinel) A couple small updates for pushing over ftp.
------------------------------------------------------------
revno: 2052.1.518
revision-id: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
parent: pqm at pqm.ubuntu.com-20070702153926-23pkgktuxy6sahxr
parent: john at arbash-meinel.com-20070702150118-ypa1als5c0dx61ll
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 17:27:43 +0100
message:
(Kent Gibson) 'bzr log --verbose' shows deltas for merged revisions.
------------------------------------------------------------
revno: 2052.1.516.1.2
revision-id: john at arbash-meinel.com-20070702150118-ypa1als5c0dx61ll
parent: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
parent: warthog618 at gmail.com-20070619134630-c72ge100z6nmy21l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 10:01:18 -0500
message:
(Kent Gibson) 'bzr log --verbose' shows deltas for merged revisions.
------------------------------------------------------------
revno: 2052.1.414.8.1.2.2
revision-id: warthog618 at gmail.com-20070619134630-c72ge100z6nmy21l
parent: warthog618 at gmail.com-20070502110246-05zkgmrv5vm807ms
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: merge_deltas
timestamp: Tue 2007-06-19 21:46:30 +0800
message:
Add tests for deltas in merge revisions
------------------------------------------------------------
revno: 2052.1.414.8.1.2.1
revision-id: warthog618 at gmail.com-20070502110246-05zkgmrv5vm807ms
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: merge_deltas
timestamp: Wed 2007-05-02 19:02:46 +0800
message:
Long log format reports deltas on merge revisions.
------------------------------------------------------------
revno: 2052.1.517
revision-id: pqm at pqm.ubuntu.com-20070702153926-23pkgktuxy6sahxr
parent: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
parent: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 16:39:26 +0100
message:
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
------------------------------------------------------------
revno: 2052.1.516.1.1
revision-id: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
parent: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 09:24:27 -0500
message:
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
------------------------------------------------------------
revno: 2052.1.516
revision-id: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
parent: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
parent: robertc at robertcollins.net-20070702061147-rmouxo51qwz7rkns
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 08:06:39 +0100
message:
(robertc) Reduce duplication in interface based testing by extracting a new class TestScenarioApplier.
------------------------------------------------------------
revno: 2052.1.501.2.14
revision-id: robertc at robertcollins.net-20070702061147-rmouxo51qwz7rkns
parent: robertc at robertcollins.net-20070702055355-82gailz4yex9gpw4
parent: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 16:11:47 +1000
message:
Merge with bzr.dev.
------------------------------------------------------------
revno: 2052.1.501.2.13
revision-id: robertc at robertcollins.net-20070702055355-82gailz4yex9gpw4
parent: robertc at robertcollins.net-20070702052625-motr7ljwhmqvw9rg
parent: robertc at robertcollins.net-20070702055259-eoyl4u4nfml4kdez
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:53:55 +1000
message:
Remove unneeded inner function in adapt_test_to_scenario.
------------------------------------------------------------
revno: 2052.1.501.2.11.1.1
revision-id: robertc at robertcollins.net-20070702055259-eoyl4u4nfml4kdez
parent: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Mon 2007-07-02 15:52:59 +1000
message:
Remove unneeded inner function in adapt_test_to_scenario.
------------------------------------------------------------
revno: 2052.1.501.2.12
revision-id: robertc at robertcollins.net-20070702052625-motr7ljwhmqvw9rg
parent: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:26:25 +1000
message:
Merge with bzr.dev.
------------------------------------------------------------
revno: 2052.1.501.2.11
revision-id: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
parent: robertc at robertcollins.net-20070628071528-muyk19rxv7z8dhiy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Mon 2007-07-02 15:24:25 +1000
message:
Document repository_to_test_repository for testing.
------------------------------------------------------------
revno: 2052.1.501.2.10
revision-id: robertc at robertcollins.net-20070628071528-muyk19rxv7z8dhiy
parent: robertc at robertcollins.net-20070628064436-lyl4ygrlwe7xup2h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 17:15:28 +1000
message:
And overhaul WorkingTreeTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.9
revision-id: robertc at robertcollins.net-20070628064436-lyl4ygrlwe7xup2h
parent: robertc at robertcollins.net-20070628061619-mds81zx3hw1dpeqm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:44:36 +1000
message:
And overhaul RevisionStoreTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.8
revision-id: robertc at robertcollins.net-20070628061619-mds81zx3hw1dpeqm
parent: robertc at robertcollins.net-20070628060118-wpuciqx1xrjesces
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:16:19 +1000
message:
And overhaul InterVersionedFileTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.7
revision-id: robertc at robertcollins.net-20070628060118-wpuciqx1xrjesces
parent: robertc at robertcollins.net-20070628051904-mjbhgq3n8dw3m8jg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:01:18 +1000
message:
And overhaul BzrDirTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.6
revision-id: robertc at robertcollins.net-20070628051904-mjbhgq3n8dw3m8jg
parent: robertc at robertcollins.net-20070628045744-v8b44ng9lmh5azyj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 15:19:04 +1000
message:
And overhaul BranchTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.5
revision-id: robertc at robertcollins.net-20070628045744-v8b44ng9lmh5azyj
parent: robertc at robertcollins.net-20070628042515-7uktaa31hsky2nw8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 14:57:44 +1000
message:
And overhaul TransportTestProviderAdapter too.
------------------------------------------------------------
revno: 2052.1.501.2.4
revision-id: robertc at robertcollins.net-20070628042515-7uktaa31hsky2nw8
parent: robertc at robertcollins.net-20070628011643-ns42kcef2ymfxu28
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 14:25:15 +1000
message:
Treat InterRepositoryTestProviderAdapter like RepositoryTestProviderAdapter
------------------------------------------------------------
revno: 2052.1.501.2.3
revision-id: robertc at robertcollins.net-20070628011643-ns42kcef2ymfxu28
parent: robertc at robertcollins.net-20070627222709-tqtod0gjk3xj5p6w
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 11:16:43 +1000
message:
Split out the common test scenario support from the repository implementation specific code.
------------------------------------------------------------
revno: 2052.1.501.2.2
revision-id: robertc at robertcollins.net-20070627222709-tqtod0gjk3xj5p6w
parent: robertc at robertcollins.net-20070627074138-2as9koyepbawsm8n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 08:27:09 +1000
message:
Move RepositoryTestProviderAdapter into the tests part of the code base.
------------------------------------------------------------
revno: 2052.1.501.2.1
revision-id: robertc at robertcollins.net-20070627074138-2as9koyepbawsm8n
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Wed 2007-06-27 17:41:38 +1000
message:
Overhaul RepositoryTestAdapter to be cleaner and more modular.
------------------------------------------------------------
revno: 2052.1.515
revision-id: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
parent: mbp at sourcefrog.net-20070702052407-z66ymyo539uuvp1k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 07:08:12 +0100
message:
Improved phrasing in version output
------------------------------------------------------------
revno: 2052.1.514.1.2
revision-id: mbp at sourcefrog.net-20070702052407-z66ymyo539uuvp1k
parent: mbp at sourcefrog.net-20070702044841-bhqv1470tepruga0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-07-02 15:24:07 +1000
message:
Improved phrasing in version output
------------------------------------------------------------
revno: 2052.1.514.1.1
revision-id: mbp at sourcefrog.net-20070702044841-bhqv1470tepruga0
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-07-02 14:48:41 +1000
message:
Show bzr.log location in bzr --version output.
------------------------------------------------------------
revno: 2052.1.514
revision-id: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
parent: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 16:01:44 +0100
message:
(John Arbash Meinel) Improve 'make api-docs' output.
------------------------------------------------------------
revno: 2052.1.347.1.17
revision-id: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
parent: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-06-28 18:18:09 -0500
message:
[merge] bzr.dev 2562
------------------------------------------------------------
revno: 2052.1.347.1.16
revision-id: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Sat 2007-04-28 10:04:17 -0500
message:
[merge] bzr.dev 2466
------------------------------------------------------------
revno: 2052.1.347.1.15
revision-id: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 16:33:07 -0500
message:
[merge] api-doc-builder and remove the pydoctor build code for now.
------------------------------------------------------------
revno: 2052.1.347.1.14
revision-id: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 15:36:40 -0500
message:
[merge] bzr.dev 2413
------------------------------------------------------------
revno: 2052.1.347.1.13
revision-id: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:45:51 -0500
message:
Remove BRANCH.TODO info, now that we have make check-api-doc
------------------------------------------------------------
revno: 2052.1.347.1.12
revision-id: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
parent: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:32:10 -0500
message:
Add make check-api-docs, which runs epydoc --check, rather than generating output
------------------------------------------------------------
revno: 2052.1.347.1.11
revision-id: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
parent: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:02:36 -0500
message:
Update lazy_import with tests for the new '_should_proxy' variable.
------------------------------------------------------------
revno: 2052.1.347.1.10
revision-id: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
parent: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 13:45:51 -0500
message:
fix assertRaises to use the right parameter...
------------------------------------------------------------
revno: 2052.1.347.1.9
revision-id: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
parent: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 12:49:10 -0500
message:
Since I have epydoc working with lazy imports, make it the default api doc generator.
Also, update Makefile to make it easier to just document one file.
------------------------------------------------------------
revno: 2052.1.347.1.8
revision-id: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
parent: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 18:19:39 -0500
message:
Change lazy_import to allow proxying when necessary.
Write a monkey-patch for epydoc.uid.ObjectUID so that it can understand
a lazy_import object.
With the monkey-patch in place, epydoc seems to be able to process bzrlib.
Now we still need to fix the errors. :)
------------------------------------------------------------
revno: 2052.1.347.1.7
revision-id: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
parent: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 17:11:22 -0500
message:
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string.
------------------------------------------------------------
revno: 2052.1.347.1.6
revision-id: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
parent: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:21:32 -0500
message:
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain.
------------------------------------------------------------
revno: 2052.1.347.1.5
revision-id: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
parent: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:06:31 -0500
message:
Clean up add.py documentation.
Add doc strings for undocumented functions.
Move documentation to the right location for 'smart_add_tree'
Fix rst documentation (the lines need to be indented for each parameter)
------------------------------------------------------------
revno: 2052.1.347.1.4
revision-id: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
parent: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:04:37 -0500
message:
Add command line invocations for epydoc and pydoctor to generate docs
for a single file.
------------------------------------------------------------
revno: 2052.1.347.1.3
revision-id: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
parent: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:36:09 -0500
message:
Add a list of documentation failures
------------------------------------------------------------
revno: 2052.1.347.1.2
revision-id: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
parent: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:35:46 -0500
message:
Add url to bazaar project page in docs
------------------------------------------------------------
revno: 2052.1.347.1.1
revision-id: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
parent: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:25:47 -0500
message:
Update Makefile to add 'make api-docs' using pydoctor
------------------------------------------------------------
revno: 2052.1.513
revision-id: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 07:07:00 +0100
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2052.1.512.1.1
revision-id: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-06-29 15:34:31 +1000
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2052.1.512
revision-id: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 01:00:00 +0100
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2052.1.511.1.1
revision-id: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 18:31:34 -0500
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2052.1.509.2.2
revision-id: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
parent: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 21:50:14 +0100
message:
Fix up with comments from Aaron.
------------------------------------------------------------
revno: 2052.1.509.2.1
revision-id: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 20:11:00 +0100
message:
Display a useful error message when annotating a non-existant file (#122656)
------------------------------------------------------------
revno: 2052.1.511
revision-id: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 23:53:35 +0100
message:
(James Westby) Fix TreeConfig to correctly return options from a section
------------------------------------------------------------
revno: 2052.1.510.1.2
revision-id: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
parent: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:22:53 -0500
message:
Clean up whitespace
------------------------------------------------------------
revno: 2052.1.510.1.1
revision-id: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:18:41 -0500
message:
[merge] James Westby's Fix for TreeConfig returning values from subsections.
------------------------------------------------------------
revno: 2052.1.481.1.1
revision-id: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-18 21:39:06 +0100
message:
Fix TreeConfig to return values from sections.
* TreeConfig would mistakenly search the top level when asked for options
from a section. This patch makes it respect the section argument and only
search the specified section.
* It also adds some more tests, explicity testing the behavior for
both keys that are present and absent in both sections and the top level,
keys that are present in both, default values, and missing sections.
------------------------------------------------------------
revno: 2052.1.510
revision-id: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 20:44:10 +0100
message:
Add a test for check_inventory_shape and fix tests (James Westby)
------------------------------------------------------------
revno: 2052.1.509.1.2
revision-id: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
parent: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:53:24 -0400
message:
Fix indenting in TestCheckInventoryShape
------------------------------------------------------------
revno: 2052.1.509.1.1
revision-id: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:52:13 -0400
message:
Merge check_shape fixes
------------------------------------------------------------
revno: 2052.1.493.3.2
revision-id: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
parent: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-25 21:05:06 +0100
message:
Add a test for check_inventory_shape.
Also fix up the tests that relied on the buggy behaviour.
------------------------------------------------------------
revno: 2052.1.493.3.1
revision-id: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Sun 2007-06-24 22:13:07 +0100
message:
Fix detection of directory entries in the inventory.
check_inventory_shape allows you to check that an inventory entry is a
directory by ending it in a '/'. However the code to add the '/' to the
entries for comparison uses the kind == 'dir' to detect directories, when
the key is 'directory'.
------------------------------------------------------------
revno: 2052.1.509
revision-id: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 09:29:03 +0100
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2052.1.508.1.3
revision-id: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
parent: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 18:00:25 +1000
message:
Allow 'from debug import debug_flags'
------------------------------------------------------------
revno: 2052.1.508.1.2
revision-id: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
parent: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:50:53 +1000
message:
Remember NEWS
------------------------------------------------------------
revno: 2052.1.508.1.1
revision-id: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:48:23 +1000
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2052.1.508
revision-id: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 08:08:27 +0100
message:
(robertc) Show the names of commit hooks during commit.
------------------------------------------------------------
revno: 2052.1.501.1.3
revision-id: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
parent: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-06-28 16:32:03 +1000
message:
Increase docs in response to review feedback.
------------------------------------------------------------
revno: 2052.1.501.1.2
revision-id: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
parent: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:21:59 +1000
message:
Show hook names during commit.
------------------------------------------------------------
revno: 2052.1.501.1.1
revision-id: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:08:53 +1000
message:
Give Hooks names.
------------------------------------------------------------
revno: 2052.1.507
revision-id: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 06:18:30 +0100
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2052.1.505.1.1
revision-id: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-06-28 14:39:55 +1000
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2052.1.506
revision-id: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 05:44:59 +0100
message:
(robertc) Document contributing to the performance effort and improve the roadmap dependency .png. (Robert Collins, Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.489.2.6
revision-id: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
parent: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:51 +1000
message:
Fix gc graph linkage.
------------------------------------------------------------
revno: 2052.1.489.2.5
revision-id: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
parent: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:03 +1000
message:
Merge Vila's performance.dot tweaks.
------------------------------------------------------------
revno: 2052.1.504.1.1
revision-id: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: perfs
timestamp: Wed 2007-06-27 09:47:36 +0200
message:
Minor cleanup.
* doc/developers/performance.dot:
Use LR rankdir makes the graph easier to read.
* Makefile:
(doc/developers/performance.png): Add echo.
------------------------------------------------------------
revno: 2052.1.489.2.4
revision-id: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:51:22 +1000
message:
Merge more of bzr.dev.
------------------------------------------------------------
revno: 2052.1.489.2.3
revision-id: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:48:12 +1000
message:
Add GC to the performance.dot file and correct a bug in the performance-roadmap doc file.
------------------------------------------------------------
revno: 2052.1.489.2.2
revision-id: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
parent: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:43:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2052.1.489.2.1
revision-id: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-21 16:41:07 +1000
message:
Document contributing to the performance drive somewhat.
------------------------------------------------------------
revno: 2052.1.505
revision-id: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 09:07:23 +0100
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2052.1.503.2.1
revision-id: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: knit-index-reader
timestamp: Wed 2007-06-27 17:37:53 +1000
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2052.1.504
revision-id: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
parent: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 06:12:57 +0100
message:
Remove use of 'assert False' to raise an exception unconditionally
------------------------------------------------------------
revno: 2052.1.503.1.1
revision-id: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-06-27 14:33:04 +1000
message:
Remove use of 'assert False' to raise an exception unconditionally
------------------------------------------------------------
revno: 2052.1.503
revision-id: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
parent: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 03:30:32 +0100
message:
Cleanup blackbox tests
------------------------------------------------------------
revno: 2052.1.478.3.7
revision-id: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
parent: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-06-27 11:43:03 +1000
message:
merge trunk
------------------------------------------------------------
revno: 2052.1.478.3.6
revision-id: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
parent: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:15:29 +1000
message:
Remove BzrTestBase alias (little used)
------------------------------------------------------------
revno: 2052.1.478.3.5
revision-id: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
parent: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:14:27 +1000
message:
NEWS on run_bzr changes
------------------------------------------------------------
revno: 2052.1.478.3.4
revision-id: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
parent: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:12:33 +1000
message:
Deprecate run_bzr_captured in favour of just run_bzr
------------------------------------------------------------
revno: 2052.1.478.3.3
revision-id: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
parent: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 19:35:07 +1000
message:
Clean up some callers that use varargs syntax for run_bzr, but don't
deprecate it yet because it's too widely used.
Separate out _run_bzr_core from _run_bzr_autosplit.
Remove long-deprecated TestCase.merge helper.
------------------------------------------------------------
revno: 2052.1.478.3.2
revision-id: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
parent: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 18:46:23 +1000
message:
Refactoring run_bzr code into more of a common base.
------------------------------------------------------------
revno: 2052.1.478.3.1
revision-id: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 18:02:36 +1000
message:
Cleanup old variations on run_bzr in the test suite
------------------------------------------------------------
revno: 2052.1.502
revision-id: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 00:43:09 +0100
message:
(robertc) Export explicit API compatibility for bzrlib.
------------------------------------------------------------
revno: 2052.1.498.2.5
revision-id: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
parent: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Wed 2007-06-27 08:46:43 +1000
message:
NEWS entry was incorrectly capitalised.
------------------------------------------------------------
revno: 2052.1.498.2.4
revision-id: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
parent: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:53:41 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2052.1.498.2.3
revision-id: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
parent: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:52:20 +1000
message:
Add require_api API.
------------------------------------------------------------
revno: 2052.1.498.2.2
revision-id: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
parent: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:27:24 +1000
message:
Add helpers to get api versions from objects.
------------------------------------------------------------
revno: 2052.1.498.2.1
revision-id: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 16:57:20 +1000
message:
API Versioning proposal document.
------------------------------------------------------------
revno: 2052.1.501
revision-id: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 20:10:00 +0100
message:
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
------------------------------------------------------------
revno: 2052.1.500.1.1
revision-id: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-06-26 09:10:56 -0500
message:
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
------------------------------------------------------------
revno: 2052.1.478.2.1
revision-id: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.merge_directive_exact_encoding
timestamp: Sun 2007-06-17 17:11:04 +0100
message:
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
------------------------------------------------------------
revno: 2052.1.500
revision-id: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
parent: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 07:17:22 +0100
message:
Refactor of commit to walk the working inventory less
------------------------------------------------------------
revno: 2052.1.498.1.1
revision-id: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-06-26 14:37:39 +1000
message:
Refactor of commit to walk the working inventory less
------------------------------------------------------------
revno: 2052.1.489.1.1
revision-id: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Thu 2007-06-21 10:16:13 +1000
message:
Refactor commit.commit() to walk the working inventory once/less
------------------------------------------------------------
revno: 2052.1.499
revision-id: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 05:55:33 +0100
message:
(mbp) design notes for commit and uncommit
------------------------------------------------------------
revno: 2052.1.461.1.7
revision-id: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
parent: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2007-06-26 14:15:04 +1000
message:
fix another broken doc link
------------------------------------------------------------
revno: 2052.1.461.1.6
revision-id: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
parent: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2007-06-26 13:20:49 +1000
message:
Remove broken link to status design document
------------------------------------------------------------
revno: 2052.1.461.1.5
revision-id: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
parent: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 17:44:24 +1000
message:
More analysis of commit
------------------------------------------------------------
revno: 2052.1.461.1.4
revision-id: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
parent: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 15:41:43 +1000
message:
More commit documentation
------------------------------------------------------------
revno: 2052.1.461.1.3
revision-id: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
parent: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 14:27:47 +1000
message:
More commit specs
------------------------------------------------------------
revno: 2052.1.461.1.2
revision-id: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
parent: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-18 16:54:24 +1000
message:
Remove duplicated commit use case documentation
------------------------------------------------------------
revno: 2052.1.461.1.1
revision-id: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-18 12:04:20 +1000
message:
(in progress) analysis of commit
------------------------------------------------------------
revno: 2052.1.498
revision-id: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
parent: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 18:46:47 +0100
message:
(Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
------------------------------------------------------------
revno: 2052.1.495.2.1
revision-id: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-06-25 11:59:06 -0500
message:
(Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
------------------------------------------------------------
revno: 2052.1.493.2.2
revision-id: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
parent: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 121889
timestamp: Sun 2007-06-24 17:23:56 +0200
message:
Update NEWS.
------------------------------------------------------------
revno: 2052.1.493.2.1
revision-id: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 121889
timestamp: Sun 2007-06-24 17:16:40 +0200
message:
Fix 121889 by working around urllib2 bug.
* tests/HTTPTestUtil.py:
(DigestAuthRequestHandler.send_header_auth_reqed): python-2.4.1
fail to decode the header without the quotes. The RFC do not
require them, python >= 2.4.4 handles them gracefully. Not a big
deal.
* tests/test_http.py:
(TestAuth.setUp): Add a comment in hope I will not running around
shouting: "Who takes my traces ? Gimme my traces !" when running
the only tests who capture their own traces without showing them.
* transport/http/_urllib2_wrappers.py (BasicAuthHandler,
DigestAuthHandler): Not directly related to the bug, bug good to
fix anyway, the digest auth should be preferred to the basic
one. To do so, the digest handler should be tried before the basic
one.
* builtins.py:
(cmd_selftest.run): Fix typo. Note to reviewers: No, it's not
related to the bug. No there are no tests for that. No I don't
intend to write some :) But I'll understand if you veto that
because you want to take care of it :D
------------------------------------------------------------
revno: 2052.1.497
revision-id: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
parent: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 16:19:32 +0100
message:
Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
------------------------------------------------------------
revno: 2052.1.496.1.1
revision-id: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-06-25 10:27:08 -0400
message:
Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
------------------------------------------------------------
revno: 2052.1.496
revision-id: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 14:46:10 +0100
message:
Add SMTPConnection class (Adeodato Simó)
------------------------------------------------------------
revno: 2052.1.495.1.1
revision-id: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-06-25 09:17:32 -0400
message:
Add SMTPConnection class (Adeodato Simó)
------------------------------------------------------------
revno: 2052.1.483.2.5
revision-id: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
parent: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Sat 2007-06-23 02:11:51 +0100
message:
Fix copyright statement not to contain "by".
------------------------------------------------------------
revno: 2052.1.483.2.4
revision-id: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
parent: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Wed 2007-06-20 01:39:33 +0100
message:
Don't use BzrCommandError in non-UI code; create and use an SMTPError
exception instead.
------------------------------------------------------------
revno: 2052.1.483.2.3
revision-id: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
parent: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Wed 2007-06-20 01:22:45 +0100
message:
Import full email.Utils module instead of individual functions, as per
Aaron's review.
------------------------------------------------------------
revno: 2052.1.483.2.2
revision-id: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
parent: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Tue 2007-06-19 21:15:17 +0100
message:
Swap the order of internal_error and _fmt for consistency.
------------------------------------------------------------
revno: 2052.1.483.2.1
revision-id: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Tue 2007-06-19 17:11:26 +0100
message:
New SMTPConnection class, a reduced version of that in bzr-email.
------------------------------------------------------------
revno: 2052.1.495
revision-id: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
parent: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 10:23:03 +0100
message:
(robertc) Relocate TestCaseWithRepository to be more central.
------------------------------------------------------------
revno: 2052.1.433.7.2
revision-id: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
parent: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Fri 2007-06-22 15:05:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2052.1.433.7.1
revision-id: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Fri 2007-05-11 00:11:22 +1000
message:
Relocate TestCaseWithRepository to be more central.
------------------------------------------------------------
revno: 2052.1.494
revision-id: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
parent: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 08:27:10 +0100
message:
(trivial,mbp) doc updates
------------------------------------------------------------
revno: 2052.1.493.1.2
revision-id: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
parent: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-25 16:22:27 +1000
message:
Explain where to get lsprof (John, Alexander)
------------------------------------------------------------
revno: 2052.1.493.1.1
revision-id: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-25 15:12:57 +1000
message:
Fix typo and remove version number from README
------------------------------------------------------------
revno: 2052.1.493
revision-id: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
parent: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-22 17:08:25 +0100
message:
Note lsprof filename via trace.note, not stdout
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.33
revision-id: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
parent: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:27:19 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.32
revision-id: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
parent: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:25:25 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.31
revision-id: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
parent: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:22:45 -0400
message:
Add check for LSProf
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.30
revision-id: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
parent: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-06-21 23:28:23 -0400
message:
Write lsprof file name to stderr, not stdout
------------------------------------------------------------
revno: 2052.1.492
revision-id: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
parent: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 08:05:42 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.438.2.35
revision-id: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
parent: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-06-21 02:39:27 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.438.2.34
revision-id: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-06-21 02:32:06 -0400
message:
Update NEWS and change implementation to return an iterator
------------------------------------------------------------
revno: 2052.1.491
revision-id: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
parent: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
parent: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 06:56:51 +0100
message:
(robertc) Create a document describing bundles and their motivation.
------------------------------------------------------------
revno: 2052.1.482.1.1
revision-id: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bundle
timestamp: Thu 2007-06-21 13:06:32 +1000
message:
Create a document describing bundles and their motivation.
------------------------------------------------------------
revno: 2052.1.490
revision-id: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 06:22:37 +0100
message:
Avoid topological sorting in Repository.get_ancestry where possible
------------------------------------------------------------
revno: 2052.1.438.2.33
revision-id: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
parent: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 23:29:39 -0400
message:
Disable topological sorting of get_ancestry where sensible
------------------------------------------------------------
revno: 2052.1.438.2.32
revision-id: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
parent: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
parent: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 22:33:43 -0400
message:
Merge of not-sorting-ancestry branch
------------------------------------------------------------
revno: 2052.1.478.1.1
revision-id: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: get_ancestry_no_topo
timestamp: Sun 2007-06-17 13:07:04 -0400
message:
Make topological sorting optional for get_ancestry
------------------------------------------------------------
revno: 2052.1.438.2.31
revision-id: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
parent: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 21:58:29 -0400
message:
Fix iter_topo_order to permit un-included parents
------------------------------------------------------------
revno: 2052.1.438.2.30
revision-id: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
parent: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 21:12:19 -0400
message:
Add functionality for tsorting graphs
------------------------------------------------------------
revno: 2052.1.489
revision-id: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
parent: dato at net.com.org.es-20070620184523-mvaxuzuscq0mc0ua
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 21:55:07 +0100
message:
BzrBadParameter is an internal error.
------------------------------------------------------------
revno: 2052.1.488.1.1
revision-id: dato at net.com.org.es-20070620184523-mvaxuzuscq0mc0ua
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.bad_parameter_internal_error
timestamp: Wed 2007-06-20 19:45:23 +0100
message:
BzrBadParameter is an internal error.
------------------------------------------------------------
revno: 2052.1.488
revision-id: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
parent: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: ian.clatworthy at internode.on.net-20070620084028-ro8ibkz1xb2gynt9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 10:21:41 +0100
message:
Better progress reporting in commit
------------------------------------------------------------
revno: 2052.1.487.1.1
revision-id: ian.clatworthy at internode.on.net-20070620084028-ro8ibkz1xb2gynt9
parent: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: ian.clatworthy at internode.on.net-20070620033232-eod2sjmf2ath8ya3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2007-06-20 18:40:28 +1000
message:
Better progress reporting in commit
------------------------------------------------------------
revno: 2052.1.479.1.3
revision-id: ian.clatworthy at internode.on.net-20070620033232-eod2sjmf2ath8ya3
parent: ian.clatworthy at internode.on.net-20070619072624-73nm1uw3lu6jx4ko
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-better-progress
timestamp: Wed 2007-06-20 13:32:32 +1000
message:
Fix whitespace and improve tests to cover actual progress messages
------------------------------------------------------------
revno: 2052.1.479.1.2
revision-id: ian.clatworthy at internode.on.net-20070619072624-73nm1uw3lu6jx4ko
parent: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-better-progress
timestamp: Tue 2007-06-19 17:26:24 +1000
message:
Improved progress reporting for commit
------------------------------------------------------------
revno: 2052.1.487
revision-id: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: pqm at pqm.ubuntu.com-20070620002213-fvt1s1yu2iujulio
parent: robertc at robertcollins.net-20070620030958-6ou886tyo5zpc3u4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 04:37:26 +0100
message:
(robertc) Propose integration ordering for the performance changes.
------------------------------------------------------------
revno: 2052.1.470.3.3
revision-id: robertc at robertcollins.net-20070620030958-6ou886tyo5zpc3u4
parent: robertc at robertcollins.net-20070619005518-r2n8pmtgnf9lq9yo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-06-20 13:09:58 +1000
message:
Handle dot not being installed
------------------------------------------------------------
revno: 2052.1.470.3.2
revision-id: robertc at robertcollins.net-20070619005518-r2n8pmtgnf9lq9yo
parent: robertc at robertcollins.net-20070619004822-wsop5g2arwu1lti4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-06-19 10:55:18 +1000
message:
Make gdfo cache under discussion in the graph
------------------------------------------------------------
revno: 2052.1.470.3.1
revision-id: robertc at robertcollins.net-20070619004822-wsop5g2arwu1lti4
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-06-19 10:48:22 +1000
message:
Draft proposed integration order for performance changes.
------------------------------------------------------------
revno: 2052.1.486
revision-id: pqm at pqm.ubuntu.com-20070620002213-fvt1s1yu2iujulio
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: aaron.bentley at utoronto.ca-20070619232722-4e3qyb29y1htltef
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 01:22:13 +0100
message:
Fix documentation of BzrError (Simó)
------------------------------------------------------------
revno: 2052.1.485.1.1
revision-id: aaron.bentley at utoronto.ca-20070619232722-4e3qyb29y1htltef
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: dato at net.com.org.es-20070619152034-swymq71ibtadlvxb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Tue 2007-06-19 19:27:22 -0400
message:
Fix documentation of BzrError (Simó)
------------------------------------------------------------
revno: 2052.1.483.1.1
revision-id: dato at net.com.org.es-20070619152034-swymq71ibtadlvxb
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.fix_internal_error_comment
timestamp: Tue 2007-06-19 16:20:34 +0100
message:
Fix BzrError docstring: internal_error defaults to False, not to True.
------------------------------------------------------------
revno: 2052.1.485
revision-id: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: pqm at pqm.ubuntu.com-20070619194321-g3qy7rh361kdvstd
parent: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 22:22:56 +0100
message:
[MERGE] handle null revision properly for LCA
------------------------------------------------------------
revno: 2052.1.438.2.29
revision-id: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
parent: abentley at panoramicfeedback.com-20070619144906-zx160g6h377j729h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Tue 2007-06-19 10:51:32 -0400
message:
Make parents provider private
------------------------------------------------------------
revno: 2052.1.438.2.28
revision-id: abentley at panoramicfeedback.com-20070619144906-zx160g6h377j729h
parent: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Tue 2007-06-19 10:49:06 -0400
message:
Fix handling of null revision
------------------------------------------------------------
revno: 2052.1.484
revision-id: pqm at pqm.ubuntu.com-20070619194321-g3qy7rh361kdvstd
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
parent: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 20:43:21 +0100
message:
Make merge directives robust against broken bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.29
revision-id: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
parent: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-19 01:20:15 -0400
message:
Make merge directives robust against broken bundles
------------------------------------------------------------
revno: 2052.1.483
revision-id: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 03:45:33 +0100
message:
Merge the 0.17 fixes back into bzr.dev
------------------------------------------------------------
revno: 2052.1.479.1.1
revision-id: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
parent: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Tue 2007-06-19 10:26:28 +1000
message:
Merge the 0.17 fixes back into bzr.dev
------------------------------------------------------------
revno: 2052.1.470.2.4
revision-id: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
parent: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 14:17:06 +1000
message:
(Ian Clatworthy) Release 0.17
------------------------------------------------------------
revno: 2052.1.470.2.3
revision-id: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
parent: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 12:25:13 +1000
message:
Revert logging just to stderr in commit as broke unicode filenames (#120930)
------------------------------------------------------------
revno: 2052.1.470.2.2
revision-id: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
parent: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 11:56:32 +1000
message:
Apply Colin Watson's patch fixing 120647
------------------------------------------------------------
revno: 2052.1.470.2.1
revision-id: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.17
timestamp: Tue 2007-06-12 07:36:54 +0100
message:
(Ian Clatworthy) Release 0.17rc1
------------------------------------------------------------
revno: 2052.1.469.2.1
revision-id: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Tue 2007-06-12 12:48:29 +1000
message:
(Ian Clatworthy) Release 0.17rc1
------------------------------------------------------------
revno: 2052.1.482
revision-id: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
parent: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 22:07:10 +0100
message:
Better merge base selection and graph API
------------------------------------------------------------
revno: 2052.1.438.2.27
revision-id: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
parent: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:10:35 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.438.2.26
revision-id: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
parent: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:04:16 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.438.2.25
revision-id: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:02:18 -0400
message:
Update from review
------------------------------------------------------------
revno: 2052.1.438.2.24
revision-id: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
parent: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-13 02:24:25 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.438.2.23
revision-id: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-06-09 01:19:15 -0400
message:
Adapt find_borders to produce a graph difference
------------------------------------------------------------
revno: 2052.1.438.2.22
revision-id: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
parent: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 21:13:31 -0400
message:
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
------------------------------------------------------------
revno: 2052.1.438.2.21
revision-id: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
parent: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 17:48:42 -0400
message:
Rename graph to deprecated_graph
------------------------------------------------------------
revno: 2052.1.438.2.20
revision-id: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
parent: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:13:31 -0400
message:
Fix get_graph_walker for remote repositories
------------------------------------------------------------
revno: 2052.1.438.2.19
revision-id: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
parent: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:08:14 -0400
message:
Implement common-ancestor-based culling
------------------------------------------------------------
revno: 2052.1.438.2.18
revision-id: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
parent: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:08:25 -0400
message:
Change AncestryWalker to take a set of ancestors
------------------------------------------------------------
revno: 2052.1.438.2.17
revision-id: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
parent: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:05:37 -0400
message:
Add start_searching, tweak stop_searching_any
------------------------------------------------------------
revno: 2052.1.438.2.16
revision-id: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
parent: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 12:37:29 -0400
message:
Tweak search
------------------------------------------------------------
revno: 2052.1.438.2.15
revision-id: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
parent: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:42:28 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.438.2.14
revision-id: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:18:14 -0400
message:
Avoid StackedParentsProvider when underlying repos match
------------------------------------------------------------
revno: 2052.1.438.2.13
revision-id: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
parent: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:03:32 -0400
message:
Update distinct -> lowest, refactor, add ParentsProvider concept
------------------------------------------------------------
revno: 2052.1.438.2.12
revision-id: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
parent: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Wed 2007-05-30 11:18:12 -0400
message:
Improve documentation
------------------------------------------------------------
revno: 2052.1.438.2.11
revision-id: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
parent: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:46:15 -0400
message:
Rename minimal common ancestor to distinct common ancestor
------------------------------------------------------------
revno: 2052.1.438.2.10
revision-id: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
parent: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:17:03 -0400
message:
Clarify text, remove unused _get_ancestry method
------------------------------------------------------------
revno: 2052.1.438.2.9
revision-id: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
parent: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sun 2007-05-27 12:15:19 -0400
message:
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
------------------------------------------------------------
revno: 2052.1.438.2.8
revision-id: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
parent: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:28:51 -0400
message:
fix iteration stuff
------------------------------------------------------------
revno: 2052.1.438.2.7
revision-id: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
parent: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:24:21 -0400
message:
Start implementing mca that scales with number of uncommon ancestors
------------------------------------------------------------
revno: 2052.1.438.2.6
revision-id: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
parent: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 02:11:15 -0400
message:
Use new common-ancestor code everywhere
------------------------------------------------------------
revno: 2052.1.438.2.5
revision-id: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
parent: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 00:27:39 -0400
message:
Use GraphWalker.unique_ancestor to determine merge base
------------------------------------------------------------
revno: 2052.1.438.2.4
revision-id: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
parent: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:33:01 -0400
message:
More tests for unique common ancestor
------------------------------------------------------------
revno: 2052.1.438.2.3
revision-id: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
parent: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:20:09 -0400
message:
Implement new merge base picker
------------------------------------------------------------
revno: 2052.1.438.2.2
revision-id: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
parent: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 00:44:29 -0400
message:
add minimal-common-ancestor calculation
------------------------------------------------------------
revno: 2052.1.438.2.1
revision-id: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-05-24 23:17:26 -0400
message:
Start work on GraphWalker
------------------------------------------------------------
revno: 2052.1.481
revision-id: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
parent: pqm at pqm.ubuntu.com-20070618052235-mvns8j28szyzscy0
parent: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 15:24:45 +0100
message:
Improve Feature usage style w/ lsprof
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.28
revision-id: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
parent: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 09:55:14 -0400
message:
Improve Feature usage style w/ lsprof
------------------------------------------------------------
revno: 2052.1.480
revision-id: pqm at pqm.ubuntu.com-20070618052235-mvns8j28szyzscy0
parent: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 06:22:35 +0100
message:
Turn list-weave into list-versionedfile
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.27
revision-id: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
parent: aaron.bentley at utoronto.ca-20070618045410-nysseluvoupymb9i
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 00:56:58 -0400
message:
fix NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.26
revision-id: aaron.bentley at utoronto.ca-20070618045410-nysseluvoupymb9i
parent: aaron.bentley at utoronto.ca-20070618024552-ya7hg0rd1e9fo1ym
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 00:54:10 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.25
revision-id: aaron.bentley at utoronto.ca-20070618024552-ya7hg0rd1e9fo1ym
parent: aaron.bentley at utoronto.ca-20070617223937-nziy1cki818xykth
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-06-17 22:45:52 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.24
revision-id: aaron.bentley at utoronto.ca-20070617223937-nziy1cki818xykth
parent: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-06-17 18:39:37 -0400
message:
Make list-weave list knits, rename to list-versionedfile
------------------------------------------------------------
revno: 2052.1.479
revision-id: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
parent: mbp at sourcefrog.net-20070613092840-0v9ph8iklj52agdj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 04:33:56 +0100
message:
Fix race in test_breakin_harder that can cause test suite hang.
------------------------------------------------------------
revno: 2052.1.475.1.1
revision-id: mbp at sourcefrog.net-20070613092840-0v9ph8iklj52agdj
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Wed 2007-06-13 19:28:40 +1000
message:
Fix race in test_breakin_harder that can cause test suite hang.
We don't know quite when the subprocess is ready to receive a signal,
so send it a few times til it has an effect. (#119566)
------------------------------------------------------------
revno: 2052.1.478
revision-id: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
parent: pqm at pqm.ubuntu.com-20070615062113-gl52qb0poutr1rm2
parent: mbp at sourcefrog.net-20070615072849-0u2u4suxx241ifzv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-15 09:22:22 +0100
message:
Speed up tests by deleting test directories immediately after they're used, and put them in (mbp, spiv)
------------------------------------------------------------
revno: 2052.1.433.6.9
revision-id: mbp at sourcefrog.net-20070615072849-0u2u4suxx241ifzv
parent: mbp at sourcefrog.net-20070615070124-clpwqh5gxc4wbf9l
parent: pqm at pqm.ubuntu.com-20070615062113-gl52qb0poutr1rm2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Fri 2007-06-15 17:28:49 +1000
message:
merge news
------------------------------------------------------------
revno: 2052.1.433.6.8
revision-id: mbp at sourcefrog.net-20070615070124-clpwqh5gxc4wbf9l
parent: mbp at sourcefrog.net-20070615070005-zazxgg6r00wivdlm
parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Fri 2007-06-15 17:01:24 +1000
message:
Merge trunk
------------------------------------------------------------
revno: 2052.1.433.6.7
revision-id: mbp at sourcefrog.net-20070615070005-zazxgg6r00wivdlm
parent: mbp at sourcefrog.net-20070519083934-uowlkzt7k007k0rg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Fri 2007-06-15 17:00:05 +1000
message:
Run exitfuncs explicitly before exiting
------------------------------------------------------------
revno: 2052.1.433.6.6
revision-id: mbp at sourcefrog.net-20070519083934-uowlkzt7k007k0rg
parent: mbp at sourcefrog.net-20070513090229-zr8pjf4tw5vqvo4s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sat 2007-05-19 09:39:34 +0100
message:
Put test root directory (containing per-test directories) in TMPDIR
rather than current directory, so it can be automatically scavenged,
kept in ramdisk, etc. Remove test root directory through atexit rather
than from test runner. Remove some code for managing them.
More thoroughly remove --keep-output.
------------------------------------------------------------
revno: 2052.1.433.6.5
revision-id: mbp at sourcefrog.net-20070513090229-zr8pjf4tw5vqvo4s
parent: mbp at sourcefrog.net-20070513072544-nqoezox04fjhtf1o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sun 2007-05-13 10:02:29 +0100
message:
Remove keep_output option
------------------------------------------------------------
revno: 2052.1.433.6.4
revision-id: mbp at sourcefrog.net-20070513072544-nqoezox04fjhtf1o
parent: mbp at sourcefrog.net-20070513070524-l5v00s0uzue6ssha
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sun 2007-05-13 08:25:44 +0100
message:
Move unicode handling code into _rmtree_temp_dir
------------------------------------------------------------
revno: 2052.1.433.6.3
revision-id: mbp at sourcefrog.net-20070513070524-l5v00s0uzue6ssha
parent: mbp at sourcefrog.net-20070513070444-msb9c171zrqd3re3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sun 2007-05-13 08:05:24 +0100
message:
TestCaseInTempDir takes responsibility for cleaning up its own test dir
------------------------------------------------------------
revno: 2052.1.433.6.2
revision-id: mbp at sourcefrog.net-20070513070444-msb9c171zrqd3re3
parent: mbp at sourcefrog.net-20070512191952-4317gkfcuz0jnbml
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sun 2007-05-13 08:04:44 +0100
message:
Don't call makeAndChdirToTestDir from test cases, it's done automatically in the parent
------------------------------------------------------------
revno: 2052.1.433.6.1
revision-id: mbp at sourcefrog.net-20070512191952-4317gkfcuz0jnbml
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Sat 2007-05-12 20:19:52 +0100
message:
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir
------------------------------------------------------------
revno: 2052.1.477
revision-id: pqm at pqm.ubuntu.com-20070615062113-gl52qb0poutr1rm2
parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
parent: mbp at sourcefrog.net-20070615052724-yeec92utnzbd2z1w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-15 07:21:13 +0100
message:
Better option names for missing (elliot)
------------------------------------------------------------
revno: 2052.1.476.1.1
revision-id: mbp at sourcefrog.net-20070615052724-yeec92utnzbd2z1w
parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-06-15 15:27:24 +1000
message:
Better option names for missing (elliot)
------------------------------------------------------------
revno: 2052.1.476
revision-id: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
parent: aaron.bentley at utoronto.ca-20070614045948-vcnbho5rhycxiqfy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-14 07:07:45 +0100
message:
'bzr info' gives terse info by default
------------------------------------------------------------
revno: 2052.1.311.5.26
revision-id: aaron.bentley at utoronto.ca-20070614045948-vcnbho5rhycxiqfy
parent: aaron.bentley at utoronto.ca-20070614044335-y0hekgh2n5cjl71q
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:59:48 -0400
message:
fix symbol spelling
------------------------------------------------------------
revno: 2052.1.311.5.25
revision-id: aaron.bentley at utoronto.ca-20070614044335-y0hekgh2n5cjl71q
parent: aaron.bentley at utoronto.ca-20070614043650-q2yb3mo03kcr8l2p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:43:35 -0400
message:
Update deprecations to 0.18.0
------------------------------------------------------------
revno: 2052.1.311.5.24
revision-id: aaron.bentley at utoronto.ca-20070614043650-q2yb3mo03kcr8l2p
parent: aaron.bentley at utoronto.ca-20070614043127-47fn7yuob130fah4
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:36:50 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.23
revision-id: aaron.bentley at utoronto.ca-20070614043127-47fn7yuob130fah4
parent: aaron.bentley at utoronto.ca-20070614041146-p210fux4dby1m2w0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:31:27 -0400
message:
Output 2-tuples from gather_locations
------------------------------------------------------------
revno: 2052.1.311.5.22
revision-id: aaron.bentley at utoronto.ca-20070614041146-p210fux4dby1m2w0
parent: aaron.bentley at utoronto.ca-20070607020329-3pfhv6ftdilrg4k1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:11:46 -0400
message:
Restructure tests
------------------------------------------------------------
revno: 2052.1.311.5.21
revision-id: aaron.bentley at utoronto.ca-20070607020329-3pfhv6ftdilrg4k1
parent: aaron.bentley at utoronto.ca-20070607013651-1l4x30qn3682p5qa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 22:03:29 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.311.5.20
revision-id: aaron.bentley at utoronto.ca-20070607013651-1l4x30qn3682p5qa
parent: aaron.bentley at utoronto.ca-20070607013358-k4pcjrovznnphsej
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:36:51 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.19
revision-id: aaron.bentley at utoronto.ca-20070607013358-k4pcjrovznnphsej
parent: aaron.bentley at utoronto.ca-20070607011620-if7ko3f86lwsmw3j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:33:58 -0400
message:
Add support for bound branches
------------------------------------------------------------
revno: 2052.1.311.5.18
revision-id: aaron.bentley at utoronto.ca-20070607011620-if7ko3f86lwsmw3j
parent: aaron.bentley at utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:16:20 -0400
message:
Get all tests passing
------------------------------------------------------------
revno: 2052.1.311.5.17
revision-id: aaron.bentley at utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
parent: aaron.bentley at utoronto.ca-20070518122206-5h5ys0uva3vh923s
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 19:32:14 +0100
message:
Change separator from '/' to 'or'
------------------------------------------------------------
revno: 2052.1.311.5.16
revision-id: aaron.bentley at utoronto.ca-20070518122206-5h5ys0uva3vh923s
parent: aaron.bentley at utoronto.ca-20070518115653-j8c55wztz4osur1c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 13:22:06 +0100
message:
remove spurious change
------------------------------------------------------------
revno: 2052.1.311.5.15
revision-id: aaron.bentley at utoronto.ca-20070518115653-j8c55wztz4osur1c
parent: aaron.bentley at utoronto.ca-20070518114233-dhywq002d3fi9cti
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 12:56:53 +0100
message:
Update deprecation warnings to 0.17
------------------------------------------------------------
revno: 2052.1.311.5.14
revision-id: aaron.bentley at utoronto.ca-20070518114233-dhywq002d3fi9cti
parent: aaron.bentley at utoronto.ca-20070518100015-o1f5hsghgbsmyf0g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 12:42:33 +0100
message:
Prevent repository.get_set_default_format from corrupting inventory
------------------------------------------------------------
revno: 2052.1.311.5.13
revision-id: aaron.bentley at utoronto.ca-20070518100015-o1f5hsghgbsmyf0g
parent: aaron.bentley at utoronto.ca-20070518070422-q6va41lpoplqlq5d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 11:00:15 +0100
message:
Fix environment pollution with assertCheckoutDescription
------------------------------------------------------------
revno: 2052.1.311.5.12
revision-id: aaron.bentley at utoronto.ca-20070518070422-q6va41lpoplqlq5d
parent: aaron.bentley at utoronto.ca-20070517232812-9hrv69amzey4g1jh
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 08:04:22 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.11
revision-id: aaron.bentley at utoronto.ca-20070517232812-9hrv69amzey4g1jh
parent: aaron.bentley at utoronto.ca-20070514172102-byyl4ldjxhfxvryy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 00:28:12 +0100
message:
All info tests pass
------------------------------------------------------------
revno: 2052.1.311.5.10
revision-id: aaron.bentley at utoronto.ca-20070514172102-byyl4ldjxhfxvryy
parent: abentley at panoramicfeedback.com-20070501161136-f5ekbaooom4jhvcv
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Mon 2007-05-14 18:21:02 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.9
revision-id: abentley at panoramicfeedback.com-20070501161136-f5ekbaooom4jhvcv
parent: abentley at panoramicfeedback.com-20070321163859-fvqsyhdo6a1d2rws
parent: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-05-01 12:11:36 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.8
revision-id: abentley at panoramicfeedback.com-20070321163859-fvqsyhdo6a1d2rws
parent: abentley at panoramicfeedback.com-20070320182248-vesy3708ewvcbtln
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Wed 2007-03-21 12:38:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.5.7
revision-id: abentley at panoramicfeedback.com-20070320182248-vesy3708ewvcbtln
parent: abentley at panoramicfeedback.com-20070320181559-gdtotm3er7a0zr0b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 14:22:48 -0400
message:
Make verbose mean what I want
------------------------------------------------------------
revno: 2052.1.311.5.6
revision-id: abentley at panoramicfeedback.com-20070320181559-gdtotm3er7a0zr0b
parent: abentley at panoramicfeedback.com-20070320170416-52zj2nquxn9gea88
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 14:15:59 -0400
message:
Add short format description
------------------------------------------------------------
revno: 2052.1.311.5.5
revision-id: abentley at panoramicfeedback.com-20070320170416-52zj2nquxn9gea88
parent: abentley at panoramicfeedback.com-20070320154925-9bkujrsexgohdxah
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 13:04:16 -0400
message:
add info.describe_format
------------------------------------------------------------
revno: 2052.1.311.5.4
revision-id: abentley at panoramicfeedback.com-20070320154925-9bkujrsexgohdxah
parent: abentley at panoramicfeedback.com-20070320154306-1ipv0q65w7iml1ej
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:49:25 -0400
message:
Eliminate the concept of a 'repository lightweight checkout'
------------------------------------------------------------
revno: 2052.1.311.5.3
revision-id: abentley at panoramicfeedback.com-20070320154306-1ipv0q65w7iml1ej
parent: abentley at panoramicfeedback.com-20070320150949-ng8lv3yxi3lkzj7p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:43:06 -0400
message:
Add layout description to info output
------------------------------------------------------------
revno: 2052.1.311.5.2
revision-id: abentley at panoramicfeedback.com-20070320150949-ng8lv3yxi3lkzj7p
parent: abentley at panoramicfeedback.com-20070320134949-e3qzzgn391slskml
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:09:49 -0400
message:
Implement layout description
------------------------------------------------------------
revno: 2052.1.311.5.1
revision-id: abentley at panoramicfeedback.com-20070320134949-e3qzzgn391slskml
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 09:49:49 -0400
message:
Unify info display into show_component_info
------------------------------------------------------------
revno: 2052.1.475
revision-id: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
parent: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 07:16:27 +0100
message:
make profiling information easier to view and better documented (Clatworthy)
------------------------------------------------------------
revno: 2052.1.441.2.11
revision-id: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
parent: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-13 01:43:25 -0400
message:
Compensate for brittle requireFeature behavior
------------------------------------------------------------
revno: 2052.1.441.2.10
revision-id: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
parent: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 14:10:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.441.2.9
revision-id: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:57:07 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.441.2.8
revision-id: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:51:11 -0400
message:
Convert old lsprof tests to require new LSProf Feature instead of skipping
------------------------------------------------------------
revno: 2052.1.441.2.7
revision-id: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
parent: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:46:46 -0400
message:
Add info to --lsprof-file entry in global options
------------------------------------------------------------
revno: 2052.1.441.2.6
revision-id: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
parent: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:13:50 -0400
message:
Make LSProf into a Feature required by the appropriate tests
------------------------------------------------------------
revno: 2052.1.441.2.5
revision-id: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
parent: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:51:37 +1000
message:
explicit format saving test
------------------------------------------------------------
revno: 2052.1.441.2.4
revision-id: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
parent: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:06:04 +1000
message:
removed old profiling data saving code from UI layer
------------------------------------------------------------
revno: 2052.1.441.2.3
revision-id: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
parent: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 20:45:08 +1000
message:
changes requested in jameinel's review incorporated
------------------------------------------------------------
revno: 2052.1.441.2.2
revision-id: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
parent: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Thu 2007-05-31 14:59:25 +1000
message:
Incorporate feedback from Robert Collins
------------------------------------------------------------
revno: 2052.1.441.2.1
revision-id: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Mon 2007-05-28 12:08:25 +1000
message:
make profiling information easier to view and better documented
------------------------------------------------------------
revno: 2052.1.474
revision-id: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 04:59:12 +0100
message:
Submitting empty commit
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.23
revision-id: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 23:02:39 -0400
message:
Empty commit
------------------------------------------------------------
revno: 2052.1.473
revision-id: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 18:28:39 +0100
message:
Fix botched merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.22
revision-id: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:24:23 -0400
message:
Redo test skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.21
revision-id: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:22:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.472.1.1
revision-id: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 12:21:40 -0400
message:
Revert broken changes
------------------------------------------------------------
revno: 2052.1.472
revision-id: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 16:51:57 +0100
message:
Skip intermittently failing test
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.20
revision-id: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 10:52:49 -0400
message:
Fix skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.19
revision-id: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
parent: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 09:40:01 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.18
revision-id: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-06-07 11:31:37 -0400
message:
Skip itermittently-failing test instead of deleting it
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.17
revision-id: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
parent: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 12:43:00 -0400
message:
Remove broken test
------------------------------------------------------------
revno: 2052.1.471
revision-id: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 07:07:27 +0100
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2052.1.470.1.1
revision-id: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 14:34:21 +1000
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2052.1.470
revision-id: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 03:17:42 +0100
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2052.1.469.1.1
revision-id: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 56322
timestamp: Tue 2007-06-12 11:44:20 +1000
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2052.1.452.1.4
revision-id: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
parent: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:41:50 +0100
message:
Removed TODO relating to create-prefix.
------------------------------------------------------------
revno: 2052.1.452.1.3
revision-id: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
parent: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:40:16 +0100
message:
Implemented --create-prefix for 'init'.
------------------------------------------------------------
revno: 2052.1.452.1.2
revision-id: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
parent: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:39:50 +0100
message:
Created tests for adding --create-prefix to 'init'.
------------------------------------------------------------
revno: 2052.1.452.1.1
revision-id: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 21:45:24 +0100
message:
Abstracted create_prefix code from the class 'cmd_push' to the function '_create_prefix' (both in builtins.py).
------------------------------------------------------------
revno: 2052.1.469
revision-id: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 01:09:24 +0100
message:
(John Arbash Meinel, Aaron Bentley) Fix bug #115343 allowing 'bzr branch' to sprout any revision in the repository.
------------------------------------------------------------
revno: 2052.1.435.2.7
revision-id: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
parent: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-06-11 18:23:40 -0500
message:
Fix NEWS to put _iter_changes fixes in right location.
------------------------------------------------------------
revno: 2052.1.435.2.6
revision-id: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
parent: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:08:12 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.435.2.5
revision-id: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:06:16 -0400
message:
Tweak NEWS
------------------------------------------------------------
revno: 2052.1.435.2.4
revision-id: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
parent: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:01:19 -0400
message:
Add test to ensure we can branch from repository revisions
------------------------------------------------------------
revno: 2052.1.435.2.3
revision-id: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
parent: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 19:02:58 +0200
message:
Fix bug #115343, Add a test that we can branch any revision in our ancestry.
And update Branch6 to support this properly.
------------------------------------------------------------
revno: 2052.1.435.2.2
revision-id: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
parent: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 18:44:13 +0200
message:
Adding a simple sprout test to make sure it creates the target branch with the right format
------------------------------------------------------------
revno: 2052.1.435.2.1
revision-id: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 17:18:04 +0200
message:
Move the Branch.sprout tests into their own folder.
------------------------------------------------------------
revno: 2052.1.468
revision-id: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 14:43:40 +0100
message:
(Ian Clatworthy, r=john) 'branch lp:projname' now creates ./projname as expected
------------------------------------------------------------
revno: 2052.1.460.4.1
revision-id: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.branch-lp-ui
timestamp: Thu 2007-06-07 00:06:14 +1000
message:
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
------------------------------------------------------------
revno: 2052.1.467
revision-id: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 04:25:44 +0100
message:
(Andrew Bennetts) Developer documentation for the propsed container format.
------------------------------------------------------------
revno: 2052.1.447.4.4
revision-id: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
parent: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-08 12:47:19 +1000
message:
Typos and clarfications thanks to Aaron.
------------------------------------------------------------
revno: 2052.1.447.4.3
revision-id: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
parent: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 16:41:53 +1000
message:
Updates in response to feedback on mailing list and in person.
------------------------------------------------------------
revno: 2052.1.447.4.2
revision-id: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
parent: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 14:08:10 +1000
message:
Use standard heading markers.
------------------------------------------------------------
revno: 2052.1.447.4.1
revision-id: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-01 17:47:03 +1000
message:
First draft of container format developer doc, based on discussion with Robert.
------------------------------------------------------------
revno: 2052.1.466
revision-id: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 00:35:23 +0100
message:
(John Arbash Meinel) Fix bug #115947, set_state_from_inventory needs to watch out for certain paths.
------------------------------------------------------------
revno: 2052.1.435.1.3
revision-id: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
parent: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Thu 2007-06-07 17:31:44 -0500
message:
[merge] bzr.dev 2517
------------------------------------------------------------
revno: 2052.1.435.1.2
revision-id: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:36:38 +0200
message:
Fix bug #115947, DirState.set_state_from_inventory() needs to iterate in
the correct order when there are common prefixes.
------------------------------------------------------------
revno: 2052.1.435.1.1
revision-id: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:28:14 +0200
message:
Adding a (broken) test that set_state_from_inventory works
when a record is deleted from a directory which has a sibling directory with a common prefix.
------------------------------------------------------------
revno: 2052.1.465
revision-id: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:50:16 +0100
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2052.1.443.2.5
revision-id: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
parent: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:55:47 -0400
message:
Zap trailing whitespace
------------------------------------------------------------
revno: 2052.1.443.2.4
revision-id: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
parent: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:51 -0400
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2052.1.443.4.14
revision-id: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
parent: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:52:55 -0500
message:
Be more consistent about using `` around options and filenames.
------------------------------------------------------------
revno: 2052.1.443.4.13
revision-id: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
parent: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:48:41 -0500
message:
$BZREMAIL has been spelt $BZR_EMAIL for almost a year now, so it's
probably time to tell the tutorial about it...
------------------------------------------------------------
revno: 2052.1.443.4.12
revision-id: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
parent: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:47:02 -0500
message:
Adjust some stuff on the Introducing Yourself section so that it
literal's and blockquote's properly.
------------------------------------------------------------
revno: 2052.1.443.4.11
revision-id: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
parent: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:39:09 -0500
message:
Use `` instead of ` around a bunch of options and env variable namings
when talking about editor settings.
------------------------------------------------------------
revno: 2052.1.443.4.10
revision-id: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:31:02 -0500
message:
Be consistent about using `` instead of ** around commands.
There are some places that command _names_ are left in **'s, on the
theory that they're really describing concepts rather than commands.
------------------------------------------------------------
revno: 2052.1.443.2.3
revision-id: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:07 -0400
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.464
revision-id: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:21:55 +0100
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2052.1.463.1.1
revision-id: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-07 08:49:00 -0400
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2052.1.460.3.2
revision-id: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
parent: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:20:52 +0100
message:
Updated NEWS to reflect bug fix.
------------------------------------------------------------
revno: 2052.1.460.3.1
revision-id: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:16:55 +0100
message:
Added BZR_REMOTE_PATH to the list of environment variables cleaned before running tests, fixing bug #111958.
------------------------------------------------------------
revno: 2052.1.463
revision-id: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 01:21:24 +0100
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2052.1.462.1.1
revision-id: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-06-06 19:52:07 -0400
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2052.1.460.2.4
revision-id: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
parent: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 06:34:02 -0500
message:
Rewrite revision-info blackbox tests to test:
- Support for dotted revnos
- Defaulting to head of branch if no rev given
- Functioning without working tree
------------------------------------------------------------
revno: 2052.1.460.2.3
revision-id: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
parent: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:54:10 -0500
message:
Default revision-info to the head of the branch when no revision is
given.
------------------------------------------------------------
revno: 2052.1.460.2.2
revision-id: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
parent: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:45:10 -0500
message:
Update revision-info to show dotted revnos.
------------------------------------------------------------
revno: 2052.1.460.2.1
revision-id: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:23:32 -0500
message:
revision-info has no call to need a WorkingTree, so don't demand one.
------------------------------------------------------------
revno: 2052.1.462
revision-id: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 21:17:38 +0100
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2052.1.460.1.1
revision-id: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-06-06 14:44:39 -0500
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2052.1.433.5.1
revision-id: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: gree <gree at grees.net>
branch nick: bzr.grees
timestamp: Mon 2007-05-14 14:28:26 +0200
message:
bash completion - fixed simple completion (don't include textual info about command into completion)
------------------------------------------------------------
revno: 2052.1.461
revision-id: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 15:42:00 +0100
message:
(Ian Clatworthy) Improve 'bzr commit' time by removing some lock and dirstate._validate() calls
------------------------------------------------------------
revno: 2052.1.459.1.4
revision-id: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
parent: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:17:45 +1000
message:
updated NEWS and added commit performance notes to doc/developers
------------------------------------------------------------
revno: 2052.1.459.1.3
revision-id: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
parent: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:11:58 +1000
message:
remove implicit read locks for kind() and is_executable() in wt4
------------------------------------------------------------
revno: 2052.1.459.1.2
revision-id: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
parent: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:07:45 +1000
message:
remove calls to dirstate._validate() that shouldn't be on production code
------------------------------------------------------------
revno: 2052.1.459.1.1
revision-id: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 15:56:03 +1000
message:
commit.py clean-up including logging just to stderr, not bzr.log
------------------------------------------------------------
revno: 2052.1.460
revision-id: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 09:37:14 +0100
message:
(bialix,r=john,r=aaron) sanitize dev docs (performance-roadmap) &
win32 installers improvements
------------------------------------------------------------
revno: 2052.1.454.1.4
revision-id: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
parent: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:57:00 +0300
message:
pack developers docs to windows installers
------------------------------------------------------------
revno: 2052.1.454.1.3
revision-id: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
parent: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:45:14 +0300
message:
merge bzr.dev; fix ReST formatting in planned-performance-changes.txt
------------------------------------------------------------
revno: 2052.1.454.1.2
revision-id: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:11:52 +0300
message:
better wording suggested by John Meinel
------------------------------------------------------------
revno: 2052.1.454.1.1
revision-id: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Tue 2007-06-05 11:02:04 +0300
message:
sanitize developers docs
------------------------------------------------------------
revno: 2052.1.459
revision-id: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 06:00:06 +0100
message:
Update style of TreeTransform._rename_in_limbo
------------------------------------------------------------
revno: 2052.1.450.1.14
revision-id: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Wed 2007-06-06 00:10:17 -0400
message:
Style update suggested by Robert
------------------------------------------------------------
revno: 2052.1.458
revision-id: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 05:32:17 +0100
message:
Don't crash on merging renames of deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.3
revision-id: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
parent: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:50:55 -0400
message:
Rename test case
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.2
revision-id: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
parent: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:07:25 -0400
message:
Don't crash on merging renamed deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.1
revision-id: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
parent: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.457
revision-id: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 03:27:03 +0100
message:
Cancelling directories with cancelled children works correctly
------------------------------------------------------------
revno: 2052.1.450.1.13
revision-id: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
parent: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 21:28:18 -0400
message:
Updates from review
------------------------------------------------------------
revno: 2052.1.450.1.12
revision-id: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 18:33:21 -0400
message:
Avoid renaming children with no content
------------------------------------------------------------
revno: 2052.1.456
revision-id: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 02:58:59 +0100
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2052.1.455.1.1
revision-id: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-06-06 11:07:22 +1000
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2052.1.433.4.10
revision-id: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
parent: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Wed 2007-06-06 11:01:58 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2052.1.433.4.9
revision-id: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
parent: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 15:38:02 +1000
message:
Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2052.1.455
revision-id: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-05 17:48:10 +0100
message:
Optimize TreeTransform to avoid renames where possible
------------------------------------------------------------
revno: 2052.1.450.1.11
revision-id: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
parent: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:19:22 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.450.1.10
revision-id: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:18:28 -0400
message:
Merge NEWS
------------------------------------------------------------
revno: 2052.1.450.1.5.1.2
revision-id: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
parent: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 18:00:35 -0400
message:
Fix NEWS
------------------------------------------------------------
revno: 2052.1.450.1.5.1.1
revision-id: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 17:51:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2052.1.450.1.9
revision-id: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 11:45:20 -0400
message:
Add additional test for no-name contents
------------------------------------------------------------
revno: 2052.1.450.1.8
revision-id: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
parent: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 10:14:43 -0400
message:
Updates from review comments
------------------------------------------------------------
revno: 2052.1.450.1.7
revision-id: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
parent: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 13:04:53 -0400
message:
Fix finalize deletion ordering
------------------------------------------------------------
revno: 2052.1.450.1.6
revision-id: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 12:53:36 -0400
message:
Update from review comments
------------------------------------------------------------
revno: 2052.1.450.1.5
revision-id: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
parent: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 12:33:08 -0400
message:
Cleanup
------------------------------------------------------------
revno: 2052.1.450.1.4
revision-id: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
parent: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 11:56:59 -0400
message:
Ensure we only reuse limbo names appropriately
------------------------------------------------------------
revno: 2052.1.450.1.3
revision-id: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
parent: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 00:14:08 -0400
message:
Don't cause errors when creating contents for trans_ids with no parent/name
------------------------------------------------------------
revno: 2052.1.450.1.2
revision-id: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
parent: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sat 2007-06-02 11:48:54 -0400
message:
Make the limited-renames functionality safer in the general case
------------------------------------------------------------
revno: 2052.1.450.1.1
revision-id: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
parent: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Fri 2007-06-01 20:06:45 -0400
message:
Ensure renames only root children are renamed when building trees
------------------------------------------------------------
revno: 2052.1.454
revision-id: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
parent: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
parent: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-04 20:45:35 +0100
message:
Fix workingtree.remove with tree references
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.16
revision-id: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
parent: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-04 14:59:21 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15
revision-id: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: abentley at panoramicfeedback.com-20070524150452-sifbv1wlrjnlw1zx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:36:19 -0400
message:
Remove redundant listdir
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.14
revision-id: abentley at panoramicfeedback.com-20070524150452-sifbv1wlrjnlw1zx
parent: abentley at panoramicfeedback.com-20070524150356-218vhkzsxubtzikd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:04:52 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.13
revision-id: abentley at panoramicfeedback.com-20070524150356-218vhkzsxubtzikd
parent: abentley at panoramicfeedback.com-20070524150109-is07n3xarwa63736
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:03:56 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.12
revision-id: abentley at panoramicfeedback.com-20070524150109-is07n3xarwa63736
parent: aaron.bentley at utoronto.ca-20070524121941-p1ch5bu1bvm6qn72
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:01:09 -0400
message:
Stop using inventory directly in WorkingTree.remove
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.11
revision-id: aaron.bentley at utoronto.ca-20070524121941-p1ch5bu1bvm6qn72
parent: aaron.bentley at utoronto.ca-20070523113246-8z2a83w2qxnhxxr8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 08:19:41 -0400
message:
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.10
revision-id: aaron.bentley at utoronto.ca-20070523113246-8z2a83w2qxnhxxr8
parent: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-05-23 07:32:46 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.453
revision-id: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
parent: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-04 07:29:25 +0100
message:
(robertc) More London sprint documentation
------------------------------------------------------------
revno: 2052.1.433.4.8
revision-id: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
parent: robertc at robertcollins.net-20070604033948-erld0bugxcbo62gf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 14:07:20 +1000
message:
Note that multiparent deltas affect merge to, from the mailing list review discussion.
------------------------------------------------------------
revno: 2052.1.433.4.7
revision-id: robertc at robertcollins.net-20070604033948-erld0bugxcbo62gf
parent: robertc at robertcollins.net-20070604005154-yvx2q8jnwiprw6du
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 13:39:48 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2052.1.433.4.6
revision-id: robertc at robertcollins.net-20070604005154-yvx2q8jnwiprw6du
parent: robertc at robertcollins.net-20070518181212-acujb9ai3r3ds8s3
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 10:51:54 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.433.4.5
revision-id: robertc at robertcollins.net-20070518181212-acujb9ai3r3ds8s3
parent: robertc at robertcollins.net-20070515143142-1u0xo65hyhewgkyw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Sat 2007-05-19 04:12:12 +1000
message:
Incremental push-pull notes.
------------------------------------------------------------
revno: 2052.1.433.4.4
revision-id: robertc at robertcollins.net-20070515143142-1u0xo65hyhewgkyw
parent: robertc at robertcollins.net-20070515112623-rb3uq4tern5lsn6l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Wed 2007-05-16 00:31:42 +1000
message:
Add annotate roadmap.
------------------------------------------------------------
revno: 2052.1.433.4.3
revision-id: robertc at robertcollins.net-20070515112623-rb3uq4tern5lsn6l
parent: robertc at robertcollins.net-20070515102628-j2e0lgz5k42ckyzh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 21:26:23 +1000
message:
Add revert analysis.
------------------------------------------------------------
revno: 2052.1.433.4.2
revision-id: robertc at robertcollins.net-20070515102628-j2e0lgz5k42ckyzh
parent: robertc at robertcollins.net-20070515094946-9nrohtlybz2i5jt9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 20:26:28 +1000
message:
Add gc analysis
------------------------------------------------------------
revno: 2052.1.433.4.1
revision-id: robertc at robertcollins.net-20070515094946-9nrohtlybz2i5jt9
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 19:49:46 +1000
message:
add analysis
------------------------------------------------------------
revno: 2052.1.452
revision-id: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
parent: pqm at pqm.ubuntu.com-20070601231018-i374u1n4yt6rpg7x
parent: john at arbash-meinel.com-20070530184026-h7b0okqaito0oquy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-06-02 19:48:54 +0100
message:
(Andrew Bennetts) 'make check' builds docs as well
------------------------------------------------------------
revno: 2052.1.443.5.1
revision-id: john at arbash-meinel.com-20070530184026-h7b0okqaito0oquy
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: andrew.bennetts at canonical.com-20070412130325-56c9kdg18lvpj02g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: check-docs
timestamp: Wed 2007-05-30 13:40:26 -0500
message:
(Andrew Bennetts) 'make check' builds docs as well
------------------------------------------------------------
revno: 2052.1.359.1.1
revision-id: andrew.bennetts at canonical.com-20070412130325-56c9kdg18lvpj02g
parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: check-makes-docs
timestamp: Thu 2007-04-12 23:03:25 +1000
message:
Make 'make check' depend on docs building without error.
------------------------------------------------------------
revno: 2052.1.451
revision-id: pqm at pqm.ubuntu.com-20070601231018-i374u1n4yt6rpg7x
parent: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
parent: john at arbash-meinel.com-20070601214045-zalht5mx39yg11l6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-06-02 00:10:18 +0100
message:
(John Arbash Meinel) add [merge] for short log messages
------------------------------------------------------------
revno: 2052.1.431.2.5
revision-id: john at arbash-meinel.com-20070601214045-zalht5mx39yg11l6
parent: john at arbash-meinel.com-20070508220459-wvpmol3nkg91j5e6
parent: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Fri 2007-06-01 16:40:45 -0500
message:
[merge] bzr.dev 2501
------------------------------------------------------------
revno: 2052.1.431.2.4
revision-id: john at arbash-meinel.com-20070508220459-wvpmol3nkg91j5e6
parent: john at arbash-meinel.com-20070508220207-yvs5og03igv48k5g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 17:04:59 -0500
message:
Update NEWS to include a reference to bug #83887
(which is actually a minor feature request)
------------------------------------------------------------
revno: 2052.1.431.2.3
revision-id: john at arbash-meinel.com-20070508220207-yvs5og03igv48k5g
parent: john at arbash-meinel.com-20070508201017-w968czcnrzvjttze
parent: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 17:02:07 -0500
message:
[merge] bzr.dev 2484
------------------------------------------------------------
revno: 2052.1.431.2.2
revision-id: john at arbash-meinel.com-20070508201017-w968czcnrzvjttze
parent: john at arbash-meinel.com-20070508193100-64xg2gv8oc40tiri
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 15:10:17 -0500
message:
Add [merge] after the timestamp for revisions with merges.
------------------------------------------------------------
revno: 2052.1.431.2.1
revision-id: john at arbash-meinel.com-20070508193100-64xg2gv8oc40tiri
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 14:31:00 -0500
message:
Add a test with a merged revision
now we need to figure out what it should look like :)
------------------------------------------------------------
revno: 2052.1.450
revision-id: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
parent: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
parent: abentley at panoramicfeedback.com-20070601134202-xesyeah3z22v56b4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 23:16:55 +0100
message:
Fix Workingtree4.get_file_sha1 on missing files (#118186)
------------------------------------------------------------
revno: 2052.1.447.3.1
revision-id: abentley at panoramicfeedback.com-20070601134202-xesyeah3z22v56b4
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fix-118186
timestamp: Fri 2007-06-01 09:42:02 -0400
message:
Fix Workingtree4.get_file_sha1 on missing files
------------------------------------------------------------
revno: 2052.1.449
revision-id: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
parent: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
parent: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 22:26:22 +0100
message:
(Matthew Fuller) Updates to the tutorial
------------------------------------------------------------
revno: 2052.1.447.2.1
revision-id: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-06-01 14:35:23 -0500
message:
(Matthew Fuller) Updates to the tutorial
------------------------------------------------------------
revno: 2052.1.443.4.9
revision-id: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
parent: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-05-30 09:52:53 -0500
message:
Don't point people at the nonexistent 'status --all'.
------------------------------------------------------------
revno: 2052.1.443.4.8
revision-id: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
parent: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:55:12 -0500
message:
Bump document version from 0.8 to 0.16.
------------------------------------------------------------
revno: 2052.1.443.4.7
revision-id: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
parent: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:54:08 -0500
message:
De-emphasize the heck out of manually rsync'ing for 'push', and
emphasize the builtin 'push'.
------------------------------------------------------------
revno: 2052.1.443.4.6
revision-id: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
parent: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:46:09 -0500
message:
Reorganize some text to emphasize 'bzr branch' over grabbing a tarball
or rsync'ing.
------------------------------------------------------------
revno: 2052.1.443.4.5
revision-id: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
parent: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:43:30 -0500
message:
Another place where we need to clarify that 'rm' may or may not delete
the file.
------------------------------------------------------------
revno: 2052.1.443.4.4
revision-id: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
parent: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:32:44 -0500
message:
Adjust diff output to look like diff output looks.
------------------------------------------------------------
revno: 2052.1.443.4.3
revision-id: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
parent: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:28:34 -0500
message:
X-ref "Publishing your branch" section from the discussion of branch
locations. A question was posed on IRC suggesting a need for this.
------------------------------------------------------------
revno: 2052.1.443.4.2
revision-id: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
parent: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:22:49 -0500
message:
rm does sometimes remove the file now. Try and make that a little
more correct, without being hopelessly complicated.
------------------------------------------------------------
revno: 2052.1.443.4.1
revision-id: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:15:50 -0500
message:
Get rid of references to 'bzr unknowns'.
------------------------------------------------------------
revno: 2052.1.448
revision-id: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 20:50:39 +0100
message:
Revert does not try to preserve file contents produced by revert
------------------------------------------------------------
revno: 2052.1.447.1.1
revision-id: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab2
timestamp: Fri 2007-06-01 01:43:11 -0400
message:
Revert does not try to preserve file contents produced by revert
------------------------------------------------------------
revno: 2052.1.447
revision-id: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
parent: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-31 22:08:33 +0100
message:
(John Arbash Meinel, r=robert) Tweak _iter_changes and update_entry to make bzr status and bzr diff much faster
------------------------------------------------------------
revno: 2052.1.433.3.14
revision-id: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
parent: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-31 15:29:04 -0500
message:
Update the code so that symlinks aren't cached at incorrect times
and fix the tests so that they don't assume files and symlinks
get cached even when the timestamp doesn't declare them 'safe'.
------------------------------------------------------------
revno: 2052.1.433.3.13
revision-id: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
parent: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-31 09:17:58 -0500
message:
NEWS
------------------------------------------------------------
revno: 2052.1.433.3.12
revision-id: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
parent: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 19:23:06 +0100
message:
Delay joining the path until we are actually going to be using it.
------------------------------------------------------------
revno: 2052.1.433.3.11
revision-id: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
parent: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 19:22:43 +0100
message:
Correct DirState.update_entry to check when caching the sha1
not when returning it.
------------------------------------------------------------
revno: 2052.1.433.3.10
revision-id: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
parent: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:52:21 +0100
message:
Remove some extra comments.
------------------------------------------------------------
revno: 2052.1.433.3.9
revision-id: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
parent: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:11:33 +0100
message:
Now that we know when tuples will be yielded
go ahead and spend the effort to make them *nice* tuples.
------------------------------------------------------------
revno: 2052.1.433.3.8
revision-id: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
parent: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:07:34 +0100
message:
Keep track of directories that you have seen.
Only fall back to _get_entry if that misses.
------------------------------------------------------------
revno: 2052.1.433.3.7
revision-id: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
parent: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 07:26:51 +0100
message:
Comment on some alternative 'pack_stat'
------------------------------------------------------------
revno: 2052.1.433.3.6
revision-id: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
parent: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 07:18:55 +0100
message:
Delay calling pathjoin() until we've figured out we're going to use it
(this is only a small win)
------------------------------------------------------------
revno: 2052.1.433.3.5
revision-id: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
parent: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 06:57:58 +0100
message:
switching to a single returned object from _process_entry is not faster
using result = _process_entry, if result is not ... is not strictly
faster than for result in _process_entry. I'm not sure why.
I think it is a little cleaner, though.
------------------------------------------------------------
revno: 2052.1.433.3.4
revision-id: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
parent: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 06:46:27 +0100
message:
Change _process_entry to detect when we don't care about something.
This lets us do the standard check on local variables
and handles the *very* common case of nothing being changed.
------------------------------------------------------------
revno: 2052.1.433.3.3
revision-id: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
parent: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 00:27:20 +0100
message:
Avoid extra work in inner 'DirState.update_entry' code.
Use local vars for most functinos, directly lookup in local dict rather
than going through osutils.stat_to_file_kind.
Require the stat to be passed in, rather than being optional.
change pack_stat to use binascii.b2a_base64 (the underlying function)
Move pack_stat to top of code, so it can be saved as local variable.
This cuts the time spent in update_entry to 1/2.
Avoiding pack_stat is also a potentially large win. (5% or so)
------------------------------------------------------------
revno: 2052.1.433.3.2
revision-id: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
parent: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Tue 2007-05-15 23:40:39 +0100
message:
Handle the case when getfilesystemencoding() is lowercase.
------------------------------------------------------------
revno: 2052.1.433.3.1
revision-id: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Tue 2007-05-15 23:16:32 +0100
message:
Fix DirState handling of dir records.
We were comparing stat_value.st_size against the recorded directory size
which is always 0.
------------------------------------------------------------
revno: 2052.1.446
revision-id: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
parent: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
parent: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-30 16:27:20 +0100
message:
(Robert Collins) Add a BranchBuilder API for use by the test suite.
------------------------------------------------------------
revno: 2052.1.443.3.2
revision-id: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
parent: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
parent: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-30 07:48:25 -0500
message:
(Robert Collins) Use BranchBuilder in test_ancestry.
------------------------------------------------------------
revno: 2052.1.414.7.9.1.1
revision-id: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use-build-branch
timestamp: Fri 2007-04-27 13:42:50 +1000
message:
Use BranchBuilder in test_ancestry.
------------------------------------------------------------
revno: 2052.1.443.3.1
revision-id: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-30 07:45:23 -0500
message:
(Robert Collins) Add a BranchBuilder API for use by the test suite.
------------------------------------------------------------
revno: 2052.1.414.7.10
revision-id: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 16:16:29 +1000
message:
Add a format parameter to BranchBuilder.
------------------------------------------------------------
revno: 2052.1.414.7.9
revision-id: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
parent: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:39:09 +1000
message:
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
------------------------------------------------------------
revno: 2052.1.414.7.8
revision-id: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
parent: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:18:22 +1000
message:
NEWS too.
------------------------------------------------------------
revno: 2052.1.414.7.7
revision-id: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
parent: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:13:00 +1000
message:
Document basic usage.
------------------------------------------------------------
revno: 2052.1.414.7.6
revision-id: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
parent: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:02:05 +1000
message:
Add BranchBuilder.build_commit.
------------------------------------------------------------
revno: 2052.1.414.7.5
revision-id: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
parent: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:32:29 +1000
message:
Better docstring for BranchBuilder.__init__.
------------------------------------------------------------
revno: 2052.1.414.7.4
revision-id: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
parent: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:31:43 +1000
message:
Add BranchBuilder.get_branch().
------------------------------------------------------------
revno: 2052.1.414.7.3
revision-id: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:20:14 +1000
message:
Create bzrlib.branchbuilder.
------------------------------------------------------------
revno: 2052.1.445
revision-id: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
parent: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-05-27 20:38:04 +0100
message:
Add performance analysis docs
------------------------------------------------------------
revno: 2052.1.443.2.2
revision-id: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
parent: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Sun 2007-05-27 14:47:54 -0400
message:
Add initial push/pull analysis
------------------------------------------------------------
revno: 2052.1.443.2.1
revision-id: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Sun 2007-05-27 13:45:50 -0400
message:
Add bundle creation and merge scaling analysis
------------------------------------------------------------
revno: 2052.1.444
revision-id: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-05-26 17:00:35 +0100
message:
Fix PyCurl single-range bug (Vincent Ladeuil, #112719)
------------------------------------------------------------
revno: 2052.1.443.1.1
revision-id: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sat 2007-05-26 11:30:55 -0400
message:
Merge PyCurl single-range bug
------------------------------------------------------------
revno: 2052.1.429.3.1
revision-id: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 112719
timestamp: Sun 2007-05-06 08:59:57 +0200
message:
Fix bug #112719 by using the right range header.
* HTTPTestUtil.py:
(SingleOnlyRangeRequestHandler): Noisily refuses mutliple range
requests.
* test_http.py:
(TestSingleOnlyRangeRequestServer): Test the retry mechanism when
a server refuses to handle a mutiple range request without
silently replying with a single range or full file response.
* _pycurl.py:
(PyCurlTransport._get_ranged): The header have been built taken
into account the range hint, don't rebuilt it *ignoring* that
hint.
------------------------------------------------------------
revno: 2052.1.443
revision-id: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
parent: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-25 06:00:23 +0100
message:
(bialix,r=john) don't bundle into standalone bzr.exe site.py (with
their depends), and tools/doc_generate
------------------------------------------------------------
revno: 2052.1.429.2.1
revision-id: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Fri 2007-05-04 14:02:41 +0300
message:
don't bundle into standalone bzr.exe site.py (with their depends), and tools/doc_generate
------------------------------------------------------------
revno: 2052.1.442
revision-id: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-25 05:33:32 +0100
message:
Merge log --limit (Kent Gibson)
------------------------------------------------------------
revno: 2052.1.441.1.1
revision-id: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-05-25 00:00:47 -0400
message:
Merge log --limit (Kent Gibson)
------------------------------------------------------------
revno: 2052.1.414.8.1.1.1
revision-id: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: log_limit
timestamp: Sat 2007-05-05 10:32:39 +0800
message:
add bzr log --limit
------------------------------------------------------------
revno: 2052.1.441
revision-id: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 17:57:38 +0100
message:
(Marien Zwart) Update test_selftest.test_elapsed_time_with... to be more forgiving
------------------------------------------------------------
revno: 2052.1.440.1.2
revision-id: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
parent: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 11:12:53 -0500
message:
Tweak the regex a bit more
------------------------------------------------------------
revno: 2052.1.440.1.1
revision-id: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 11:10:45 -0500
message:
[merge] Marien Zwart: make test_elapsed_time more forgiving.
------------------------------------------------------------
revno: 2052.1.433.2.1
revision-id: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Marien Zwart <marienz at gentoo.org>
branch nick: fix-timed-tests
timestamp: Fri 2007-05-11 02:39:34 +0200
message:
Make test_elapsed_time_with_benchmarking pass on a slow cpu.
------------------------------------------------------------
revno: 2052.1.440
revision-id: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 17:07:00 +0100
message:
(James Westby) Add a help topic for working trees and repositories.
------------------------------------------------------------
revno: 2052.1.439.1.1
revision-id: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 10:26:41 -0500
message:
(James Westby) Add a help topic for working trees and repositories.
------------------------------------------------------------
revno: 2052.1.433.1.3
revision-id: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
parent: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 21:45:16 +0100
message:
Add a NEWS entry for the changes.
------------------------------------------------------------
revno: 2052.1.433.1.2
revision-id: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
parent: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 21:42:47 +0100
message:
Update with comments from review, thanks to John and Aaron.
------------------------------------------------------------
revno: 2052.1.433.1.1
revision-id: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 20:30:26 +0100
message:
Update the help topics to the latest bzr.dev.
------------------------------------------------------------
revno: 2052.1.349.2.2
revision-id: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
parent: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.repos
timestamp: Sat 2007-04-14 03:51:44 +0100
message:
Add a working-trees help topic.
Has both some general information and specifics about dealing with remote
working trees. Because of that change the remote tree warning message to point
to it. Hopefully that will give users a starting point for deciding how to
cope with that situation.
------------------------------------------------------------
revno: 2052.1.349.2.1
revision-id: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.repos
timestamp: Sat 2007-04-14 02:02:44 +0100
message:
Add a help topic for repositories.
------------------------------------------------------------
revno: 2052.1.439
revision-id: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 14:09:59 +0100
message:
(Kent Gibson) Update the LogFormatter API to use a LogRevision object.
------------------------------------------------------------
revno: 2052.1.438.1.4
revision-id: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
parent: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:42:24 -0500
message:
Update bzrlib.log.show_changed_revisions to use the new api
------------------------------------------------------------
revno: 2052.1.438.1.3
revision-id: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
parent: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:19:25 -0500
message:
Restore the test for iter_log_data as a deprecated function.
------------------------------------------------------------
revno: 2052.1.438.1.2
revision-id: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
parent: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:13:06 -0500
message:
Cleanup according to PEP8 and some other small whitespace fixes
------------------------------------------------------------
revno: 2052.1.438.1.1
revision-id: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 06:54:07 -0500
message:
[merge] Kent Gibson: Rework LogFormatter API
------------------------------------------------------------
revno: 2052.1.414.8.2
revision-id: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lf_rework
timestamp: Mon 2007-05-07 19:51:28 +0800
message:
Move begin/end calls from _show_log to show_log. Fix long line.
------------------------------------------------------------
revno: 2052.1.414.8.1
revision-id: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Sun 2007-04-29 11:46:30 +0800
message:
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
Fixed minor inconsistency between display of revids in mainline and merge revisions in long log format. Both now labelled "revision-id:" and are only displayed when --show-ids is specified.
------------------------------------------------------------
revno: 2052.1.438
revision-id: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
parent: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-23 10:51:10 +0100
message:
(Robert Collins) Document TreeBuilder, and do some cleanup.
------------------------------------------------------------
revno: 2052.1.436.1.2
revision-id: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-23 04:07:35 -0500
message:
(Robert Collins) Document TreeBuilder, and do some cleanup.
------------------------------------------------------------
revno: 2052.1.414.7.2
revision-id: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
parent: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 10:36:20 +1000
message:
Document the user of TreeBuilder somewhat.
------------------------------------------------------------
revno: 2052.1.414.7.1
revision-id: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 10:18:15 +1000
message:
Tree builder tests do not need a working dir.
------------------------------------------------------------
revno: 2052.1.437
revision-id: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-23 10:22:20 +0100
message:
(Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
------------------------------------------------------------
revno: 2052.1.436.1.1
revision-id: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-23 03:54:14 -0500
message:
(Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
------------------------------------------------------------
revno: 2052.1.409.1.2
revision-id: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
parent: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 110204
timestamp: Thu 2007-04-26 22:52:43 +0200
message:
Take jam's remark into account.
* bzrlib/ui/__init__.py:
(CLIUIFactory.get_non_echoed_password): Better to use
osutils.get_terminal_encoding() !
------------------------------------------------------------
revno: 2052.1.409.1.1
revision-id: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
parent: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 110204
timestamp: Thu 2007-04-26 10:16:29 +0200
message:
Fix 110204 by letting TestUIFactory encode password prompt.
* bzrlib/ui/__init__.py:
(CLIUIFactory.get_non_echoed_password): Encode prompt with
sys.stdout.
(CLIUIFactory.get_password): Delegate prompt encoding to
get_non_echoed_password.
* bzrlib/tests/__init__.py:
(TestUIFactory.get_non_echoed_password): Encode prompt with
self.stdout.
------------------------------------------------------------
revno: 2052.1.436
revision-id: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
parent: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-21 16:24:46 +0100
message:
Better error for selected-file commit of merges
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.9
revision-id: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
parent: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-05-21 10:14:36 -0400
message:
Better error for selected-file commit of merges
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.8
revision-id: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-05-21 10:09:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.435
revision-id: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-17 18:42:05 +0100
message:
(Klaus Hartke) Remove duplicate line in commit.py
------------------------------------------------------------
revno: 2052.1.434.1.1
revision-id: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-17 17:55:10 +0100
message:
(Klaus Hartke) Remove duplicate line in commit.py
------------------------------------------------------------
revno: 2052.1.434.2.1
revision-id: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
committer: Klaus Hartke <klaus.hartke at googlemail.com>
branch nick: bzr.klaus
timestamp: Thu 2007-05-17 17:07:49 +0200
message:
Removed duplicate line.
------------------------------------------------------------
revno: 2052.1.434
revision-id: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-16 19:30:55 +0100
message:
(mbp,r=john) add CountedLock class
------------------------------------------------------------
revno: 2052.1.423.4.1
revision-id: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: counted-lock
timestamp: Thu 2007-05-03 00:00:53 +1000
message:
Start adding CountedLock class to partially replace LockableFiles
------------------------------------------------------------
revno: 2052.1.433
revision-id: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
parent: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-10 06:55:01 +0100
message:
(robertc) Move HACKING to doc/developers/HACKING and start on performance analysis documentation. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.429.1.5
revision-id: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
parent: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-05-10 01:36:06 +1000
message:
Incremental push-pull performance anlysis draft.
------------------------------------------------------------
revno: 2052.1.429.1.4
revision-id: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
parent: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 14:14:01 +1000
message:
Fix the developer documentation to use the right style sheet and give it its own index. (Robert Collins, Alexander Belchenko)
------------------------------------------------------------
revno: 2052.1.429.1.3
revision-id: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
parent: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 03:49:30 +1000
message:
Add the performance roadmap rationale.
------------------------------------------------------------
revno: 2052.1.429.1.2
revision-id: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
parent: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 03:04:12 +1000
message:
NEWS entry for HACKING relocation.
------------------------------------------------------------
revno: 2052.1.429.1.1
revision-id: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 02:48:14 +1000
message:
Move HACKING to docs/developers/HACKING and adjust Makefile to accomodate this.
------------------------------------------------------------
revno: 2052.1.432
revision-id: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: john at arbash-meinel.com-20070508200344-p77ycd72josdljry
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-05-08 21:32:56 +0100
message:
(John Arbash Meinel) Merge fixes from 0.16 into bzr.dev and update for 0.17 development
------------------------------------------------------------
revno: 2052.1.431.1.2
revision-id: john at arbash-meinel.com-20070508200344-p77ycd72josdljry
parent: john at arbash-meinel.com-20070508200050-4imwmtzep8fx5v7w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-05-08 15:03:44 -0500
message:
Updates for bzr-0.17-dev
------------------------------------------------------------
revno: 2052.1.431.1.1
revision-id: john at arbash-meinel.com-20070508200050-4imwmtzep8fx5v7w
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: mbp at sourcefrog.net-20070507131140-iajs5she7cy0pbst
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-05-08 15:00:50 -0500
message:
Merge the 0.16 release fixes back into bzr.dev
------------------------------------------------------------
revno: 2052.1.425.1.13
revision-id: mbp at sourcefrog.net-20070507131140-iajs5she7cy0pbst
parent: mbp at sourcefrog.net-20070507131058-7yoc6xajos30hjt0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Mon 2007-05-07 23:11:40 +1000
message:
merge hpss compatibility fix
------------------------------------------------------------
revno: 2052.1.425.1.12
revision-id: mbp at sourcefrog.net-20070507131058-7yoc6xajos30hjt0
parent: mbp at sourcefrog.net-20070507122424-floh4b3kgzg5vgo3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Mon 2007-05-07 23:10:58 +1000
message:
Preparing 0.16 release
------------------------------------------------------------
revno: 2052.1.425.1.11
revision-id: mbp at sourcefrog.net-20070507122424-floh4b3kgzg5vgo3
parent: mbp at sourcefrog.net-20070507120459-ihx998ls87g6qqon
parent: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:24:24 +1000
message:
Resolve NEWS against 0.16 branch
------------------------------------------------------------
revno: 2052.1.411.1.2
revision-id: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.16
timestamp: Mon 2007-04-30 08:33:11 +0100
message:
(robertc) bzr 0.16rc: incorporate the relatively trivial fixes from bzr.dev.
------------------------------------------------------------
revno: 2052.1.411.1.1.1.1
revision-id: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.16
timestamp: Mon 2007-04-30 16:58:22 +1000
message:
Merge incremental improvements from bzr.dev to create bzr 0.16rc2
------------------------------------------------------------
revno: 2052.1.411.1.1
revision-id: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Thu 2007-04-26 20:58:38 +1000
message:
Prepare 0.16rc1
------------------------------------------------------------
revno: 2052.1.425.1.10
revision-id: mbp at sourcefrog.net-20070507120459-ihx998ls87g6qqon
parent: mbp at sourcefrog.net-20070507120314-a2h78bjezemwyl17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:04:59 +1000
message:
Note about fixing bug 111968
------------------------------------------------------------
revno: 2052.1.425.1.9
revision-id: mbp at sourcefrog.net-20070507120314-a2h78bjezemwyl17
parent: mbp at sourcefrog.net-20070504105649-fv0fqgrnq5ojvjdl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:03:14 +1000
message:
Review cleanups from John, mostly docs
------------------------------------------------------------
revno: 2052.1.425.1.8
revision-id: mbp at sourcefrog.net-20070504105649-fv0fqgrnq5ojvjdl
parent: mbp at sourcefrog.net-20070504104131-9zq53xhbxtri3jl3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:56:49 +1000
message:
Remove dead parameter
------------------------------------------------------------
revno: 2052.1.425.1.7
revision-id: mbp at sourcefrog.net-20070504104131-9zq53xhbxtri3jl3
parent: mbp at sourcefrog.net-20070504101317-n1h3roy8lv7e06ng
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:41:31 +1000
message:
test_transport must provide get_test_permutations
------------------------------------------------------------
revno: 2052.1.425.1.6
revision-id: mbp at sourcefrog.net-20070504101317-n1h3roy8lv7e06ng
parent: mbp at sourcefrog.net-20070504100117-p3bksdrvjjnoz6qi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:13:17 +1000
message:
doc
------------------------------------------------------------
revno: 2052.1.425.1.5
revision-id: mbp at sourcefrog.net-20070504100117-p3bksdrvjjnoz6qi
parent: mbp at sourcefrog.net-20070504095119-sxlhgb1tmxjflj09
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:01:17 +1000
message:
More cleanups of Branch.push to get the right behaviour with RemoteBranches
Pass in an _override_hook_source_branch
------------------------------------------------------------
revno: 2052.1.425.1.4
revision-id: mbp at sourcefrog.net-20070504095119-sxlhgb1tmxjflj09
parent: mbp at sourcefrog.net-20070504093112-f1z86tjzulf1lz95
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 19:51:19 +1000
message:
fix up indenting in pformat of inequalities displayed by test suite
------------------------------------------------------------
revno: 2052.1.425.1.3
revision-id: mbp at sourcefrog.net-20070504093112-f1z86tjzulf1lz95
parent: mbp at sourcefrog.net-20070504084639-8v8mzetmr1y74xer
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 19:31:12 +1000
message:
More refactoring of Branch.push into smaller bits
------------------------------------------------------------
revno: 2052.1.425.1.2
revision-id: mbp at sourcefrog.net-20070504084639-8v8mzetmr1y74xer
parent: mbp at sourcefrog.net-20070503080000-joirold1vv0dndgs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 18:46:39 +1000
message:
Rename push/pull back to 'run_hooks' (jameinel)
Reorganize Branch.push into some template methods: public push,
_push_with_bound_branches, and _basic_push. This fixes the case
where the destination of push is bound, but the source branch
format doesn't support binding.
Run push and pull hook tests with a local branch that does support binding,
rather than skipping if the branch can't be bound to another of the same
format.
(broken) because the hooks are given the wrong parameters when
pushing into something bound to a remote branch.
------------------------------------------------------------
revno: 2052.1.425.1.1
revision-id: mbp at sourcefrog.net-20070503080000-joirold1vv0dndgs
parent: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Thu 2007-05-03 18:00:00 +1000
message:
Add RemoteBranch repr
------------------------------------------------------------
revno: 2052.1.431
revision-id: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 18:50:17 +0100
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2052.1.430.1.1
revision-id: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-05-08 02:55:17 +1000
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2052.1.430
revision-id: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 14:42:18 +0100
message:
(robertc) Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers. (Andrew Bennetts)
------------------------------------------------------------
revno: 2052.1.419.2.1
revision-id: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-0.11-compat
timestamp: Mon 2007-04-30 16:42:24 +1000
message:
Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers.
------------------------------------------------------------
revno: 2052.1.429
revision-id: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
parent: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-04 04:45:56 +0100
message:
(John Arbash Meinel) make 'install_bundle' significantly faster by only validating the revisions 1 time, rather than validating all revisions n times.
------------------------------------------------------------
revno: 2052.1.424.2.1
revision-id: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: install_bundle_performance
timestamp: Thu 2007-05-03 11:42:30 -0500
message:
Vastly improve bundle install performance by only validating the bundle one time
------------------------------------------------------------
revno: 2052.1.428
revision-id: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
parent: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
parent: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 20:49:12 +0100
message:
(John Arbash Meinel) Add doc/shared_repository_layouts.txt
------------------------------------------------------------
revno: 2052.1.424.1.1
revision-id: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shared_repo_layouts
timestamp: Wed 2007-05-02 10:21:16 -0500
message:
Add shared_repository_layouts.txt as a core document.
------------------------------------------------------------
revno: 2052.1.427
revision-id: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
parent: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
parent: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 20:22:18 +0100
message:
(John Arbash Meinel) Fix bug #75721: 'bzr push' should only connect a single time.
------------------------------------------------------------
revno: 2052.1.423.3.3
revision-id: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
parent: john at arbash-meinel.com-20070502143655-id25373m3lgue8ke
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Wed 2007-05-02 09:54:20 -0500
message:
Change calls to try/mkdir('.')/except FileExists to ensure_base()
------------------------------------------------------------
revno: 2052.1.423.3.2
revision-id: john at arbash-meinel.com-20070502143655-id25373m3lgue8ke
parent: john at arbash-meinel.com-20070501224141-23intuz4dabm0j73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Wed 2007-05-02 09:36:55 -0500
message:
Add Transport.ensure_base()
------------------------------------------------------------
revno: 2052.1.423.3.1
revision-id: john at arbash-meinel.com-20070501224141-23intuz4dabm0j73
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Tue 2007-05-01 17:41:41 -0500
message:
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
This allows us to pass around a Transport which we already have open
rather calling get_transport(url).
This is mostly noticeable in 'bzr push' which was connecting 3-4 times.
------------------------------------------------------------
revno: 2052.1.426
revision-id: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
parent: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
parent: bialix at ukr.net-20070501090918-km46cslj820tiyzl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 10:47:32 +0100
message:
(bialix,r=john,martin) Bugfix #110901: commit message template written
with native line-endings; corresponding unit tests added
------------------------------------------------------------
revno: 2052.1.420.4.2
revision-id: bialix at ukr.net-20070501090918-km46cslj820tiyzl
parent: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Tue 2007-05-01 12:09:18 +0300
message:
unwrapping long lines in tests
------------------------------------------------------------
revno: 2052.1.420.4.1
revision-id: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Mon 2007-04-30 22:52:44 +0300
message:
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
------------------------------------------------------------
revno: 2052.1.425
revision-id: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
parent: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 07:49:43 +0100
message:
Integrated developer guide cleanups
------------------------------------------------------------
revno: 2052.1.423.2.4
revision-id: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
parent: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:21:49 +1000
message:
HACKING rest fixes from jam
------------------------------------------------------------
revno: 2052.1.423.2.3
revision-id: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
parent: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
parent: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:19:11 +1000
message:
Merge ian's HACKING updates
------------------------------------------------------------
revno: 2052.1.414.6.3
revision-id: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
parent: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Wed 2007-05-02 14:43:27 +1000
message:
Incorporate feedback from Aaron B. & Alex B.
------------------------------------------------------------
revno: 2052.1.414.6.2
revision-id: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
parent: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Mon 2007-04-30 18:10:33 +1000
message:
Incorporate feedback from LarstiQ
------------------------------------------------------------
revno: 2052.1.414.6.1
revision-id: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Sat 2007-04-28 01:03:19 +1000
message:
Expand HACKING into Bazaar Developer Guide
------------------------------------------------------------
revno: 2052.1.423.2.2
revision-id: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
parent: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:13:00 +1000
message:
Clarify TestSkipped
------------------------------------------------------------
revno: 2052.1.423.2.1
revision-id: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-05-02 21:33:16 +1000
message:
Description of how to use TestSkipped, test features, etc
------------------------------------------------------------
revno: 2052.1.424
revision-id: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
parent: mbp at sourcefrog.net-20070502120036-ap7wytspwly1p00k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-02 13:51:59 +0100
message:
Rename test_plugin tests and the example module used there.
------------------------------------------------------------
revno: 2052.1.423.1.1
revision-id: mbp at sourcefrog.net-20070502120036-ap7wytspwly1p00k
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-05-02 22:00:36 +1000
message:
Rename test_plugin tests and the example module used there.
------------------------------------------------------------
revno: 2052.1.423
revision-id: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
parent: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
parent: john at arbash-meinel.com-20070430174510-qdteh5dy45gbj785
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-05-01 19:27:14 +0100
message:
(John Arbash Meinel) Fix bug #111127 and bug #111288. WT4._iter_changes had difficulties with directories with '-', and filesystem renames.
------------------------------------------------------------
revno: 2052.1.420.2.2
revision-id: john at arbash-meinel.com-20070430174510-qdteh5dy45gbj785
parent: john at arbash-meinel.com-20070430174107-jec5pf7b63kc2uj9
parent: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_fixes
timestamp: Mon 2007-04-30 12:45:10 -0500
message:
[merge] bugfix for bug #111288, resolve conflicts.
------------------------------------------------------------
revno: 2052.1.420.3.2
revision-id: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
parent: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:34:12 -0500
message:
Now that finding a file on disk which doesn't match
the dirblock doesn't claim 'path_handled', it is identical
to the case when the dirblock entry is marked as 'a' or 'r'.
So remove the extra else clause for simplicity.
------------------------------------------------------------
revno: 2052.1.420.3.1
revision-id: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:29:39 -0500
message:
Fix bug #111288. When we don't have a match
don't consider the disk file processed. Because we need to
emit an 'unknown' record for it.
------------------------------------------------------------
revno: 2052.1.420.2.1
revision-id: john at arbash-meinel.com-20070430174107-jec5pf7b63kc2uj9
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
parent: john at arbash-meinel.com-20070430170541-pdh0k81zpedgjl70
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_fixes
timestamp: Mon 2007-04-30 12:41:07 -0500
message:
[merge] fix for bug #111127
------------------------------------------------------------
revno: 2052.1.414.5.4
revision-id: john at arbash-meinel.com-20070430170541-pdh0k81zpedgjl70
parent: john at arbash-meinel.com-20070430162558-f040stduyrfflef9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 12:05:41 -0500
message:
Fix bug #11127 by splitting paths on '/'.
This adds a bit of overhead when paths don't match.
So conceptually we might want to cache the split value,
or return it from the underlying iterator.
However, we only need it when the current iterators don't match
so most of the time a simple 'x == y' is sufficient, since
equality is correct with or without the split().
So the computational overhead should be fine.
------------------------------------------------------------
revno: 2052.1.414.5.3
revision-id: john at arbash-meinel.com-20070430162558-f040stduyrfflef9
parent: john at arbash-meinel.com-20070430162242-3gds64wynnny2t57
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:25:58 -0500
message:
[merge] bzr.dev 2472
------------------------------------------------------------
revno: 2052.1.414.5.2
revision-id: john at arbash-meinel.com-20070430162242-3gds64wynnny2t57
parent: john at arbash-meinel.com-20070430160855-z8zh7eb7r629ch6g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:22:42 -0500
message:
Extend the test a bit to make sure the include_unchanged value is correct.
still (broken)
------------------------------------------------------------
revno: 2052.1.414.5.1
revision-id: john at arbash-meinel.com-20070430160855-z8zh7eb7r629ch6g
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:08:55 -0500
message:
Add a (failing) test for bug 111127
------------------------------------------------------------
revno: 2052.1.422
revision-id: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
parent: pqm at pqm.ubuntu.com-20070430214656-2i2yfs1byf8ay10a
parent: john at arbash-meinel.com-20070430220441-wt7s23q3s2y2sg57
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 23:32:05 +0100
message:
(John Arbash Meinel) Change aliases: help text to be on one line.
------------------------------------------------------------
revno: 2052.1.420.1.2
revision-id: john at arbash-meinel.com-20070430220441-wt7s23q3s2y2sg57
parent: john at arbash-meinel.com-20070430210334-a543p33oz62yo26k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-04-30 17:04:41 -0500
message:
Fix the one test that depended on 'aliases:\n'
------------------------------------------------------------
revno: 2052.1.420.1.1
revision-id: john at arbash-meinel.com-20070430210334-a543p33oz62yo26k
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-04-30 16:03:34 -0500
message:
(John Arbash Meinel) Change aliases: help text to be on one line.
------------------------------------------------------------
revno: 2052.1.421
revision-id: pqm at pqm.ubuntu.com-20070430214656-2i2yfs1byf8ay10a
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
parent: bialix at ukr.net-20070430184234-mq53cwwtaj2sf9v4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 22:46:56 +0100
message:
(bialix,r=john) `make copy-docs` should also copy doc/HACKING.htm
------------------------------------------------------------
revno: 2052.1.404.3.2
revision-id: bialix at ukr.net-20070430184234-mq53cwwtaj2sf9v4
parent: bialix at ukr.net-20070427090646-ozqshfjltumwxwlw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Mon 2007-04-30 21:42:34 +0300
message:
indenting
------------------------------------------------------------
revno: 2052.1.404.3.1
revision-id: bialix at ukr.net-20070427090646-ozqshfjltumwxwlw
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Fri 2007-04-27 12:06:46 +0300
message:
`make copy-docs` should also copy doc/HACKING.htm (for win32 standalone installer)
------------------------------------------------------------
revno: 2052.1.420
revision-id: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
parent: robertc at robertcollins.net-20070430074855-5a5tun52hdc991ue
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 09:31:58 +0100
message:
0.16rc2 has been released.
------------------------------------------------------------
revno: 2052.1.419.1.1
revision-id: robertc at robertcollins.net-20070430074855-5a5tun52hdc991ue
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 17:48:55 +1000
message:
0.16rc2 has been released.
------------------------------------------------------------
revno: 2052.1.419
revision-id: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
parent: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
parent: robertc at robertcollins.net-20070430051358-8cp7kvp1q0tqhxx0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 06:44:16 +0100
message:
(robertc) ``WorkingTree4._iter_changes`` should not descend into unversioned directories. (John Arbash Meinel, #110399)
------------------------------------------------------------
revno: 2052.1.414.4.4
revision-id: robertc at robertcollins.net-20070430051358-8cp7kvp1q0tqhxx0
parent: john at arbash-meinel.com-20070426230146-ip22905t91xhkjs9
parent: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 15:13:58 +1000
message:
Merge Johns fix for bug 110399.
------------------------------------------------------------
revno: 2052.1.414.4.3
revision-id: john at arbash-meinel.com-20070426230146-ip22905t91xhkjs9
parent: john at arbash-meinel.com-20070426225601-ae4qfcb8bzcfomny
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 18:01:46 -0500
message:
Fix bug #110399 by changing _iter_changes to never descend into unknown directories.
There was a bug when a versioned directory had no versioned children.
It would descend into all unknown subdirs.
This was originally fixed when 'want_unchanged=True', but now it is
also fixed when 'want_unchanged=False'.
We really should have an intertree test for this, but to detect
descent, we spy on walkdirs, which WT3 doesn't use.
------------------------------------------------------------
revno: 2052.1.414.4.2
revision-id: john at arbash-meinel.com-20070426225601-ae4qfcb8bzcfomny
parent: john at arbash-meinel.com-20070426224632-6nrmxl1kfbji3c63
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 17:56:01 -0500
message:
Clean up the (failing) test so that the last thing
to fail is what I'm fixing.
------------------------------------------------------------
revno: 2052.1.414.4.1
revision-id: john at arbash-meinel.com-20070426224632-6nrmxl1kfbji3c63
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 17:46:32 -0500
message:
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
------------------------------------------------------------
revno: 2052.1.418
revision-id: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
parent: pqm at pqm.ubuntu.com-20070430040006-olr7xpzdbp02y1sd
parent: robertc at robertcollins.net-20070430034851-aik2bzpubf44oyjc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 05:29:00 +0100
message:
(robertc) Properly compare filesystem paths with absent and renamed entries. (John Arbash Meinel, #110256)
------------------------------------------------------------
revno: 2052.1.413.1.4
revision-id: robertc at robertcollins.net-20070430034851-aik2bzpubf44oyjc
parent: john at arbash-meinel.com-20070426211345-fh5tuoii9mb7w15a
parent: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 13:48:51 +1000
message:
Merge Johns fix for bug 110256.
------------------------------------------------------------
revno: 2052.1.413.1.3
revision-id: john at arbash-meinel.com-20070426211345-fh5tuoii9mb7w15a
parent: john at arbash-meinel.com-20070426211150-q67uvpdf3os770u2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 16:13:45 -0500
message:
NEWS entry for fixing bug #110256
------------------------------------------------------------
revno: 2052.1.413.1.2
revision-id: john at arbash-meinel.com-20070426211150-q67uvpdf3os770u2
parent: john at arbash-meinel.com-20070426204553-sfw4mo98pxggdrfm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 16:11:50 -0500
message:
Alternate fix for 'absent' entries.
This also handles 'renamed' entries properly.
Basically, when we get a path which happens to match a dirstate entry
check to see if the entry is considered 'live'.
If it isn't, then we treat it as a non-match, which allows
later checks to properly handle the file on disk.
------------------------------------------------------------
revno: 2052.1.413.1.1
revision-id: john at arbash-meinel.com-20070426204553-sfw4mo98pxggdrfm
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 15:45:53 -0500
message:
Add a (failing) test exposing the bug in _iter_changes
If you bzr mv a => b, and then bzr add a (for a new a), bzr can get
confused as to the state of 'a'.
------------------------------------------------------------
revno: 2052.1.417
revision-id: pqm at pqm.ubuntu.com-20070430040006-olr7xpzdbp02y1sd
parent: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
parent: andrew.bennetts at canonical.com-20070427021911-pk1ylmrmc1ueo9ad
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 05:00:06 +0100
message:
(Andrew Bennetts) Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
------------------------------------------------------------
revno: 2052.1.414.3.1
revision-id: andrew.bennetts at canonical.com-20070427021911-pk1ylmrmc1ueo9ad
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: normalize-remote-http-urls
timestamp: Fri 2007-04-27 12:19:11 +1000
message:
Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
------------------------------------------------------------
revno: 2052.1.416
revision-id: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
parent: pqm at pqm.ubuntu.com-20070430022343-wnbvslzfz6fpyyj7
parent: andrew.bennetts at canonical.com-20070430022545-iubud5mcxc1mdsw9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 03:59:42 +0100
message:
(Andrew Bennetts) Fix incompatibility with < 0.16 smart servers.
------------------------------------------------------------
revno: 2052.1.414.2.4
revision-id: andrew.bennetts at canonical.com-20070430022545-iubud5mcxc1mdsw9
parent: andrew.bennetts at canonical.com-20070430020406-9vvmb4f9x8bdmvv8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:25:45 +1000
message:
Tweaks asked for by Robert.
------------------------------------------------------------
revno: 2052.1.414.2.3
revision-id: andrew.bennetts at canonical.com-20070430020406-9vvmb4f9x8bdmvv8
parent: andrew.bennetts at canonical.com-20070430020205-ensbvu0t14yb3tk4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:04:06 +1000
message:
Remove another XXX.
------------------------------------------------------------
revno: 2052.1.414.2.2
revision-id: andrew.bennetts at canonical.com-20070430020205-ensbvu0t14yb3tk4
parent: andrew.bennetts at canonical.com-20070427030144-vz2vna1t31ymdgz9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:02:05 +1000
message:
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
------------------------------------------------------------
revno: 2052.1.414.2.1
revision-id: andrew.bennetts at canonical.com-20070427030144-vz2vna1t31ymdgz9
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Fri 2007-04-27 13:01:44 +1000
message:
Fix incompatibility with < 0.16 smart servers.
------------------------------------------------------------
revno: 2052.1.415
revision-id: pqm at pqm.ubuntu.com-20070430022343-wnbvslzfz6fpyyj7
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
parent: robertc at robertcollins.net-20070430014939-mjnji1bq7zulpjlv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 03:23:43 +0100
message:
(robertc) Fix the bzr commit message to be in text mode. (Alexander Belchenko)
------------------------------------------------------------
revno: 2052.1.414.1.1
revision-id: robertc at robertcollins.net-20070430014939-mjnji1bq7zulpjlv
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 11:49:39 +1000
message:
Fix the bzr commit message to be in text mode. (Alexander Belchenko)
------------------------------------------------------------
revno: 2052.1.414
revision-id: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
parent: john at arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 22:11:03 +0100
message:
(John Arbash Meinel) Fix bug #109613 by teaching Bundle how to properly read/write revision properties with no value.
------------------------------------------------------------
revno: 2052.1.395.1.7
revision-id: john at arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
parent: john at arbash-meinel.com-20070426145512-xnda2pxcpfa86yld
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Thu 2007-04-26 13:53:33 -0500
message:
[merge] bzr.dev 2465
------------------------------------------------------------
revno: 2052.1.395.1.6
revision-id: john at arbash-meinel.com-20070426145512-xnda2pxcpfa86yld
parent: john at arbash-meinel.com-20070425175514-il068rykvdulkm2k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Thu 2007-04-26 09:55:12 -0500
message:
NEWS update for fixing bug #109613
------------------------------------------------------------
revno: 2052.1.395.1.5
revision-id: john at arbash-meinel.com-20070425175514-il068rykvdulkm2k
parent: john at arbash-meinel.com-20070425174944-mti4294wv55nimd3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 12:55:14 -0500
message:
NEWS
------------------------------------------------------------
revno: 2052.1.395.1.4
revision-id: john at arbash-meinel.com-20070425174944-mti4294wv55nimd3
parent: john at arbash-meinel.com-20070425165625-d2act28kmjn5avel
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 12:49:44 -0500
message:
Add a test that we properly round-trip unicode properties.
And fix the (unreported) bug :)
------------------------------------------------------------
revno: 2052.1.395.1.3
revision-id: john at arbash-meinel.com-20070425165625-d2act28kmjn5avel
parent: john at arbash-meinel.com-20070425164125-nr7pmz4tfp5qkze2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 11:56:25 -0500
message:
Change the default serializer to include a trailing whitespace for empty properties.
This means that new bundles can be read by old versions of bzr
(though they cannot read their own).
On the flip side, the new bzr can read old outputs correctly.
------------------------------------------------------------
revno: 2052.1.395.1.2
revision-id: john at arbash-meinel.com-20070425164125-nr7pmz4tfp5qkze2
parent: john at arbash-meinel.com-20070425143231-wy5jkw8g9tr471ji
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 11:41:25 -0500
message:
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
And fix the reader to handle the ':\n' case.
------------------------------------------------------------
revno: 2052.1.395.1.1
revision-id: john at arbash-meinel.com-20070425143231-wy5jkw8g9tr471ji
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 09:32:31 -0500
message:
For stability and ease of testing, write properties in sorted order.
This doesn't really change the bundle format, since we read the
properties into a dictionary, so their position in the file doesn't
matter. Plus the Revision xml serializer also writes them in sorted
order.
------------------------------------------------------------
revno: 2052.1.413
revision-id: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 19:19:28 +0100
message:
(John Arbash Meinel, trivial) Clean up NEWS to conform to reST syntax
------------------------------------------------------------
revno: 2052.1.412.1.2
revision-id: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
parent: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:52:32 -0500
message:
Cleanup NEWS in accordance with rst formatting rules.
Wrap explicit text with ``foo`` when reasonable (especially if we have an underscore
or other rst meta character).
Also, reformat attributions to be (User Name, #bugnumber), prefering not to wrap.
------------------------------------------------------------
revno: 2052.1.412.1.1
revision-id: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:05:04 -0500
message:
Move NEWS entry for 109993 to IN DEVELOPMENT rather than 0.16rc1
------------------------------------------------------------
revno: 2052.1.412
revision-id: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
parent: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 16:39:04 +0100
message:
(John Arbash Meinel) Fix bug #109993 by fixing _iter_changes to not sync an on-disk file with an 'absent' dirblock record.
------------------------------------------------------------
revno: 2052.1.404.2.6
revision-id: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
parent: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Thu 2007-04-26 09:44:01 -0500
message:
[merge] bzr.dev 2463
------------------------------------------------------------
revno: 2052.1.404.2.5
revision-id: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:45:55 -0500
message:
Make sure the output with want_unversioned=False is reasonable.
------------------------------------------------------------
revno: 2052.1.404.2.4
revision-id: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
parent: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:10:45 -0500
message:
NEWS entry for fixing bug 109993
------------------------------------------------------------
revno: 2052.1.404.2.3
revision-id: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
parent: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:07:09 -0500
message:
Tests now pass
------------------------------------------------------------
revno: 2052.1.404.2.2
revision-id: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
parent: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 16:54:14 -0500
message:
Add another (failing) test case.
If we unversion a file, but it is still on disk
we should get 2 records from _iter_changes
one to indicate the removal
the other to indicate the unknown file on disk
------------------------------------------------------------
revno: 2052.1.404.2.1
revision-id: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 13:41:56 -0500
message:
(broken) Add a (failing) test that _iter_changes works correctly
in the case that you delete a file, and rename another file overtop.
(Dirstate currently has a chance to report the renamed file as deleted
if the rename goes to a name which sorts first in the list.)
------------------------------------------------------------
revno: 2052.1.411
revision-id: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
parent: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
parent: v.ladeuil+lp at free.fr-20070426090738-3n4pmuhuwqxr05fj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 11:41:48 +0100
message:
http authentication and other integrated fixes
------------------------------------------------------------
revno: 2052.1.368.1.22
revision-id: v.ladeuil+lp at free.fr-20070426090738-3n4pmuhuwqxr05fj
parent: v.ladeuil+lp at free.fr-20070426090146-jbwl0muvk76wlw6c
parent: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 11:07:38 +0200
message:
Merge bzr.dev, resolving trivila conflicts in bzrlib/smart/repository.py
------------------------------------------------------------
revno: 2052.1.368.1.21
revision-id: v.ladeuil+lp at free.fr-20070426090146-jbwl0muvk76wlw6c
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 11:01:46 +0200
message:
Merge spiv modifications
------------------------------------------------------------
revno: 2052.1.368.1.20.1.2
revision-id: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
parent: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 18:15:40 +1000
message:
Merge tarball branch that's already with PQM, resolving conflicts.
------------------------------------------------------------
revno: 2052.1.368.1.20.1.1
revision-id: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 17:54:56 +1000
message:
Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.7
revision-id: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
parent: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:45:12 +1000
message:
Merge in smart-transport-subpaths.
------------------------------------------------------------
revno: 2052.1.156.4.5
revision-id: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
parent: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:44:15 +1000
message:
Add NEWS entry about bzr+http change.
------------------------------------------------------------
revno: 2052.1.156.4.4
revision-id: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
parent: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:19:07 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2052.1.156.4.3
revision-id: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-01-04 16:26:12 +1100
message:
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
------------------------------------------------------------
revno: 2052.1.156.4.2
revision-id: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
parent: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 17:04:24 +1100
message:
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
------------------------------------------------------------
revno: 2052.1.156.4.1
revision-id: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 16:56:08 +1100
message:
normalize_url should normalise escaping of unreserved characters, like '~'.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.6
revision-id: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:14:36 +1000
message:
Fix a couple of test failures introduced by the previous merge.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.5
revision-id: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
parent: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:01:31 +1000
message:
Merge Robert's status prefix changes to protocol 2.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.7
revision-id: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
parent: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 23:01:22 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.6
revision-id: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
parent: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:50:50 +1000
message:
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.5
revision-id: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
parent: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:20:09 +1000
message:
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.4
revision-id: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
parent: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:07:30 +1000
message:
Merge hpss-protocol2.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.3
revision-id: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 21:32:14 +1000
message:
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.2
revision-id: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
parent: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:52:16 +1000
message:
Add FailedSmartServerResponse.
------------------------------------------------------------
revno: 2052.1.380.2.2.1.1
revision-id: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:40:22 +1000
message:
Add SuccessfulSmartServerResponse.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.4
revision-id: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 15:49:56 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.3
revision-id: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 15:56:50 +1000
message:
Update comment according to Martin's suggestion.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.2
revision-id: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
parent: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 04:12:38 +1000
message:
Add test, and tidy implementation.
------------------------------------------------------------
revno: 2052.1.380.2.6.1.1
revision-id: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Tue 2007-04-24 20:25:46 +1000
message:
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
------------------------------------------------------------
revno: 2052.1.368.1.20
revision-id: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: v.ladeuil+lp at free.fr-20070424100523-3odqlqm2nnoc8gdu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 09:21:24 +0200
message:
Fix test failure on pqm.
* bzrlib/tests/test_http.py:
(TestAuth.setUp): Overrides sys.stdout, TestUIFactory will not do
it for us and the tests fail on pqm otherwise.
(TestAuth.test_prompt_for_password): No need to provide stdout
parameter anymore.
------------------------------------------------------------
revno: 2052.1.368.1.19
revision-id: v.ladeuil+lp at free.fr-20070424100523-3odqlqm2nnoc8gdu
parent: v.ladeuil+lp at free.fr-20070424095159-pnxwqfn1og3bqg5e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 12:05:23 +0200
message:
Cosmetic changes.
------------------------------------------------------------
revno: 2052.1.368.1.18
revision-id: v.ladeuil+lp at free.fr-20070424095159-pnxwqfn1og3bqg5e
parent: v.ladeuil+lp at free.fr-20070424094954-k60h58nkwrf09l94
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 11:51:59 +0200
message:
merge bzr.dev at 2450
------------------------------------------------------------
revno: 2052.1.368.1.17
revision-id: v.ladeuil+lp at free.fr-20070424094954-k60h58nkwrf09l94
parent: v.ladeuil+lp at free.fr-20070422163204-7iksk91jy9091nex
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 11:49:54 +0200
message:
Update NEWS.
------------------------------------------------------------
revno: 2052.1.368.1.16
revision-id: v.ladeuil+lp at free.fr-20070422163204-7iksk91jy9091nex
parent: v.ladeuil+lp at free.fr-20070422110259-dx0e5do9dzzf0qjt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 18:32:04 +0200
message:
Handle nonce changes. Fix a nasty bug breaking the auth parameters sharing.
* bzrlib/tests/HTTPTestUtil.py:
(DigestAuthServer.digest_authorized): Check the nonce validity.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Always update auth parameters
after a request processing, they could change at any moment.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.update_auth): New method to track auth
modifications that should be lead to new authentications.
(AbstractAuthHandler.auth_required): Do not copy the auth
parameters but track the changes instead (copying breaks the auth
parameters sharing between cloned transports). Do not restrict the
auth 'identity' to be (user, realm, password) only.
(AbstractAuthHandler.auth_match): Document the auth parameter
update policy that MUST be respected to avoid retrying to
authenticate with wrong parameters, endlessly.
(AbstractAuthHandler.auth_successful): Not used anymore, but kept
in place if we ever want to handle the 'Authorization-Info' header.
------------------------------------------------------------
revno: 2052.1.368.1.15
revision-id: v.ladeuil+lp at free.fr-20070422110259-dx0e5do9dzzf0qjt
parent: v.ladeuil+lp at free.fr-20070422100132-98l662vmscalaiin
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 13:02:59 +0200
message:
Check digest robustness.
* bzrlib/tests/test_http.py:
(TestDigestAuth.test_changing_nonce): New robustness digest test.
------------------------------------------------------------
revno: 2052.1.368.1.14
revision-id: v.ladeuil+lp at free.fr-20070422100132-98l662vmscalaiin
parent: v.ladeuil+lp at free.fr-20070421213132-6ffsjiv1bf6tnfhq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sun 2007-04-22 12:01:32 +0200
message:
Tested against squid-2.6.5 with digest authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(DigestAuthHandler.build_auth_header): Only the request path
should appear in the uri. nc value should not be quoted for
squid (the devil is in the details...). Well, some cleaning
helped. Don't put algorithm in the header if none was specified by
the server.
------------------------------------------------------------
revno: 2052.1.368.1.13
revision-id: v.ladeuil+lp at free.fr-20070421213132-6ffsjiv1bf6tnfhq
parent: v.ladeuil+lp at free.fr-20070421212934-y3gyvd9pgs19sr7u
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 23:31:32 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.368.1.12
revision-id: v.ladeuil+lp at free.fr-20070421212934-y3gyvd9pgs19sr7u
parent: v.ladeuil+lp at free.fr-20070421203906-hta5jt0nmauyl9qy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 23:29:34 +0200
message:
Cometic changes.
------------------------------------------------------------
revno: 2052.1.368.1.11
revision-id: v.ladeuil+lp at free.fr-20070421203906-hta5jt0nmauyl9qy
parent: v.ladeuil+lp at free.fr-20070421113113-b0br4norqbtlx1o2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 22:39:06 +0200
message:
Implement digest authentication. Test suite passes. Tested against apache-2.x.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Do not attempt to
authenticate if we don't have a user. Rework the detection of
already tried authentications. Avoid building the auth header two
times, save the auth info at the right places.
(AbstractAuthHandler.build_auth_header): Add a request parameter
for digest needs.
(BasicAuthHandler.auth_match): Simplify.
(get_digest_algorithm_impls, DigestAuthHandler): Implements client
digest authentication. MD5 and SHA algorithms are supported. Only
'auth' qop is suppoted.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler): Renamed HTTPHandler
and ProxyAuthHandler respectively.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler,
HTTPDigestAuthHandler, ProxyDigestAuthHandler): New classes
implementing the combinations between (http, proxy) and (basic,
digest).
(Opener.__init__): No more handlers in comment ! One TODO less !
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): self.base is not suitable for an
auth uri, it can contain decorators.
* bzrlib/tests/test_http.py:
(TestAuth.test_no_user): New test to check the behavior with no
user when authentication is required.
* bzrlib/tests/HTTPTestUtil.py:
(DigestAuthRequestHandler.authorized): Delegate most of the work
to the server that control the needed persistent infos.
(AuthServer): Define an auth_relam attribute.
(DigestAuthServer): Implement a first version of digest
authentication. Only the MD5 algorithm and the 'auth' qop are
supported so far.
(HTTPAuthServer.init_http_auth): New method to simplify
the [http|proxy], [basic|digest] server combinations writing.
------------------------------------------------------------
revno: 2052.1.368.1.10
revision-id: v.ladeuil+lp at free.fr-20070421113113-b0br4norqbtlx1o2
parent: v.ladeuil+lp at free.fr-20070421092630-ty7a90wrx4v2x5k8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 13:31:13 +0200
message:
Doc fixes.
------------------------------------------------------------
revno: 2052.1.368.1.9
revision-id: v.ladeuil+lp at free.fr-20070421092630-ty7a90wrx4v2x5k8
parent: v.ladeuil+lp at free.fr-20070420113620-lawri7ftno7lbycw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Sat 2007-04-21 11:26:30 +0200
message:
Refactor proxy and auth test classes. Tests failing for digest auth.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required,
AbstractAuthHandler.auth_successful): Add response parameter as an
authentication scheme may need additional info provided only
there.
* bzrlib/tests/test_http.py:
(TestAuth, TestHTTPAuth, TestProxyAuth, TestHTTPBasicAuth,
TestHTTPProxyBasicAuth): Refactoring.
(TestHTTPDigestAuth, TestHTTPProxyDigestAuth): New classes for
digest authentication tests.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.translate_path): Handles request
proxying based on a server attribute.
(HttpServer): Add proxy_requests attribute.
* bzrlib/tests/HTTPTestUtil.py:
(ProxyServer): Replaces FakeProxyRequestHandler now that
HttpServer handles proxying based on a server attribute.
(AuthRequestHandler, BasicAuthRequestHandler, AuthServer,
HTTPAuthServer, ProxyAuthServer, HTTPBasicAuthServer,
ProxyBasicAuthServer): Refactoring Auth servers and request
handlers.
(HTTPDigestAuthServer, ProxyDigestAuthServer): New classes for
digest authentication.
------------------------------------------------------------
revno: 2052.1.368.1.8
revision-id: v.ladeuil+lp at free.fr-20070420113620-lawri7ftno7lbycw
parent: v.ladeuil+lp at free.fr-20070420112453-smx7l1dfilvozcqp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 13:36:20 +0200
message:
Interesting typo :-) A mix between capitalize, title and fuzzy may be...
------------------------------------------------------------
revno: 2052.1.368.1.7
revision-id: v.ladeuil+lp at free.fr-20070420112453-smx7l1dfilvozcqp
parent: v.ladeuil+lp at free.fr-20070420065059-oig56fr6u5yxeiob
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 13:24:53 +0200
message:
Tested against squid-2.6.5 with basic authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyBasicAuthHandler): Add realm in the prompt.
------------------------------------------------------------
revno: 2052.1.368.1.6
revision-id: v.ladeuil+lp at free.fr-20070420065059-oig56fr6u5yxeiob
parent: v.ladeuil+lp at free.fr-20070419172804-m3b5ayyfslh08vrr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Fri 2007-04-20 08:50:59 +0200
message:
Update NEWS to explain the intent of the modification. Also, use dicts
instead of tuples for auth parameters.
* bzrlib/transport/http/_urllib2_wrappers.py:
Use dicts for auth parameters.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Use dicts for auth parameters.
------------------------------------------------------------
revno: 2052.1.368.1.5
revision-id: v.ladeuil+lp at free.fr-20070419172804-m3b5ayyfslh08vrr
parent: v.ladeuil+lp at free.fr-20070418080816-ovy46d2gv7mzlr86
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-19 19:28:04 +0200
message:
Refactor http and proxy authentication. Tests passing. proxy password can be prompted too.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): New auth and proxy_auth attributes: tuples
with all the needed info). Should accept digest auth too.
(extract_authentication_uri): New function. Clearly define how we
define authentication uri for bzr.
(ProxyHandler.set_proxy): As HttpTransport_urllib.__init__,
extract auth info from env variables and leave the auth handlers
do the job.
(AbstractAuthHandler): Better abstraction of authentication,
handles auth errors and preventively set headers once the first
auth is successful.
(AbstractBasicAuthHandler): Specialization for basic scheme
authentication.
(HTTPBasicAuthHandler, ProxyBasicAuthHandler): Simplified, do not
rely on urllib2 anymore.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Use a tuple instead of different
attributes for scheme, user, password as we need two more
attributes (authuri and realm) for each auth (http and
proxy). And, yes, better handling of proxies (including prompting
user for a password).
(HttpTransport_urllib._ask_password): Deleted. _urllib2_wrappers
is handling that now.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.get_user_transport, TestHTTPProxyBasicAuth):
New method to build a different transport when proxying or not.
------------------------------------------------------------
revno: 2052.1.368.1.4
revision-id: v.ladeuil+lp at free.fr-20070418080816-ovy46d2gv7mzlr86
parent: v.ladeuil+lp at free.fr-20070417220718-kce3mj0wn8hi8m02
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Wed 2007-04-18 10:08:16 +0200
message:
Add test checking the number of roundtrips due to 401 or 407 errors.
* bzrlib/tests/test_http.py:
(TestHTTPAuth.test_empty_pass): Verifying the number of
authentication errors allows to count the 40[17] roundtrips.
* bzrlib/tests/HTTPTestUtil.py:
(AbstractBasicAuthRequestHandler.do_GET): Count the authentication
errors.
------------------------------------------------------------
revno: 2052.1.368.1.3
revision-id: v.ladeuil+lp at free.fr-20070417220718-kce3mj0wn8hi8m02
parent: v.ladeuil+lp at free.fr-20070417103339-3kywr38d0p50czrw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Wed 2007-04-18 00:07:18 +0200
message:
Implement http proxy basic authentication.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.set_proxy_auth): New method.
(extract_credentials): Moved from
HttpTransport_urllib._extract_auth.
(ProxyHandler.__init__): We need a password_manager for
authentication.
(ProxyHandler.set_proxy): Don't add the auth header, the
ProxyHandlers will do it later.
(ProxyBasicAuthHandler): New class. Handle the http basic
authentication for proxy.
(Opener.__init__): Enable ProxyBasicAuthHandler.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._extract_auth): Moved to
_urllib2_wrappers.extract_credentials.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox.test_empty_pass,
TestHttpProxyWhiteBox.test_user_pass): Deleted. Euivalent tests
exists in TestHTTPProxyBasicAuth now.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthRequestHandler): Fix inheritance.
(ProxyBasicAuthRequestHandler): Force the use of
FakeProxyRequestHandler.translate_path. This is a bit ugly :-/
------------------------------------------------------------
revno: 2052.1.368.1.2
revision-id: v.ladeuil+lp at free.fr-20070417103339-3kywr38d0p50czrw
parent: v.ladeuil+lp at free.fr-20070416134120-i8y220zv30spaq0a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-17 12:33:39 +0200
message:
Define tests for http proxy basic authentication. They fail.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox._set_and_capture_env_var): Deleted. YAGNI.
(TestProxyHttpServer._set_and_capture_env_var): Deleted. YAGNI
(TestHTTPAuth): Made abstract so it can be reused for proxy.
(TestHTTPAuth.test_prompt_for_password): New class.
(TestHTTPAuth.test_prompt_for_password): New class. Failed tests so
far.
* bzrlib/tests/HTTPTestUtil.py:
(AbstractBasicAuthRequestHandler): Made abstract from
BasicAuthRequestHandler so it can be reused for proxy.
(ProxyBasicAuthRequestHandler): New class.
(ProxyBasicAuthHTTPServer): New class.
------------------------------------------------------------
revno: 2052.1.368.1.1
revision-id: v.ladeuil+lp at free.fr-20070416134120-i8y220zv30spaq0a
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
parent: v.ladeuil+lp at free.fr-20070415155708-frrm29cd9vvvd8do
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Mon 2007-04-16 15:41:20 +0200
message:
merge basic auth
------------------------------------------------------------
revno: 2052.1.311.4.12
revision-id: v.ladeuil+lp at free.fr-20070415155708-frrm29cd9vvvd8do
parent: v.ladeuil+lp at free.fr-20070413163858-3v6pox4wls7j9ljb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Sun 2007-04-15 17:57:08 +0200
message:
Take jam's review comments into account. Fix typos, give better
explanations, add a test, complete another.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPBasicAuthHandler.http_error_401): Better explanation.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): _auth renamed to _auth_scheme.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.test_unknown_user): New test.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthHTTPServer): New class. Be explicit about use
requirements: basic authentication is mandatory.
------------------------------------------------------------
revno: 2052.1.311.4.11
revision-id: v.ladeuil+lp at free.fr-20070413163858-3v6pox4wls7j9ljb
parent: v.ladeuil+lp at free.fr-20070413161654-kp4kajrrr23jge2f
parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 18:38:58 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.4.10
revision-id: v.ladeuil+lp at free.fr-20070413161654-kp4kajrrr23jge2f
parent: v.ladeuil+lp at free.fr-20070413121740-mnwzf1656e31aenj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 18:16:54 +0200
message:
Complete tests.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Be more strict on valid users.
(HttpTransport_urllib._ask_password): Delete John's TODO. See ? I
didn't forget ! :-)
* bzrlib/tests/test_ui.py:
Fix some inconsistencies.
* bzrlib/tests/test_http.py:
Add more tests.
(TestHTTPBasicAuth.setUp): Setup a private ui_factory.
------------------------------------------------------------
revno: 2052.1.311.4.9
revision-id: v.ladeuil+lp at free.fr-20070413121740-mnwzf1656e31aenj
parent: v.ladeuil+lp at free.fr-20070413081101-j0keov4vgf493m2d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 14:17:40 +0200
message:
Catch first succesful authentification to avoid further 401
roudtrips in hhtp urllib implementation.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Initialize auth parameters.
(Request.extract_auth): Moved to
HttpTransport_urllib._extract_auth.
(Request.set_auth): New method.
(PasswordManager): Now that the transport handles the auth
parameters, we can use transport.base as the auth uri and work
around the python-2.4 bug.
(HTTPBasicAuthHandler.http_error_401): Capture the auth scheme
when the authentication succeeds.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Extract authentication at
construction time so that we don't have to do it at request build
time. urllib2 will be happier without it.
(HttpTransport_urllib._extract_auth): Moved from
_urllib2_wrappers.Request.extract_auth.
(HttpTransport_urllib._ask_password): Made private and do not
require a 'request' parameter anymore.
(HttpTransport_urllib._perform): The transport is now responsible
for handling the auth parameters and provide them to the
requests. And from there we can avoid the 401 roundtrips
yeaaaaah! (Except the first one of course to determine the auth
scheme).
------------------------------------------------------------
revno: 2052.1.311.4.8
revision-id: v.ladeuil+lp at free.fr-20070413081101-j0keov4vgf493m2d
parent: v.ladeuil+lp at free.fr-20070412160004-zrffqcemqyjb8gvq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Fri 2007-04-13 10:11:01 +0200
message:
Implement a basic auth HTTP server, rewrite tests accordingly.
* bzrlib/transport/http/_urllib2_wrappers.py:
(PasswordManager.add_password, PasswordManager.find_user_password,
PasswordManager.reduce_uri): Copied from python-2.5 urllib2.py as
a stop gap. A python-2.4 compatible work must be found.
(Opener.preprocess_request): Deleted.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.create_transport_readonly_server): Use the
right auth HTTP server.
(TestHTTPBasicAuth.setUp): Plug the the server.
(TestHTTPBasicAuth.process_request): Deleted.
* bzrlib/tests/HTTPTestUtil.py:
(BasicAuthRequestHandler, AuthHTTPServer): New classes. Implement
basic authentication on HTTP server.
------------------------------------------------------------
revno: 2052.1.311.4.7
revision-id: v.ladeuil+lp at free.fr-20070412160004-zrffqcemqyjb8gvq
parent: v.ladeuil+lp at free.fr-20070412142800-6e1pc8aksxlp7pg4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 18:00:04 +0200
message:
Deeper tests, prepare the auth setting that will avoid the
roundtrip with each 401.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Create the auth field.
(ConnectionHandler.get_key): Deleted.
(HTTPBasicAuthHandler.http_request): Add the authentication
parameter if the request requires it.
* bzrlib/tests/test_http.py:
(TestHTTPBasicAuth.setUp): Create the transport to access the
underlying _urllib2_wrappers opener.
(TestHTTPBasicAuth.process_request): Leave the opener process the
request based on the request.auth field.
------------------------------------------------------------
revno: 2052.1.311.4.6
revision-id: v.ladeuil+lp at free.fr-20070412142800-6e1pc8aksxlp7pg4
parent: v.ladeuil+lp at free.fr-20070412130953-pwgok8w72gxazlel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 16:28:00 +0200
message:
Fix tests around stdin emptyness.
* bzrlib/tests/test_ui.py:
Use readline not getline and test '' not None.
------------------------------------------------------------
revno: 2052.1.311.4.5
revision-id: v.ladeuil+lp at free.fr-20070412130953-pwgok8w72gxazlel
parent: v.ladeuil+lp at free.fr-20070411142442-a8eilux70zs8ddg6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Thu 2007-04-12 15:09:53 +0200
message:
Add white box tests for basic HTTP auth.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPBasicAuthHandler.get_auth, HTTPBasicAuthHandler.set_auth):
New methods.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox._proxied_request): Get rid of local imports.
(TestHTTPBasicAuth): New class. Tests basic HTTP auth.
------------------------------------------------------------
revno: 2052.1.311.4.4
revision-id: v.ladeuil+lp at free.fr-20070411142442-a8eilux70zs8ddg6
parent: v.ladeuil+lp at free.fr-20070411141729-cdaswhptaqmz4jrw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Wed 2007-04-11 16:24:42 +0200
message:
More tidying-up.
* bzrlib/tests/test_ui.py:
Fix some spaceing issues and check more stdin emptiness.
------------------------------------------------------------
revno: 2052.1.311.4.3
revision-id: v.ladeuil+lp at free.fr-20070411141729-cdaswhptaqmz4jrw
parent: v.ladeuil+lp at free.fr-20070410212235-vlcb8g9h421qpnwf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Wed 2007-04-11 16:17:29 +0200
message:
Tidy-up tests.
* bzrlib/tests/test_ui.py:
Assert that stdin is empty after passwords have been queried.
------------------------------------------------------------
revno: 2052.1.311.4.2
revision-id: v.ladeuil+lp at free.fr-20070410212235-vlcb8g9h421qpnwf
parent: v.ladeuil+lp at free.fr-20070403130039-5yuvjob1hwqjkvsd
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Tue 2007-04-10 23:22:35 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.311.4.1
revision-id: v.ladeuil+lp at free.fr-20070403130039-5yuvjob1hwqjkvsd
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 72792
timestamp: Tue 2007-04-03 15:00:39 +0200
message:
Partial fix for bug #72292.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.ask_password): If a password is already
supplied, pass it to the password manager.
------------------------------------------------------------
revno: 2052.1.410
revision-id: pqm at pqm.ubuntu.com-20070426083414-8xgtmyk47txgquaw
parent: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
parent: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 09:34:14 +0100
message:
Repository.tarball operation to speed initial checkouts
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.25
revision-id: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
parent: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-04-26 17:48:05 +1000
message:
Repository.tarball fixes for python2.4
Use 'r|bz2' to extract since r:bz2 is not supported
Replace extractall, which is not in python2.4
RemoteRepository._get_tarball returns a TemporaryFile
-------------- This line and the following will be ignored --------------
modified:
bzrlib/remote.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.24
revision-id: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
parent: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 22:06:54 +1000
message:
Merge Repository.sprout refactoring, and make that use Repository.tarball
------------------------------------------------------------
revno: 2052.1.388.1.1
revision-id: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: sprout-cleanup
timestamp: Mon 2007-04-23 19:52:50 +1000
message:
Add new Repository.sprout,
Cleaner in intention and purpose than copy_content_into. It doesn't copy the
extra settings of the repository (like working-trees and shared), which is
normally what you'll want.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.23
revision-id: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 17:18:26 +1000
message:
review cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.22
revision-id: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
parent: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 15:03:44 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.21
revision-id: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:36:31 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.20
revision-id: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:33 +1000
message:
Route branch operations through remote copy_content_into
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.19
revision-id: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
parent: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:02 +1000
message:
fix up test data format
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.18
revision-id: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
parent: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 00:34:38 +1000
message:
reformat
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.17
revision-id: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
parent: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 23:45:30 +1000
message:
Update and reenable rpc-level tests for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.16
revision-id: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
parent: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:03:44 +1000
message:
doc
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.15
revision-id: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
parent: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:01:33 +1000
message:
Merge more from hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.14
revision-id: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 19:57:57 +1000
message:
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.13
revision-id: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 14:22:55 +1000
message:
Remove obsolete test
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.12
revision-id: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
parent: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:35:24 +1000
message:
small test cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.11
revision-id: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
parent: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:21:43 +1000
message:
merge hpss changes
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.10
revision-id: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 20:07:02 +1000
message:
copy_content_into from Remote repositories by using temporary directories on both ends.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.9
revision-id: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
parent: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 19:10:45 +1000
message:
remote Repository.tarball builds a temporary directory and tars that
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.8
revision-id: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
parent: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 16:38:56 +1000
message:
Tarball proxy code & tests
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.7
revision-id: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
parent: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 13:59:56 +1000
message:
(broken) Start addng client proxy test for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.6
revision-id: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
parent: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:23:02 +1000
message:
merge hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.5
revision-id: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:21:08 +1000
message:
Repository.tarball locks repository while running for consistency
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.4
revision-id: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
parent: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:05:14 +1000
message:
Change Transport.local_abspath to raise NotLocalUrl, and test.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.3
revision-id: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
parent: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:04:56 +1000
message:
Cherrypick assertRaises enhancement
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.2
revision-id: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
parent: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 17:25:03 +1000
message:
smart method Repository.tarball actually returns the tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.1
revision-id: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
parent: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 16:08:03 +1000
message:
Add stub Repository.tarball smart method
------------------------------------------------------------
revno: 2052.1.409
revision-id: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
parent: pqm at pqm.ubuntu.com-20070426062134-r5pvo74u33vke1km
parent: mbp at sourcefrog.net-20070426052849-ffc06nlmkpbvqata
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 08:08:25 +0100
message:
Correct the handling of timezones and epoch time in bundles
------------------------------------------------------------
revno: 2052.1.373.6.3
revision-id: mbp at sourcefrog.net-20070426052849-ffc06nlmkpbvqata
parent: mbp at sourcefrog.net-20070419080319-amc7f3frr64lxolq
parent: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-26 15:28:49 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.373.6.2
revision-id: mbp at sourcefrog.net-20070419080319-amc7f3frr64lxolq
parent: mbp at sourcefrog.net-20070419071716-tcuv5i38vhci6fuf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-19 18:03:19 +1000
message:
Make timestamps use existing format_date; document that function more
------------------------------------------------------------
revno: 2052.1.373.6.1
revision-id: mbp at sourcefrog.net-20070419071716-tcuv5i38vhci6fuf
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: gmtime
timestamp: Thu 2007-04-19 17:17:16 +1000
message:
Fix formatting of timezones in bundles and merge directives.
Always give epoch time in utc.
------------------------------------------------------------
revno: 2052.1.408
revision-id: pqm at pqm.ubuntu.com-20070426062134-r5pvo74u33vke1km
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
parent: robertc at robertcollins.net-20070426050440-7ktqwywg8sd2eiey
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 07:21:34 +0100
message:
(robertc) Fix bzr --no-plugins selftest which was broken by the help indices patch. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2052.1.405.1.1
revision-id: robertc at robertcollins.net-20070426050440-7ktqwywg8sd2eiey
parent: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-26 15:04:40 +1000
message:
(robertc) Fix bzr --no-plugins selftest which was broken by the help indices patch. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2052.1.407
revision-id: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
parent: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:42:38 +0100
message:
(Andrew Bennetts, Robert Collins) Smart server protocol versioning.
------------------------------------------------------------
revno: 2052.1.380.2.9
revision-id: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
parent: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Thu 2007-04-26 14:32:44 +1000
message:
Update protocol versioning docs to explain how unknown request versions should be handled.
------------------------------------------------------------
revno: 2052.1.380.2.8
revision-id: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
parent: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 15:40:02 +1000
message:
NEWS entry, greatly improved docstring in bzrlib.smart.
------------------------------------------------------------
revno: 2052.1.380.2.7
revision-id: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 14:56:19 +1000
message:
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
------------------------------------------------------------
revno: 2052.1.380.2.6
revision-id: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
parent: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 19:01:50 +1000
message:
Improve HelloRequest's docstring.
------------------------------------------------------------
revno: 2052.1.380.2.5
revision-id: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
parent: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:50:29 +1000
message:
Reduce duplication in test_smart_transport.
------------------------------------------------------------
revno: 2052.1.380.2.4
revision-id: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
parent: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:36:32 +1000
message:
Change smart protocol version two prefix to '2\n'.
------------------------------------------------------------
revno: 2052.1.380.2.3
revision-id: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:55:13 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2052.1.380.2.2
revision-id: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:20:48 +1000
message:
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
------------------------------------------------------------
revno: 2052.1.380.2.1
revision-id: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 15:11:06 +1000
message:
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
------------------------------------------------------------
revno: 2052.1.406
revision-id: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:06:29 +0100
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2052.1.401.2.1
revision-id: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bugfix-property
timestamp: Wed 2007-04-25 15:51:10 +1000
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2052.1.405
revision-id: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 03:19:42 +0100
message:
(robertc) Use repr rather than str when reporting an unprintable exception to aid debugging. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.404.1.1
revision-id: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-26 11:48:29 +1000
message:
Fix the 'Unprintable error' message display to use the repr of the
exception that prevented printing the error because the str value for it
is often not useful in debugging (e.g. KeyError('foo') has a str() of
'foo' but a repr of 'KeyError('foo')' which is much more useful.
(Robert Collins)
------------------------------------------------------------
revno: 2052.1.404
revision-id: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 15:37:32 +0100
message:
(Kent Gibson, John Arbash Meinel) Improve 'bzr log file' to both be significantly faster, and more correct.
------------------------------------------------------------
revno: 2052.1.307.1.11
revision-id: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
parent: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 14:23:14 -0500
message:
[merge] bzr.dev 2446
------------------------------------------------------------
revno: 2052.1.307.1.10
revision-id: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 13:09:19 -0500
message:
Add my name to the NEWS entry
------------------------------------------------------------
revno: 2052.1.307.1.9
revision-id: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
parent: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 12:53:30 -0500
message:
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
------------------------------------------------------------
revno: 2052.1.307.1.8
revision-id: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
parent: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:39:21 -0500
message:
doc
------------------------------------------------------------
revno: 2052.1.307.1.7
revision-id: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
parent: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:37:59 -0500
message:
Create a direct test for _get_revisions_touching_file_id
------------------------------------------------------------
revno: 2052.1.307.1.6
revision-id: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
parent: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:14:54 -0500
message:
Create a helper tree which has a semi-interesting history.
This allows us to test which files are actually modified.
------------------------------------------------------------
revno: 2052.1.307.1.5
revision-id: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
parent: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:50:32 -0500
message:
change some variable names to make the function a bit clearer.
------------------------------------------------------------
revno: 2052.1.307.1.4
revision-id: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
parent: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:47:59 -0500
message:
Refactor the specific revisions for file id into a helper function.
------------------------------------------------------------
revno: 2052.1.307.1.3
revision-id: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
parent: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-04-11 00:05:23 +0800
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.307.1.2
revision-id: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-04-10 23:18:24 +0800
message:
add logging of merge revisions
------------------------------------------------------------
revno: 2052.1.307.1.1
revision-id: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Fri 2007-03-16 01:15:04 +0900
message:
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
------------------------------------------------------------
revno: 2052.1.403
revision-id: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 07:50:22 +0100
message:
bzr rm removes the working file
------------------------------------------------------------
revno: 2052.1.240.1.34
revision-id: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
parent: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:15:26 +0200
message:
Move "magically convert commands like 'remove abc' to ['remove', 'abc']"
from tests/__init__.run_bzr_captured to tests/blackbox/test_remove
------------------------------------------------------------
revno: 2052.1.240.1.33
revision-id: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
parent: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:00:01 +0200
message:
* Remove workingtree.canonicalpath
------------------------------------------------------------
revno: 2052.1.240.1.32
revision-id: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
parent: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-19 07:59:47 +0200
message:
* tests/__init__.run_bzr
Now gives better assert message for 'Unexpected return code'
* blackbox/test_remove
- Add changed file tests
- When checking changed/unknown rm fails, always wheck if we can forec it.
- Move one file tests to top
- Fixed copy-paste pattern induced mishaps where more-than-one-file-tests
were actually just testing one-file
- Add test to remove while in a child dir
- Add remove deleted file test
------------------------------------------------------------
revno: 2052.1.240.1.31
revision-id: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
parent: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:22:08 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.240.1.30
revision-id: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: amanic at gmail.com-20070416183544-tdtramoul71svkhh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:12:15 +0200
message:
* Minor text fixes.
* Remove trailing whitespace added by this branch.
* Add tests for removing empty directories.
* workingtree.remove
- Don't recurse into empty directories.
- Use absolute path when deleting from the file system.
------------------------------------------------------------
revno: 2052.1.240.1.29
revision-id: amanic at gmail.com-20070416183544-tdtramoul71svkhh
parent: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:35:44 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.240.1.28
revision-id: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:26:41 +0200
message:
* NEWS
- move my news to NOTES WHEN UPGRADING section.
* bzrlib/builtins.py
- Use RegistryOption for bzr rm --force and --keep
* bzrlib/tests/__init__.py
- remove a white space
* bzrlib/tests/blackbox/test_selftest.py
- make blackbox/test_selftest.py pass again:
Its run_bzr_captured method did not return anything, although bzr_run
expects it now.
------------------------------------------------------------
revno: 2052.1.240.1.27
revision-id: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
parent: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 08:26:59 +0200
message:
* tests/__init__.TestCase.run_bzr_captured
- Support single text commands with quoted sub-strings eg.:
"bzr commit 'some message'"
- Move support for error_regexes from run_bzr_error() to run_bzr()
as it is quite usefull to assert output from notes.
* blackbox/test_remove
- convert the rest of the tests to use the new improved self.run_bzr
------------------------------------------------------------
revno: 2052.1.240.1.26
revision-id: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
parent: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 04:55:05 +0200
message:
* tests/__init__
- make run_bzr_captured abit more clever, so that it will
split up argunents if they are passed as a single string.
* blackbox/test_remove
- start converting to run_bzr and run_bzr_error
------------------------------------------------------------
revno: 2052.1.240.1.25
revision-id: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
parent: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 03:00:20 +0200
message:
* Add utility method delta.get_changes_as_text to get the output of .show()
as a string.
* Add new errors.BzrRemoveChangedFilesError to raise when 'bzr remove'
should refuse to delete stuff.
* Add workingtree.canicalpath(filename) to normalize file names.
* Changed the working of workingtree.remove(...) to check if any files
are changed before it starts deleting anything. Will raise exception
now if changed files are passed to be removed.
* workingtree_implementations/test_remove.py
- Checked all tests and add more cases.
------------------------------------------------------------
revno: 2052.1.240.1.24
revision-id: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
parent: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 14:40:37 +0200
message:
minor text cleanups
------------------------------------------------------------
revno: 2052.1.240.1.23
revision-id: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
parent: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 13:57:26 +0200
message:
Revert test_too_much.py and just do the minimum te get the tests to pass.
Add some test to test_remove.py.
Let test_remove.py make safe id's.
------------------------------------------------------------
revno: 2052.1.240.1.22
revision-id: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
parent: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 02:58:27 +0200
message:
Implement TODO: Normalize names.
Assume paths relative to the basedir.
(not to the current dir, which I did previously)
------------------------------------------------------------
revno: 2052.1.240.1.21
revision-id: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
parent: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 21:45:40 +0200
message:
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
------------------------------------------------------------
revno: 2052.1.240.1.20
revision-id: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
parent: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:45:26 +0200
message:
move test_workingtree.TestRemove to workingtree_implementations/test_remove
------------------------------------------------------------
revno: 2052.1.240.1.19
revision-id: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
parent: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:23:26 +0200
message:
convert from using self.runbzr to self.run_bzr_captured
------------------------------------------------------------
revno: 2052.1.240.1.18
revision-id: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
parent: amanic at gmail.com-20070412014719-3oo573tt381rpigu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:13:13 +0200
message:
revert wrapping change
------------------------------------------------------------
revno: 2052.1.240.1.17
revision-id: amanic at gmail.com-20070412014719-3oo573tt381rpigu
parent: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:47:19 +0200
message:
Remove redundant __init__ and object variable.
------------------------------------------------------------
revno: 2052.1.240.1.16
revision-id: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
parent: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:38:32 +0200
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.240.1.15
revision-id: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
parent: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:18:53 +0200
message:
Fix test too much again.
------------------------------------------------------------
revno: 2052.1.240.1.14
revision-id: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
parent: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:10:17 +0200
message:
* blackbox/test_remove
- uninvert my logic
- add a little more testing
------------------------------------------------------------
revno: 2052.1.240.1.13
revision-id: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
parent: amanic at gmail.com-20070411225348-7145vlsq3f390osg
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 02:47:48 +0200
message:
* merge the unversion command back into the remove command,
merging the commands and tests.
* make all tests pass again.
------------------------------------------------------------
revno: 2052.1.240.1.12
revision-id: amanic at gmail.com-20070411225348-7145vlsq3f390osg
parent: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:53:48 +0200
message:
* test_workingtree/TestRemove
- Change global and local constants to class variables.
------------------------------------------------------------
revno: 2052.1.240.1.11
revision-id: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
parent: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:09:54 +0200
message:
* workingtree.remove
- Don't figure out what changed if we don't care.
------------------------------------------------------------
revno: 2052.1.240.1.10
revision-id: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
parent: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:02:47 +0200
message:
* workingtree.remove
- Add and test a new force option in order to force the deletion of changed files
and non-empty directories.
- Some doc fixups.
- Remove some implemented todo's
- Remove ## TODO: Remove nested loops; better scalability
as I can't see any nested loop.s
- small whitespace cleanups in tests.
------------------------------------------------------------
revno: 2052.1.240.1.9
revision-id: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
parent: amanic at gmail.com-20070411204847-quynsdasuvjhju64
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 23:27:06 +0200
message:
Handle the removing of nonempty directories.
------------------------------------------------------------
revno: 2052.1.240.1.8
revision-id: amanic at gmail.com-20070411204847-quynsdasuvjhju64
parent: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 22:48:47 +0200
message:
When removing and deleting files,
only check for changes on specific files.
------------------------------------------------------------
revno: 2052.1.240.1.7
revision-id: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
parent: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-09 23:50:50 +0200
message:
First pass at only deleting files on 'bzr remove' when
they haven't changed.
Needed to modify _find_children_across_trees (tree.py) because
tree.has_id did not work as excpeted.
------------------------------------------------------------
revno: 2052.1.240.1.6
revision-id: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
parent: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-03-31 22:49:06 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.240.1.5
revision-id: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-03-23 20:29:56 +0200
message:
merge with bzr.dev
------------------------------------------------------------
revno: 2052.1.240.1.4
revision-id: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-02-19 07:46:05 +0200
message:
Make output for bzr remove more verbose.
------------------------------------------------------------
revno: 2052.1.240.1.3
revision-id: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
parent: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:24:43 +0200
message:
Factored out common code from test_remove.py into test_unversion.py
------------------------------------------------------------
revno: 2052.1.240.1.2
revision-id: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
parent: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:15:40 +0200
message:
Minor test cleanups, making test_remove.py and test_unversion.py more similar.
------------------------------------------------------------
revno: 2052.1.240.1.1
revision-id: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 08:16:11 +0200
message:
"bzr remove" and "bzr rm" will now remove the working file.
This has been done for consistency with svn and the unix rm command.
The old remove behaviour has been retained in the new command
"bzr unversion", which will just stop versioning the file,
but not delete it.
(Addressing Bug #82602)
Exisitng tests have been reworked and new tests were added to test these
changes properly.
------------------------------------------------------------
revno: 2052.1.402
revision-id: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 06:42:41 +0100
message:
(bialix, mbp) explicitly check for SIGQUIT in 'signal' stdlib module
------------------------------------------------------------
revno: 2052.1.401.1.1
revision-id: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Wed 2007-04-25 07:46:07 +0300
message:
explicitly check for SIGQUIT in 'signal' stdlib module (it's absent on win32)
------------------------------------------------------------
revno: 2052.1.401
revision-id: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 03:50:45 +0100
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2052.1.400.1.1
revision-id: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-25 12:24:56 +1000
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2052.1.400
revision-id: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 23:44:26 +0100
message:
(John Arbash Meinel) Add Branch.get_revision_id_to_revno_map
------------------------------------------------------------
revno: 2052.1.366.5.15
revision-id: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
parent: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 17:09:20 -0500
message:
NEWS
------------------------------------------------------------
revno: 2052.1.366.5.14
revision-id: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
parent: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:45:05 -0500
message:
clean up ASCII revision graph art.
------------------------------------------------------------
revno: 2052.1.366.5.13
revision-id: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
parent: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:43:09 -0500
message:
Remove revision_id_to_dotted_revno, because it isn't used.
------------------------------------------------------------
revno: 2052.1.366.5.12
revision-id: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
parent: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:40:13 -0500
message:
Move functions from BzrBranch to base Branch object.
Fix RemoteBranch to properly clear its cache at the right time.
------------------------------------------------------------
revno: 2052.1.366.5.11
revision-id: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
parent: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Mon 2007-04-23 22:23:27 -0500
message:
[merge] bzr.dev 2447
------------------------------------------------------------
revno: 2052.1.366.5.10
revision-id: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:31:50 -0500
message:
fix typo
------------------------------------------------------------
revno: 2052.1.366.5.9
revision-id: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
parent: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:26:08 -0500
message:
Have RevisionSpec_revno() also use the new helper
------------------------------------------------------------
revno: 2052.1.366.5.8
revision-id: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
parent: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:19:29 -0500
message:
Update annotate.py to use the new helper function.
------------------------------------------------------------
revno: 2052.1.366.5.7
revision-id: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
parent: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:18:09 -0500
message:
Move the revision_id=>map generation to be a public function.
------------------------------------------------------------
revno: 2052.1.366.5.6
revision-id: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
parent: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:01:24 -0500
message:
Cache the revision_id => revno map as appropriate.
------------------------------------------------------------
revno: 2052.1.366.5.5
revision-id: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
parent: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:33:23 -0500
message:
Add some tests and an api for revision_id_to_dotted_revno
This should use caching to be fast for multiple calls
but for now it just implements what is needed.
------------------------------------------------------------
revno: 2052.1.366.5.4
revision-id: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
parent: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:23:35 -0500
message:
Included a test for revision_id=None
------------------------------------------------------------
revno: 2052.1.366.5.3
revision-id: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
parent: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:18:36 -0500
message:
Use a more straightforward implementation of generating 'tree_with_merge'
------------------------------------------------------------
revno: 2052.1.366.5.2
revision-id: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
parent: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:17:24 -0500
message:
Move TestCaseWithBranch into branch_implementations from test_branch.py
------------------------------------------------------------
revno: 2052.1.366.5.1
revision-id: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:10:04 -0500
message:
Make a Branch helper which can create a very basic MemoryTree with history.
This updates MutableTree to include 'set_parent_ids' which is helpful
when setting up simple tests.
It also creates a helper function in branch_implementations..TestCaseWithBranch
so that we can create a Branch which has a simple merge in it.
It also adds a test for revision_id_to_revno which previously did not have any
direct tests.
------------------------------------------------------------
revno: 2052.1.399
revision-id: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
parent: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 15:19:24 +0100
message:
(bialix) fix RSTX wrong formatting in HACKING (trivial)
------------------------------------------------------------
revno: 2052.1.397.1.1
revision-id: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Tue 2007-04-24 16:15:06 +0300
message:
fix RSTX wrong formatting in HACKING
------------------------------------------------------------
revno: 2052.1.398
revision-id: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
parent: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 06:42:49 +0100
message:
Press C-\ to break into pdb
------------------------------------------------------------
revno: 2052.1.371.3.8
revision-id: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
parent: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-24 15:02:04 +1000
message:
Merge trunk & fix NEWS conflict
------------------------------------------------------------
revno: 2052.1.371.3.7
revision-id: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
parent: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-24 14:51:31 +1000
message:
Add BZR_SIGQUIT_PDB=0 option to disable breakin.
Split tests for this into test_breakin, and make them a bit more robust.
------------------------------------------------------------
revno: 2052.1.371.3.6
revision-id: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
parent: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 19:25:35 +1000
message:
Correct the mention of C-\ in NEWS (Daniel Silverstone)
------------------------------------------------------------
revno: 2052.1.371.3.5
revision-id: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
parent: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 17:32:22 +1000
message:
Second sigquit goes through to the default handler
------------------------------------------------------------
revno: 2052.1.371.3.4
revision-id: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
parent: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 16:57:55 +1000
message:
Late load pdb for breakin; fix copyright
------------------------------------------------------------
revno: 2052.1.371.3.3
revision-id: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
parent: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 16:53:14 +1000
message:
merge benchmark fix
------------------------------------------------------------
revno: 2052.1.371.3.2
revision-id: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
parent: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 15:24:19 +1000
message:
doc BZR_PDB and sigquit
------------------------------------------------------------
revno: 2052.1.371.3.1
revision-id: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 14:39:12 +1000
message:
C-\ drops bzr into the debugger
------------------------------------------------------------
revno: 2052.1.397
revision-id: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
parent: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
parent: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 04:37:35 +0100
message:
(John Arbash Meinel) Small updates for 'bzr info' tests and win32
------------------------------------------------------------
revno: 2052.1.373.3.3
revision-id: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
parent: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Mon 2007-04-23 21:55:10 -0500
message:
Update comment according to Martin
------------------------------------------------------------
revno: 2052.1.373.3.2
revision-id: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Thu 2007-04-19 17:26:04 -0500
message:
Make "test_info_locking" an expected failure on win32 for now.
------------------------------------------------------------
revno: 2052.1.396
revision-id: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
parent: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 04:12:08 +0100
message:
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
------------------------------------------------------------
revno: 2052.1.366.4.2
revision-id: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
parent: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-04-23 21:43:56 -0500
message:
[merge] bzr.dev 2447
------------------------------------------------------------
revno: 2052.1.366.4.1
revision-id: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-04-13 15:19:49 -0500
message:
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
------------------------------------------------------------
revno: 2052.1.342.2.10
revision-id: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
parent: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:46:31 +1000
message:
another doc fix and whitespace fixes
------------------------------------------------------------
revno: 2052.1.342.2.9
revision-id: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
parent: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:40:53 +1000
message:
update NEWS and help to reflect removal of comma support
------------------------------------------------------------
revno: 2052.1.342.2.8
revision-id: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
parent: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Fri 2007-04-13 10:30:33 +1000
message:
incorporate feedback from jam
------------------------------------------------------------
revno: 2052.1.342.2.7
revision-id: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
parent: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-11 12:14:09 +1000
message:
Added whitebox tests - filter_suite_by_re and sort_suite_by_re
------------------------------------------------------------
revno: 2052.1.342.2.6
revision-id: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
parent: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-11 00:23:43 +1000
message:
completed blackbox tests
------------------------------------------------------------
revno: 2052.1.342.2.5
revision-id: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
parent: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Tue 2007-04-10 19:08:06 +1000
message:
list-only working, include test not
------------------------------------------------------------
revno: 2052.1.342.2.4
revision-id: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
parent: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 23:13:51 +1000
message:
Clean up whitespace
------------------------------------------------------------
revno: 2052.1.342.2.3
revision-id: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
parent: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 23:11:47 +1000
message:
Backed out test junk
------------------------------------------------------------
revno: 2052.1.342.2.2
revision-id: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
parent: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 22:59:15 +1000
message:
Add --randomize and update help
------------------------------------------------------------
revno: 2052.1.342.2.1
revision-id: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.selftest-not
timestamp: Wed 2007-04-04 19:10:10 +1000
message:
--list and --exclude first cut
------------------------------------------------------------
revno: 2052.1.395
revision-id: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
parent: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 18:07:58 +0100
message:
(Andrew Bennetts) Make RemoteBzrDir.open_workingtree raise NoWorkingTree instead of NotLocalUrl when appropriate.
------------------------------------------------------------
revno: 2052.1.393.1.1
revision-id: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree-msg
timestamp: Mon 2007-04-23 18:30:30 +1000
message:
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
when there is no remote working tree, avoiding spurious "This transport does not
update the working tree" warnings from cmd_push.
------------------------------------------------------------
revno: 2052.1.394
revision-id: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
parent: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 08:50:15 +0100
message:
(robertc) bzr --fixes support to allow recording of bugs that are fixed by commits. (Jonathan Lange, James Henstridge, Robert Collins)
------------------------------------------------------------
revno: 2052.1.324.4.43
revision-id: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
parent: jml at canonical.com-20070423055929-chgdr92da63lhcri
parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
committer: Jonathan Lange <jml at canonical.com>
branch nick: bug-support
timestamp: Mon 2007-04-23 16:55:58 +1000
message:
Merge from mainline, resolving conflict in help_topics
------------------------------------------------------------
revno: 2052.1.324.4.42
revision-id: jml at canonical.com-20070423055929-chgdr92da63lhcri
parent: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 15:59:29 +1000
message:
Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
subclass.
------------------------------------------------------------
revno: 2052.1.324.4.41
revision-id: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
parent: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 15:24:47 +1000
message:
Update UniqueIntegerBugTracker docstring for new API
------------------------------------------------------------
revno: 2052.1.324.4.40
revision-id: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
parent: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 15:22:17 +1000
message:
Redo the hierarchy of bug trackers to reduce duplication.
------------------------------------------------------------
revno: 2052.1.324.4.39
revision-id: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
parent: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 11:30:35 +1000
message:
Can also set the bug config options in branch.conf
------------------------------------------------------------
revno: 2052.1.324.4.38
revision-id: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
parent: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 09:00:56 +1000
message:
Merge bzr.dev, resolving conflicts in error code.
------------------------------------------------------------
revno: 2052.1.324.4.37
revision-id: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
parent: jml at canonical.com-20070422224519-wixpd8wnwxw70641
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 08:48:48 +1000
message:
Mention API additions in NEWS.
------------------------------------------------------------
revno: 2052.1.324.4.36
revision-id: jml at canonical.com-20070422224519-wixpd8wnwxw70641
parent: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 08:45:19 +1000
message:
Provide really basic help topic for our bug tracker support.
------------------------------------------------------------
revno: 2052.1.324.4.35
revision-id: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
parent: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 08:23:00 +1000
message:
Include configuration documentation for tracker config options.
------------------------------------------------------------
revno: 2052.1.324.4.34
revision-id: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
parent: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Mon 2007-04-23 08:22:26 +1000
message:
Remove spurious quote mark in docstring.
------------------------------------------------------------
revno: 2052.1.324.4.33
revision-id: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
parent: jml at canonical.com-20070420041143-td2407zcd2xygk70
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 14:13:08 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.324.4.32
revision-id: jml at canonical.com-20070420041143-td2407zcd2xygk70
parent: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 14:11:43 +1000
message:
Basic documentation for --fixes option
------------------------------------------------------------
revno: 2052.1.324.4.31
revision-id: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
parent: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 13:53:28 +1000
message:
Whitespace normalization and use squid as an example rather than apache.
------------------------------------------------------------
revno: 2052.1.324.4.30
revision-id: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
parent: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 13:40:09 +1000
message:
Support for Bugzilla bug trackers.
------------------------------------------------------------
revno: 2052.1.324.4.29
revision-id: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
parent: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 13:19:43 +1000
message:
Tests for builtin trackers.
------------------------------------------------------------
revno: 2052.1.324.4.28
revision-id: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
parent: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 13:10:49 +1000
message:
Focus the tests better and clean up some dodgy bits in UnknownBugTrackerAbbreviation
------------------------------------------------------------
revno: 2052.1.324.4.27
revision-id: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
parent: jml at canonical.com-20070420022157-ampptjzryc2fju7t
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 12:27:38 +1000
message:
Include branch information in UnknownBugTrackerAbbreviation
------------------------------------------------------------
revno: 2052.1.324.4.26
revision-id: jml at canonical.com-20070420022157-ampptjzryc2fju7t
parent: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 12:21:57 +1000
message:
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
------------------------------------------------------------
revno: 2052.1.324.4.25
revision-id: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
parent: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 12:10:08 +1000
message:
Make singleton bug tracker thing work via instances.
------------------------------------------------------------
revno: 2052.1.324.4.24
revision-id: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
parent: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 11:52:14 +1000
message:
Make the Tracker class attribute 'abbrevation', not 'abbreviated_bugtracker_name'
------------------------------------------------------------
revno: 2052.1.324.4.23
revision-id: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
parent: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-20 10:56:27 +1000
message:
Change 'tag' to 'abbreviated_tracker_name'
------------------------------------------------------------
revno: 2052.1.324.4.22
revision-id: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
parent: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Tue 2007-04-17 17:59:42 +1000
message:
Variety of whitespace cleanups, tightening of tests and docstring changes in
response to review of bug support.
------------------------------------------------------------
revno: 2052.1.324.4.21
revision-id: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
parent: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Tue 2007-04-17 17:38:19 +1000
message:
Change the bugs separator to \n from ,
------------------------------------------------------------
revno: 2052.1.324.4.20
revision-id: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
parent: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 17:29:37 +1000
message:
Direct tests for UniqueBugTracker and UniqueIntegerBugTracker
------------------------------------------------------------
revno: 2052.1.324.4.19
revision-id: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
parent: jml at canonical.com-20070413065621-hv9tv4ws25remckj
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 17:19:12 +1000
message:
Rename SimpleBugTracker to UniqueBugTracker
------------------------------------------------------------
revno: 2052.1.324.4.18
revision-id: jml at canonical.com-20070413065621-hv9tv4ws25remckj
parent: jml at canonical.com-20070413064225-cmuz00itroirlro4
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 16:56:21 +1000
message:
Store all bug fix URLs in a single property.
------------------------------------------------------------
revno: 2052.1.324.4.17
revision-id: jml at canonical.com-20070413064225-cmuz00itroirlro4
parent: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 16:42:25 +1000
message:
Use urlutils.join instead of ugly, buggy, string mashing
------------------------------------------------------------
revno: 2052.1.324.4.16
revision-id: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
parent: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 16:24:39 +1000
message:
"bug tracker" is two words, so use BugTracker in class names, not 'Bugtracker'
------------------------------------------------------------
revno: 2052.1.324.4.15
revision-id: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
parent: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 16:12:33 +1000
message:
Whitespace cleanup
------------------------------------------------------------
revno: 2052.1.324.4.14
revision-id: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
parent: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
parent: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 16:11:23 +1000
message:
Merge James Westby's refactoring
------------------------------------------------------------
revno: 2052.1.324.4.8.1.1
revision-id: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.bug
timestamp: Thu 2007-04-12 21:58:30 +0100
message:
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
------------------------------------------------------------
revno: 2052.1.324.4.13
revision-id: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
parent: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 15:10:07 +1000
message:
Some stylistic cleanups
------------------------------------------------------------
revno: 2052.1.324.4.12
revision-id: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
parent: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 14:58:08 +1000
message:
Update NEWS file.
Use non-lazy import
Use run_bzr for running bzr in fixes tests.
------------------------------------------------------------
revno: 2052.1.324.4.11
revision-id: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
parent: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 13:52:48 +1000
message:
Provide a way of resetting list options (specifying '-' as the argument)
------------------------------------------------------------
revno: 2052.1.324.4.10
revision-id: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
parent: jml at canonical.com-20070413034711-pn129rtch4usvmdk
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 13:50:20 +1000
message:
Oops. Update tests to account for changed options to commit.
------------------------------------------------------------
revno: 2052.1.324.4.9
revision-id: jml at canonical.com-20070413034711-pn129rtch4usvmdk
parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: Jonathan Lange <jml at canonical.com>
branch nick: lp-bugs
timestamp: Fri 2007-04-13 13:47:11 +1000
message:
Merge from mainline.
------------------------------------------------------------
revno: 2052.1.324.4.8
revision-id: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
parent: jml at canonical.com-20070411035653-himmtk357n8d3fbv
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Wed 2007-04-11 14:23:18 +1000
message:
Import sub-module, not member, following advice in HACKING
------------------------------------------------------------
revno: 2052.1.324.4.7
revision-id: jml at canonical.com-20070411035653-himmtk357n8d3fbv
parent: jml at canonical.com-20070411002703-2jbq0152stafryqg
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Wed 2007-04-11 13:56:53 +1000
message:
- Add docstrings to tests.
- Make the 'commit' command use the bugtracker infrastructure.
- Update the blackbox tests
- Move the 'is this a valid bug id' logic to the tracker
------------------------------------------------------------
revno: 2052.1.324.4.6
revision-id: jml at canonical.com-20070411002703-2jbq0152stafryqg
parent: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Wed 2007-04-11 10:27:03 +1000
message:
Basic docstrings for bugtracker.py
------------------------------------------------------------
revno: 2052.1.324.4.5
revision-id: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
parent: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Wed 2007-04-11 09:29:58 +1000
message:
Rename get_by_tag to get_tracker, to be more accurate.
------------------------------------------------------------
revno: 2052.1.324.4.4
revision-id: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
parent: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Tue 2007-04-10 17:33:07 +1000
message:
Beginnings of generic bug-tracker plugin system.
------------------------------------------------------------
revno: 2052.1.324.4.3
revision-id: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
parent: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Tue 2007-04-10 11:22:27 +1000
message:
Merge RF
------------------------------------------------------------
revno: 2052.1.324.4.2
revision-id: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
parent: jml at canonical.com-20070328065202-1r825jxnabsy31ak
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Mon 2007-04-02 17:26:30 +1000
message:
More sophisticated error handling for --fixes option
------------------------------------------------------------
revno: 2052.1.324.4.1
revision-id: jml at canonical.com-20070328065202-1r825jxnabsy31ak
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: jml at canonical.com
branch nick: lp-bugs
timestamp: Wed 2007-03-28 16:52:02 +1000
message:
Blackbox-driven --fixes option to commit.
------------------------------------------------------------
revno: 2052.1.393
revision-id: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
parent: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 08:08:09 +0100
message:
(robertc) Update doc/server.txt and the port the smart server listens on. (Robert Collins, #107125, #98918)
------------------------------------------------------------
revno: 2052.1.391.1.3
revision-id: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
parent: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 16:36:16 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2052.1.391.1.2
revision-id: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
parent: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 14:38:50 +1000
message:
``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve
out to the local LAN and fixing bug 98918. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.391.1.1
revision-id: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 14:28:56 +1000
message:
Document the default bzr:// port (fixes #107125).
------------------------------------------------------------
revno: 2052.1.392
revision-id: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
parent: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 05:16:29 +0100
message:
(robertc) Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
------------------------------------------------------------
revno: 1739.1.8
revision-id: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
parent: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-23 13:41:48 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2052.1.335.2.1
revision-id: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: cleanassertions
timestamp: Fri 2007-03-30 16:32:16 +1000
message:
Mark bzrlib.tests as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
------------------------------------------------------------
revno: 2052.1.391
revision-id: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
parent: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 04:32:45 +0100
message:
(robertc) 'bzr help urlspec' - new topic giving help on http://, sftp:// etc. (Goffredo Baroncelli)
------------------------------------------------------------
revno: 1739.1.7
revision-id: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
parent: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-23 12:58:30 +1000
message:
Merge Goffredo's urlspec help patch and tweak the NEWS entries.
------------------------------------------------------------
revno: 2052.1.189.2.13
revision-id: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
parent: ghigo at venice-20070421122215-glii923x3cfwo02j
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Sat 2007-04-21 14:43:08 +0200
message:
NEWS file updated
------------------------------------------------------------
revno: 2052.1.189.2.12
revision-id: ghigo at venice-20070421122215-glii923x3cfwo02j
parent: ghigo at venice-20070207210804-r551d0lozrp20uex
parent: ghigo at venice-20070421110123-cc9axlewjexbmn63
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Sat 2007-04-21 14:22:15 +0200
message:
update to the latest bzr.dev
------------------------------------------------------------
revno: 2052.1.189.2.4.1.6
revision-id: ghigo at venice-20070421110123-cc9axlewjexbmn63
parent: ghigo at venice-20070329204446-2j3uumjq9faxsigz
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Sat 2007-04-21 13:01:23 +0200
message:
Upgraded to the latest bzr.dev
------------------------------------------------------------
revno: 2052.1.189.2.4.1.5
revision-id: ghigo at venice-20070329204446-2j3uumjq9faxsigz
parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Thu 2007-03-29 22:44:46 +0200
message:
update to the latest bzr.dev
------------------------------------------------------------
revno: 2052.1.189.2.11
revision-id: ghigo at venice-20070207210804-r551d0lozrp20uex
parent: ghigo at venice-20070207205220-5tnjou7hz9722njy
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Wed 2007-02-07 22:08:04 +0100
message:
On the basis of Robert Collins and John Arbash Meinel
- removed some protocol ( http[s]+pycurl:// and http[s]+urllib://,
bzr+http:// and readonly+ )
- _help_on_trasport( ) now supports the missing of the modifiers
- add a blackbox test case
- little PEP8 cleanup
------------------------------------------------------------
revno: 2052.1.189.2.10
revision-id: ghigo at venice-20070207205220-5tnjou7hz9722njy
parent: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Wed 2007-02-07 21:52:20 +0100
message:
Update to the latest bzr-transport-registry
------------------------------------------------------------
revno: 2052.1.189.2.4.1.4
revision-id: ghigo at venice-20070207205057-hveyr0yfn35dhhea
parent: ghigo at venice-20070207203349-gc7actj3vso0haf2
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Wed 2007-02-07 21:50:57 +0100
message:
Updates on the basis of John Arbash Meinel comments
------------------------------------------------------------
revno: 2052.1.189.2.4.1.3
revision-id: ghigo at venice-20070207203349-gc7actj3vso0haf2
parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Wed 2007-02-07 21:33:49 +0100
message:
update to the latest bzr.dev
------------------------------------------------------------
revno: 2052.1.189.2.9
revision-id: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
parent: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Sat 2007-01-27 18:56:20 +0100
message:
add the 'file://' prefix to the urlspec topic
------------------------------------------------------------
revno: 2052.1.189.2.8
revision-id: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
parent: ghigo at venice-20070127172631-etl6aa78zxak9t0e
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Sat 2007-01-27 18:50:44 +0100
message:
- rename transport urlspec
- sort the transport without '://'
------------------------------------------------------------
revno: 2052.1.189.2.7
revision-id: ghigo at venice-20070127172631-etl6aa78zxak9t0e
parent: ghigo at venice-20070126211058-rekclacctmf9tes8
parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Sat 2007-01-27 18:26:31 +0100
message:
update to the latest bzr-transport-registry branch
------------------------------------------------------------
revno: 2052.1.189.2.4.1.2
revision-id: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
parent: ghigo at venice-20070127172441-cdb1cz664f9jqent
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Sat 2007-01-27 18:25:42 +0100
message:
update to the latest bzr.dev
------------------------------------------------------------
revno: 2052.1.189.2.4.1.1
revision-id: ghigo at venice-20070127172441-cdb1cz664f9jqent
parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Sat 2007-01-27 18:24:41 +0100
message:
uncomment test test__get_set_protocol_handlers
------------------------------------------------------------
revno: 2052.1.189.2.6
revision-id: ghigo at venice-20070126211058-rekclacctmf9tes8
parent: ghigo at venice-20070126210953-2meopm4tu1x728wx
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Fri 2007-01-26 22:10:58 +0100
message:
removed unused code
------------------------------------------------------------
revno: 2052.1.189.2.5
revision-id: ghigo at venice-20070126210953-2meopm4tu1x728wx
parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry-help-topics
timestamp: Fri 2007-01-26 22:09:53 +0100
message:
add the topics transport
------------------------------------------------------------
revno: 2052.1.189.2.4
revision-id: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
parent: ghigo at venice-20070126204127-lnwfza86czjj5t9u
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Fri 2007-01-26 21:44:17 +0100
message:
removed commented line
------------------------------------------------------------
revno: 2052.1.189.2.3
revision-id: ghigo at venice-20070126204127-lnwfza86czjj5t9u
parent: ghigo at venice-20070126203011-lhslhnwj1avh0jee
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Fri 2007-01-26 21:41:27 +0100
message:
removed the the registration of the 'None' transport, instead we use the set_default_transport function
rename transport_registry in transport_list_registry
remove unused function
------------------------------------------------------------
revno: 2052.1.189.2.2
revision-id: ghigo at venice-20070126203011-lhslhnwj1avh0jee
parent: ghigo at venice-20070124203508-4tg2vz734s5j40y7
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Fri 2007-01-26 21:30:11 +0100
message:
Create the TransportList class
------------------------------------------------------------
revno: 2052.1.189.2.1
revision-id: ghigo at venice-20070124203508-4tg2vz734s5j40y7
parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
committer: ghigo <ghigo at venice>
branch nick: bzr-transport-registry
timestamp: Wed 2007-01-24 21:35:08 +0100
message:
Add the TransportRegistry class
------------------------------------------------------------
revno: 2052.1.390
revision-id: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 04:01:58 +0100
message:
(robertc) Add the infrastructure for having C extension modules based on pyrex in bzrlib. (Robert Collins).
------------------------------------------------------------
revno: 1739.1.6
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.
------------------------------------------------------------
revno: 1739.1.5
revision-id: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
parent: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Mon 2007-04-23 12:21:12 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 1739.1.4
revision-id: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
parent: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Mon 2007-03-12 10:34:27 +1100
message:
Fix building of C modules without pyrex installed.
------------------------------------------------------------
revno: 1739.1.3
revision-id: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
parent: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
parent: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Thu 2007-03-08 15:06:06 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1739.1.2
revision-id: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
parent: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Sat 2006-06-10 00:13:37 +1000
message:
More pyrex finesse, documentation.
------------------------------------------------------------
revno: 1739.1.1
revision-id: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
parent: pqm at pqm.ubuntu.com-20060603212040-9ec7af97aa11d4d7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pyrex
timestamp: Mon 2006-06-05 03:34:18 +1000
message:
First cut at adding pyrex facilities.
------------------------------------------------------------
revno: 2052.1.389
revision-id: 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: 2052.1.380.1.33
revision-id: 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: 2052.1.380.1.32
revision-id: 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: 2052.1.380.1.31
revision-id: 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: 2052.1.380.1.30
revision-id: 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: 2052.1.380.1.29
revision-id: 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: 2052.1.380.1.28
revision-id: 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: 2052.1.380.1.27
revision-id: 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: 2052.1.380.1.26
revision-id: 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: 2052.1.380.1.25
revision-id: 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: 2052.1.380.1.24
revision-id: 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: 2052.1.380.1.23
revision-id: 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: 2052.1.380.1.22
revision-id: 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: 2052.1.380.1.21
revision-id: 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: 2052.1.380.1.20
revision-id: 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: 2052.1.380.1.19
revision-id: 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: 2052.1.380.1.18
revision-id: 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: 2052.1.380.1.17
revision-id: 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: 2052.1.380.1.16
revision-id: 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: 2052.1.380.1.15
revision-id: 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: 2052.1.380.1.14
revision-id: 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: 2052.1.380.1.13
revision-id: 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: 2052.1.380.1.12
revision-id: 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: 2052.1.380.1.11
revision-id: 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: 2052.1.380.1.10
revision-id: 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: 2052.1.380.1.9
revision-id: 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: 2052.1.380.1.8
revision-id: 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: 2052.1.380.1.7
revision-id: 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: 2052.1.380.1.6
revision-id: 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: 2052.1.380.1.5
revision-id: 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: 2052.1.380.1.4
revision-id: 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: 2052.1.380.1.3
revision-id: 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: 2052.1.380.1.2
revision-id: 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: 2052.1.380.1.1
revision-id: 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: 2052.1.388
revision-id: 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: 2052.1.386.1.16
revision-id: 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: 2052.1.386.1.15
revision-id: 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: 2052.1.386.1.14
revision-id: 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: 2052.1.386.1.13
revision-id: 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: 2052.1.386.1.12
revision-id: 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: 2052.1.386.1.11
revision-id: 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: 2052.1.386.1.10
revision-id: 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: 2052.1.386.1.9
revision-id: 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: 2052.1.386.1.8
revision-id: 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: 2052.1.386.1.7
revision-id: 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: 2052.1.386.1.6
revision-id: 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: 2052.1.386.1.5
revision-id: 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: 2052.1.386.1.4
revision-id: 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: 2052.1.386.1.3
revision-id: 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: 2052.1.386.1.2
revision-id: 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: 2052.1.386.1.1
revision-id: 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: 2052.1.387
revision-id: 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: 2052.1.336.1.13
revision-id: 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: 2052.1.336.1.12
revision-id: 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: 2052.1.336.1.11
revision-id: 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: 2052.1.336.1.10
revision-id: 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: 2052.1.336.1.9
revision-id: 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: 2052.1.336.1.8
revision-id: 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: 2052.1.336.1.7
revision-id: 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: 2052.1.336.1.6
revision-id: 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: 2052.1.336.1.5
revision-id: 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: 2052.1.336.1.4
revision-id: 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: 2052.1.336.1.3
revision-id: 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: 2052.1.336.1.2
revision-id: 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: 2052.1.336.1.1
revision-id: 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: 2052.1.386
revision-id: 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: 2052.1.350.2.5
revision-id: 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: 2052.1.350.2.4
revision-id: 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: 2052.1.350.2.3
revision-id: 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: 2052.1.350.2.2
revision-id: 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: 2052.1.350.2.1
revision-id: 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: 2052.1.385
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.384
revision-id: 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: 2052.1.373.5.1
revision-id: 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: 2052.1.383
revision-id: 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: 2018.1.11.1.25.1.13.1.174
revision-id: 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: 2018.1.11.1.25.1.13.1.173
revision-id: 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: 2018.1.11.1.25.1.13.1.172
revision-id: 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: 2018.1.11.1.25.1.13.1.171
revision-id: 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: 2052.1.352.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.170
revision-id: 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: 2018.1.11.1.25.1.13.1.169
revision-id: 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: 2018.1.11.1.25.1.13.1.168
revision-id: 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: 2018.1.11.1.25.1.13.1.167
revision-id: 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: 2018.1.11.1.25.1.13.1.166
revision-id: 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: 2018.1.11.1.25.1.13.1.165
revision-id: 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: 2018.1.11.1.25.1.13.1.164
revision-id: 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: 2018.1.11.1.25.1.13.1.163
revision-id: 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: 2018.1.11.1.25.1.13.1.162
revision-id: 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: 2018.1.11.1.25.1.13.1.161
revision-id: 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: 2018.1.11.1.25.1.13.1.160
revision-id: 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: 2018.1.11.1.25.1.13.1.159
revision-id: 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: 2018.1.11.1.25.1.13.1.158
revision-id: 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: 2018.1.11.1.25.1.13.1.157
revision-id: 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: 2018.1.11.1.25.1.13.1.156
revision-id: 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: 2018.1.11.1.25.1.13.1.155
revision-id: 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: 2018.1.11.1.25.1.13.1.154
revision-id: 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: 2018.1.11.1.25.1.13.1.153
revision-id: 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: 2018.1.11.1.25.1.13.1.152
revision-id: 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: 2018.1.11.1.25.1.13.1.151
revision-id: 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: 2018.1.11.1.25.1.13.1.150.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.150.1.1
revision-id: 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: 2052.1.362.2.1
revision-id: 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: 2018.1.11.1.25.1.13.1.150
revision-id: 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: 2018.1.11.1.25.1.13.1.149
revision-id: 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: 2018.1.11.1.25.1.13.1.148
revision-id: 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: 2018.1.11.1.25.1.13.1.147
revision-id: 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: 2018.1.11.1.25.1.13.1.146
revision-id: 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: 2018.1.11.1.25.1.13.1.145
revision-id: 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: 2018.1.11.1.25.1.13.1.144
revision-id: 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: 2018.1.11.1.25.1.13.1.143
revision-id: 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: 2018.1.11.1.25.1.13.1.142
revision-id: 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: 2018.1.11.1.25.1.13.1.141
revision-id: 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: 2018.1.11.1.25.1.13.1.140
revision-id: 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: 2018.1.11.1.25.1.13.1.139
revision-id: 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: 2018.1.11.1.25.1.13.1.138
revision-id: 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: 2018.1.11.1.25.1.13.1.137
revision-id: 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: 2018.1.11.1.25.1.13.1.136
revision-id: 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: 2018.1.11.1.25.1.13.1.135
revision-id: 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: 2018.1.11.1.25.1.13.1.134
revision-id: 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: 2018.1.11.1.25.1.13.1.133
revision-id: 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: 2018.1.11.1.25.1.13.1.132
revision-id: 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: 2018.1.11.1.25.1.13.1.131
revision-id: 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: 2018.1.11.1.25.1.13.1.130
revision-id: 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: 2018.1.11.1.25.1.13.1.129
revision-id: 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: 2018.1.11.1.25.1.13.1.128
revision-id: 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: 2018.1.11.1.25.1.13.1.127
revision-id: 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: 2018.1.11.1.25.1.13.1.126
revision-id: 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: 2018.1.11.1.25.1.13.1.125
revision-id: 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: 2018.1.11.1.25.1.13.1.124
revision-id: 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: 2018.1.11.1.25.1.13.1.123
revision-id: 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: 2018.1.11.1.25.1.13.1.122
revision-id: 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: 2018.1.11.1.25.1.13.1.121
revision-id: 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: 2018.1.11.1.25.1.13.1.120
revision-id: 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: 2018.1.11.1.25.1.13.1.119
revision-id: 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: 2018.1.11.1.25.1.13.1.118
revision-id: 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: 2018.1.11.1.25.1.13.1.117
revision-id: 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: 2018.1.11.1.25.1.13.1.116
revision-id: 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: 2018.1.11.1.25.1.13.1.115
revision-id: 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: 2018.1.11.1.25.1.13.1.114
revision-id: 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: 2018.1.11.1.25.1.13.1.113
revision-id: 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: 2018.1.11.1.25.1.13.1.112
revision-id: 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: 2018.1.11.1.25.1.13.1.111
revision-id: 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: 2018.1.11.1.25.1.13.1.110
revision-id: 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: 2018.1.11.1.25.1.13.1.109
revision-id: 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: 2018.1.11.1.25.1.13.1.104.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.104.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.108
revision-id: 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: 2018.1.11.1.25.1.13.1.107
revision-id: 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: 2018.1.11.1.25.1.13.1.106
revision-id: 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: 2018.1.11.1.25.1.13.1.105
revision-id: 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: 2018.1.11.1.25.1.13.1.104
revision-id: 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: 2018.1.11.1.25.1.13.1.103
revision-id: 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: 2018.1.11.1.25.1.13.1.102
revision-id: 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: 2018.1.11.1.25.1.13.1.101
revision-id: 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: 2018.1.11.1.25.1.13.1.100
revision-id: 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: 2018.1.11.1.25.1.13.1.99
revision-id: 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: 2018.1.11.1.25.1.13.1.98
revision-id: 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: 2018.1.11.1.25.1.13.1.97
revision-id: 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: 2018.1.11.1.25.1.13.1.96
revision-id: 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: 2018.1.11.1.25.1.13.1.95
revision-id: 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: 2018.1.11.1.25.1.13.1.94
revision-id: 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: 2018.1.11.1.25.1.13.1.93
revision-id: 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: 2018.1.11.1.25.1.13.1.92
revision-id: 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: 2018.1.11.1.25.1.13.1.91
revision-id: 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: 2052.1.253.3.1
revision-id: 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: 2018.1.11.1.25.1.13.1.90
revision-id: 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: 2018.1.11.1.25.1.13.1.89
revision-id: 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: 2018.1.11.1.25.1.13.1.88
revision-id: 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: 2018.1.11.1.25.1.13.1.87
revision-id: 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: 2018.1.11.1.25.1.13.1.86
revision-id: 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: 2018.1.11.1.25.1.13.1.85
revision-id: 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: 2018.1.11.1.25.1.13.1.84
revision-id: 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: 2018.1.11.1.25.1.13.1.83
revision-id: 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: 2018.1.11.1.25.1.13.1.82
revision-id: 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: 2018.1.11.1.25.1.13.1.81
revision-id: 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: 2018.1.11.1.25.1.13.1.80.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.80
revision-id: 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: 2018.1.11.1.25.1.13.1.79.1.3
revision-id: 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: 2018.1.11.1.25.1.13.1.79.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.79.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.79.2.1
revision-id: 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: 2018.1.11.1.25.1.13.1.79
revision-id: 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: 2018.1.11.1.25.1.13.1.78
revision-id: 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: 2018.1.11.1.25.1.13.1.77
revision-id: 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: 2018.1.11.1.25.1.13.1.76
revision-id: 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: 2018.1.11.1.25.1.13.1.75
revision-id: 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: 2018.1.11.1.25.1.13.1.74
revision-id: 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: 2018.1.11.1.25.1.13.1.73
revision-id: 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: 2018.1.11.1.25.1.13.1.72.1.3
revision-id: 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: 2018.1.11.1.25.1.13.1.72.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.72.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.72
revision-id: 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: 2018.1.11.1.25.1.13.1.71.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.71.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.71
revision-id: 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: 2018.1.11.1.25.1.13.1.70
revision-id: 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: 2018.1.11.1.25.1.13.1.69
revision-id: 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: 2018.1.11.1.25.1.13.1.68
revision-id: 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: 2018.1.11.1.25.1.13.1.63.1.3
revision-id: 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: 2018.1.11.1.25.1.13.1.63.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.63.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.67
revision-id: 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: 2018.1.11.1.25.1.13.1.66
revision-id: 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: 2018.1.11.1.25.1.13.1.65
revision-id: 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: 2018.1.11.1.25.1.13.1.64
revision-id: 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: 2018.1.11.1.25.1.13.1.63
revision-id: 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: 2018.1.11.1.25.1.13.1.62
revision-id: 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: 2018.1.11.1.25.1.13.1.61
revision-id: 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: 2018.1.11.1.25.1.13.1.60
revision-id: 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: 2018.1.11.1.25.1.13.1.59
revision-id: 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: 2018.1.11.1.25.1.13.1.58
revision-id: 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: 2018.1.11.1.25.1.13.1.57
revision-id: 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: 2018.1.11.1.25.1.13.1.56
revision-id: 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: 2018.1.11.1.25.1.13.1.55
revision-id: 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: 2018.1.11.1.25.1.13.1.54
revision-id: 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: 2018.1.11.1.25.1.13.1.53
revision-id: 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: 2018.1.11.1.25.1.13.1.52
revision-id: 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: 2018.1.11.1.25.1.13.1.51
revision-id: 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: 2018.1.11.1.25.1.13.1.50
revision-id: 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: 2018.1.11.1.25.1.13.1.49
revision-id: 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: 2018.1.11.1.25.1.13.1.48
revision-id: 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: 2018.1.11.1.25.1.13.1.47
revision-id: 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: 2018.1.11.1.25.1.13.1.46
revision-id: 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: 2018.1.11.1.25.1.13.1.45
revision-id: 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: 2018.1.11.1.25.1.13.1.44
revision-id: 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: 2018.1.11.1.25.1.13.1.43
revision-id: 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: 2018.1.11.1.25.1.13.1.42
revision-id: 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: 2018.1.11.1.25.1.13.1.41
revision-id: 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: 2018.1.11.1.25.1.13.1.40
revision-id: 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: 2018.1.11.1.25.1.13.1.39
revision-id: 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: 2018.1.11.1.25.1.13.1.38
revision-id: 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: 2018.1.11.1.25.1.13.1.37
revision-id: 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: 2018.1.11.1.25.1.13.1.36
revision-id: 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: 2018.1.11.1.25.1.13.1.35
revision-id: 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: 2018.1.11.1.25.1.13.1.24.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.23.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.1.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.34
revision-id: 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: 2018.1.11.1.25.1.13.1.32.1.1
revision-id: 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: 2018.1.11.1.25.1.13.1.33
revision-id: 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: 2018.1.11.1.25.1.13.1.32
revision-id: 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: 2018.1.11.1.25.1.13.1.31
revision-id: 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: 2018.1.11.1.25.1.13.1.30
revision-id: 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: 2018.1.11.1.25.1.13.1.29
revision-id: 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: 2018.1.11.1.25.1.13.1.28
revision-id: 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: 2018.1.11.1.25.1.13.1.27
revision-id: 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: 2018.1.11.1.25.1.13.1.26
revision-id: 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: 2018.1.11.1.25.1.13.1.25
revision-id: 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: 2018.1.11.1.25.1.13.1.24
revision-id: 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: 2018.1.11.1.25.1.13.1.23
revision-id: 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: 2018.1.11.1.25.1.13.1.22
revision-id: 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: 2018.1.11.1.25.1.13.1.21
revision-id: 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: 2018.1.11.1.25.1.13.1.20
revision-id: 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: 2018.1.11.1.25.1.13.1.19
revision-id: 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: 2018.1.11.1.25.1.13.1.18
revision-id: 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: 2018.1.11.1.25.1.13.1.17
revision-id: 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: 2018.1.11.1.25.1.13.1.16
revision-id: 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: 2018.1.11.1.25.1.13.1.15
revision-id: 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: 2018.1.11.1.25.1.13.1.14
revision-id: 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: 2018.1.11.1.25.1.13.1.13
revision-id: 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: 2018.1.11.1.25.1.13.1.12
revision-id: 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: 2018.1.11.1.25.1.13.1.11
revision-id: 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: 2018.1.11.1.25.1.13.1.10
revision-id: 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: 2018.1.11.1.25.1.13.1.9
revision-id: 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: 2018.1.11.1.25.1.13.1.8
revision-id: 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: 2018.1.11.1.25.1.13.1.7
revision-id: 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: 2018.1.11.1.25.1.13.1.6
revision-id: 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: 2018.1.11.1.25.1.13.1.5
revision-id: 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: 2018.1.11.1.25.1.13.1.4
revision-id: 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: 2018.1.11.1.25.1.13.1.3
revision-id: 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: 2018.1.11.1.25.1.13.1.2
revision-id: 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: 2018.1.11.1.25.1.13.1.1
revision-id: 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: 1752.2.90
revision-id: 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: 1752.2.89
revision-id: 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: 1752.2.88
revision-id: 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: 1752.2.87
revision-id: 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: 1752.2.86
revision-id: 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: 1752.2.85
revision-id: 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: 1752.2.84
revision-id: 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: 1752.2.83
revision-id: 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: 1752.2.82
revision-id: 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: 1752.2.81
revision-id: 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: 1752.2.80
revision-id: 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: 1752.2.79
revision-id: 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: 1752.2.78
revision-id: 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: 1752.2.41.1.18
revision-id: 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: 1752.2.41.1.14.1.4
revision-id: 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: 1752.2.77
revision-id: 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: 1752.2.41.1.17
revision-id: 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: 1752.2.41.1.14.1.3
revision-id: 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: 1752.2.76
revision-id: 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: 1752.2.75
revision-id: 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: 1752.2.74
revision-id: 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: 1752.2.73
revision-id: 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: 1752.2.72
revision-id: 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: 1752.2.71
revision-id: 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: 1752.2.41.1.16
revision-id: 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: 1752.2.41.1.14.1.2
revision-id: 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: 1752.2.70
revision-id: 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: 1752.2.41.1.15
revision-id: 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: 1752.2.41.1.14.1.1
revision-id: 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: 1752.2.69
revision-id: 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: 1752.2.68
revision-id: 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: 1752.2.42.1.14
revision-id: 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: 1752.2.41.1.14
revision-id: 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: 1752.2.67
revision-id: 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: 1752.2.42.1.13
revision-id: 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: 1752.2.41.1.13
revision-id: 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: 1752.2.66
revision-id: 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: 1752.2.42.1.12
revision-id: 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: 1752.2.41.1.12
revision-id: 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: 1752.2.65
revision-id: 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: 1752.2.42.1.11
revision-id: 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: 1752.2.41.1.11
revision-id: 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: 1752.2.64
revision-id: 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: 1752.2.63
revision-id: 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: 1752.2.62
revision-id: 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: 1752.2.61
revision-id: 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: 1752.2.42.1.10
revision-id: 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: 1752.2.41.1.10
revision-id: 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: 1752.2.60
revision-id: 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: 1752.2.42.1.9
revision-id: 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: 1752.2.41.1.9
revision-id: 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: 1752.2.59
revision-id: 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: 1752.2.42.1.8
revision-id: 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: 1752.2.41.1.8
revision-id: 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: 1752.2.58
revision-id: 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: 1752.2.57
revision-id: 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: 1752.2.42.1.7
revision-id: 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: 1752.2.41.1.7
revision-id: 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: 1752.2.56
revision-id: 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: 1752.2.55
revision-id: 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: 1752.2.54
revision-id: 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: 1752.2.42.1.6
revision-id: 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: 1752.2.41.1.6
revision-id: 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: 1752.2.53
revision-id: 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: 1752.2.52
revision-id: 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: 1752.2.51
revision-id: 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: 1752.2.42.1.5
revision-id: 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: 1752.2.41.1.5
revision-id: 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: 1752.2.50
revision-id: 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: 1752.2.49
revision-id: 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: 1752.2.42.1.4
revision-id: 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: 1752.2.41.1.4
revision-id: 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: 1752.2.48
revision-id: 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: 1752.2.47
revision-id: 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: 1752.2.46
revision-id: 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: 1752.2.42.1.3
revision-id: 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: 1752.2.41.1.3
revision-id: 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: 1752.2.45
revision-id: 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: 1752.2.42.1.2
revision-id: 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: 1752.2.41.1.2
revision-id: 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: 1752.2.44
revision-id: 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: 1752.2.42.1.1
revision-id: 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: 1752.2.41.1.1
revision-id: 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: 1752.2.43
revision-id: 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: 1752.2.42
revision-id: 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: 1752.2.41
revision-id: 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: 1752.2.40
revision-id: 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: 1752.2.39
revision-id: 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: 1752.2.38
revision-id: 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: 1883.2.1
revision-id: 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: 1752.2.37
revision-id: 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: 1752.2.36
revision-id: 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: 1752.2.35
revision-id: 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: 1752.2.34
revision-id: 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: 1752.2.33
revision-id: 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: 1752.2.32
revision-id: 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: 1752.2.31
revision-id: 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: 1752.2.30
revision-id: 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: 1752.2.29
revision-id: 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: 1752.2.28
revision-id: 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: 1752.2.27
revision-id: 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: 1752.2.26
revision-id: 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: 1752.2.25
revision-id: 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: 1752.2.24
revision-id: 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: 1752.2.23
revision-id: 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: 1752.2.22
revision-id: 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: 1752.2.21
revision-id: 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: 1752.2.20
revision-id: 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: 1752.2.19
revision-id: 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: 1752.2.18
revision-id: 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: 1752.2.17
revision-id: 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: 1752.2.16
revision-id: 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: 1752.2.15
revision-id: 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: 1752.2.14
revision-id: 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: 1752.2.13
revision-id: 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: 1752.2.12
revision-id: 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: 1752.2.11
revision-id: 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: 1752.2.10
revision-id: 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: 1752.2.9
revision-id: 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: 1752.2.8
revision-id: 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: 1752.2.7
revision-id: 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: 1752.2.6
revision-id: 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: 1752.2.5
revision-id: 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: 1752.2.4
revision-id: 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: 1752.2.3
revision-id: 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: 1752.2.2
revision-id: 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: 1752.2.1
revision-id: 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: 2052.1.382
revision-id: 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: 2052.1.348.2.4
revision-id: 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: 2052.1.381
revision-id: 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: 2052.1.348.2.3
revision-id: 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: 2052.1.348.2.2
revision-id: 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: 2052.1.348.2.1
revision-id: 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: 2052.1.380
revision-id: 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: 2052.1.373.4.5
revision-id: 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: 2052.1.373.4.4
revision-id: 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: 2052.1.373.4.3
revision-id: 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: 2052.1.373.4.2
revision-id: 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: 2052.1.373.4.1
revision-id: 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: 2052.1.379
revision-id: 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: 2052.1.361.4.2
revision-id: 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: 2052.1.361.4.1
revision-id: 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: 2052.1.378
revision-id: 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: 2052.1.366.3.1
revision-id: 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: 2052.1.377
revision-id: 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: 2052.1.373.3.1
revision-id: 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: 2052.1.376
revision-id: 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: 2052.1.371.2.3
revision-id: 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: 2052.1.371.2.2
revision-id: 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: 2052.1.371.2.1
revision-id: 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: 2052.1.375
revision-id: 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: 2052.1.373.1.3
revision-id: 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: 2052.1.373.1.2
revision-id: 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: 2052.1.373.2.4
revision-id: 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: 2052.1.373.2.3
revision-id: 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: 2052.1.373.2.2
revision-id: 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: 2052.1.373.2.1
revision-id: 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: 2052.1.374
revision-id: 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: 2052.1.373.1.1
revision-id: 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: 2052.1.373
revision-id: 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: 2052.1.371.1.2
revision-id: 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: 2052.1.371.1.1
revision-id: 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: 2052.1.372
revision-id: 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: 2052.1.366.2.2
revision-id: 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: 2052.1.366.2.1
revision-id: 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: 2052.1.371
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.370
revision-id: 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: 2052.1.356.1.8
revision-id: 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: 2052.1.356.1.7
revision-id: 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: 2052.1.356.1.6
revision-id: 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: 2052.1.356.1.5
revision-id: 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: 2052.1.356.1.4
revision-id: 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: 2052.1.356.1.3
revision-id: 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: 2052.1.356.1.2
revision-id: 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: 2052.1.356.1.1
revision-id: 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: 2052.1.369
revision-id: 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: 2052.1.362.1.4
revision-id: 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: 2052.1.368
revision-id: 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: 2052.1.362.1.3
revision-id: 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: 2052.1.362.1.2
revision-id: 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: 2052.1.362.1.1
revision-id: 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: 2052.1.367
revision-id: 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: 2052.1.366.1.1
revision-id: 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: 2052.1.314.2.1
revision-id: 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: 2052.1.366
revision-id: 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: 2052.1.365.1.1
revision-id: 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: 2052.1.357.1.2
revision-id: 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: 2052.1.357.1.1
revision-id: 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: 2052.1.365
revision-id: 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: 2052.1.361.3.2
revision-id: 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: 2052.1.361.3.1
revision-id: 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: 2052.1.364
revision-id: 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: 2052.1.361.2.1
revision-id: 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: 2052.1.363
revision-id: 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: 2052.1.361.1.2
revision-id: 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: 2052.1.361.1.1
revision-id: 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: 2052.1.362
revision-id: 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: 2052.1.227.7.13
revision-id: 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: 2052.1.227.7.12
revision-id: 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: 2052.1.227.7.11
revision-id: 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: 2052.1.227.7.10
revision-id: 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: 2052.1.227.7.9
revision-id: 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: 2052.1.227.7.8
revision-id: 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: 2052.1.227.7.7
revision-id: 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: 2052.1.227.7.6
revision-id: 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: 2052.1.227.7.5
revision-id: 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: 2052.1.227.7.4
revision-id: 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: 2052.1.227.7.3
revision-id: 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: 2052.1.227.7.2
revision-id: 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: 2052.1.227.7.1
revision-id: 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: 2052.1.361
revision-id: 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: 2052.1.319.1.2
revision-id: 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: 2052.1.322.1.6
revision-id: 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: 2052.1.322.1.5
revision-id: 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: 2052.1.322.1.4
revision-id: 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: 2052.1.322.1.3
revision-id: 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: 2052.1.360
revision-id: 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: 2052.1.353.3.2
revision-id: 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: 2052.1.353.3.1
revision-id: 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: 2052.1.359
revision-id: 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: 2052.1.353.2.3
revision-id: 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: 2052.1.358
revision-id: 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: 2052.1.353.2.2
revision-id: 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: 2052.1.353.2.1
revision-id: 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: 2052.1.357
revision-id: 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: 2052.1.330.2.4.1.1
revision-id: 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: 2052.1.330.3.1
revision-id: 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: 2052.1.356
revision-id: 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: 2052.1.353.1.4
revision-id: 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: 2052.1.353.1.3
revision-id: 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: 2052.1.353.1.2
revision-id: 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: 2052.1.353.1.1
revision-id: 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: 2052.1.355
revision-id: 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: 2052.1.327.6.4
revision-id: 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: 2052.1.327.6.3
revision-id: 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: 2052.1.327.6.2
revision-id: 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: 2052.1.327.6.1
revision-id: 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: 2052.1.354
revision-id: 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: 2052.1.253.2.4
revision-id: 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: 2052.1.253.2.3
revision-id: 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: 2052.1.253.2.2
revision-id: 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: 2052.1.253.2.1
revision-id: 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: 2052.1.353
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.352
revision-id: 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: 2052.1.350.1.2
revision-id: 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: 2052.1.350.1.1
revision-id: 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: 2052.1.351
revision-id: 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: 2052.1.349.1.5
revision-id: 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: 2052.1.349.1.4
revision-id: 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: 2052.1.349.1.3
revision-id: 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: 2052.1.349.1.2
revision-id: 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: 2052.1.349.1.1
revision-id: 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: 2052.1.350
revision-id: 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: 2052.1.348.1.9
revision-id: 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: 2052.1.348.1.8
revision-id: 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: 2052.1.348.1.7
revision-id: 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: 2052.1.348.1.6
revision-id: 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: 2052.1.348.1.5
revision-id: 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: 2052.1.348.1.4
revision-id: 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: 2052.1.348.1.3
revision-id: 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: 2052.1.348.1.2
revision-id: 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: 2052.1.348.1.1
revision-id: 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: 2052.1.349
revision-id: 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: 2052.1.324.3.9
revision-id: 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: 2052.1.324.3.8
revision-id: 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: 2052.1.324.3.7
revision-id: 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: 2052.1.324.3.6
revision-id: 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: 2052.1.324.3.5
revision-id: 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: 2052.1.324.3.4
revision-id: 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: 2052.1.324.3.3
revision-id: 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: 2052.1.324.3.2
revision-id: 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: 2052.1.324.3.1
revision-id: 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: 2052.1.318.4.2
revision-id: 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: 2052.1.318.4.1
revision-id: 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: 2052.1.348
revision-id: 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: 2052.1.334.1.3
revision-id: 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: 2052.1.334.1.2
revision-id: 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: 2052.1.334.1.1
revision-id: 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: 2052.1.347
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.346
revision-id: 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: 2052.1.343.1.1
revision-id: 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: 2052.1.345
revision-id: 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: 2052.1.330.2.6
revision-id: 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: 2052.1.330.2.5
revision-id: 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: 2052.1.330.2.4
revision-id: 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: 2052.1.341.1.1
revision-id: 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: 2052.1.330.2.3
revision-id: 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: 2052.1.330.2.2
revision-id: 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: 2052.1.330.2.1
revision-id: 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: 2052.1.344
revision-id: 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: 2052.1.342.1.1
revision-id: 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: 2052.1.343
revision-id: 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
revision-id: 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: 2052.1.342
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.341
revision-id: 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: 2052.1.324.2.9
revision-id: 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: 2052.1.324.2.8
revision-id: 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: 2052.1.324.2.7
revision-id: 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: 2052.1.324.2.6
revision-id: 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: 2052.1.324.2.5
revision-id: 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: 2052.1.324.2.4
revision-id: 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: 2052.1.324.2.3
revision-id: 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: 2052.1.324.2.2
revision-id: 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: 2052.1.324.2.1
revision-id: 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: 2052.1.340
revision-id: 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: 2052.1.330.1.2
revision-id: 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: 2052.1.330.1.1
revision-id: 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: 2052.1.339
revision-id: 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: 2052.1.318.2.2
revision-id: 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: 2052.1.338
revision-id: 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: 2052.1.337.1.1
revision-id: 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: 2052.1.271.2.3.1.20
revision-id: 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: 2052.1.271.2.3.1.19
revision-id: 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: 2052.1.271.2.3.1.18
revision-id: 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: 2052.1.271.2.3.1.17
revision-id: 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: 2052.1.271.2.3.1.16
revision-id: 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: 2052.1.271.2.3.1.15
revision-id: 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: 2052.1.271.2.3.1.3.2.1.1.1
revision-id: 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: 2052.1.271.2.3.1.14
revision-id: 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: 2052.1.271.2.3.1.3.2.3
revision-id: 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: 2052.1.271.2.3.1.3.2.2
revision-id: 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: 2052.1.271.2.3.1.3.2.1
revision-id: 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: 2052.1.271.2.3.1.13
revision-id: 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: 2052.1.271.2.3.1.12
revision-id: 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: 2052.1.271.2.3.1.11
revision-id: 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: 2052.1.271.2.3.1.10
revision-id: 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: 2052.1.271.2.3.1.9
revision-id: 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: 2052.1.271.2.3.1.8
revision-id: 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: 2052.1.271.2.3.1.3.1.1
revision-id: 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: 2052.1.112.2.32
revision-id: 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: 2052.1.112.2.31
revision-id: 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: 2052.1.112.2.30
revision-id: 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: 2052.1.112.2.29
revision-id: 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: 2052.1.112.2.28
revision-id: 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: 2052.1.112.2.27
revision-id: 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: 2052.1.112.2.26
revision-id: 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: 2052.1.112.2.25
revision-id: 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: 2052.1.112.2.24
revision-id: 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: 2052.1.112.2.23
revision-id: 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: 2052.1.253.1.1
revision-id: 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: 2052.1.112.2.22
revision-id: 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: 2052.1.112.2.21
revision-id: 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: 2052.1.112.2.20
revision-id: 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: 2052.1.112.2.19
revision-id: 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: 2052.1.112.2.18
revision-id: 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: 2052.1.112.2.17
revision-id: 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: 2052.1.112.2.16
revision-id: 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: 2052.1.112.2.15
revision-id: 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: 2052.1.112.2.14
revision-id: 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: 2052.1.112.2.13
revision-id: 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: 2052.1.112.2.12
revision-id: 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: 2052.1.112.2.11
revision-id: 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: 2052.1.112.2.10
revision-id: 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: 2052.1.112.2.9
revision-id: 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: 2052.1.112.2.8
revision-id: 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: 2052.1.112.2.7
revision-id: 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: 2052.1.112.2.6
revision-id: 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: 2052.1.112.2.5
revision-id: 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: 2052.1.112.2.4
revision-id: 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: 2052.1.112.2.3
revision-id: 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: 2052.1.112.2.2
revision-id: 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: 2052.1.112.2.1
revision-id: 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: 2052.1.271.2.3.1.7
revision-id: 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: 2052.1.271.2.3.1.6
revision-id: 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: 2052.1.271.2.3.1.5
revision-id: 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: 2052.1.271.2.3.1.4
revision-id: 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: 2052.1.271.2.3.1.3
revision-id: 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: 2052.1.271.2.3.1.1.1.15
revision-id: 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: 2052.1.271.2.3.1.1.1.14
revision-id: 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: 2052.1.271.2.3.1.1.1.13
revision-id: 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: 2052.1.271.2.3.1.1.1.12
revision-id: 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: 2052.1.271.2.3.1.1.1.11
revision-id: 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: 2052.1.271.2.3.1.1.1.10
revision-id: 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: 2052.1.319.2.3
revision-id: 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: 2052.1.319.2.2
revision-id: 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: 2052.1.319.2.1
revision-id: 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: 2052.1.271.2.3.1.1.1.9
revision-id: 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: 2052.1.271.2.3.1.2
revision-id: 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: 2052.1.271.2.3.1.1.1.8
revision-id: 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: 2052.1.322.2.4
revision-id: 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: 2052.1.322.2.3
revision-id: 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: 2052.1.322.2.2
revision-id: 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: 2052.1.322.2.1
revision-id: 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: 2052.1.271.2.3.1.1.1.7
revision-id: 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: 2052.1.271.2.3.1.1.1.6
revision-id: 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: 2052.1.271.2.3.1.1.1.5
revision-id: 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: 2052.1.271.2.3.1.1.1.4
revision-id: 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: 2052.1.271.2.3.1.1.1.3
revision-id: 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: 2052.1.271.2.3.1.1.1.2
revision-id: 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: 2052.1.271.2.3.1.1.1.1
revision-id: 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: 2052.1.271.2.3.1.1
revision-id: 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: 2052.1.337
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.336
revision-id: 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: 2052.1.335.1.2
revision-id: 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: 2052.1.335.1.1
revision-id: 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: 2052.1.335
revision-id: 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: 2052.1.327.5.2
revision-id: 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: 2052.1.327.5.1
revision-id: 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: 2052.1.334
revision-id: 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: 2052.1.327.4.1
revision-id: 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: 2052.1.333
revision-id: 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: 2052.1.327.3.1
revision-id: 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: 2052.1.332
revision-id: 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: 2052.1.329.2.2
revision-id: 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: 2052.1.329.2.1
revision-id: 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: 2052.1.331
revision-id: 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: 2052.1.329.1.4
revision-id: 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: 2052.1.329.1.3
revision-id: 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: 2052.1.329.1.2
revision-id: 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: 2052.1.329.1.1
revision-id: 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: 2052.1.330
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.329
revision-id: 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: 2052.1.327.2.3
revision-id: 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: 2052.1.327.2.2
revision-id: 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: 2052.1.327.2.1
revision-id: 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: 2052.1.328
revision-id: 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: 2052.1.327.1.1
revision-id: 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: 2052.1.327
revision-id: 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: 2052.1.326.1.1
revision-id: 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: 2052.1.315.1.9
revision-id: 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: 2052.1.315.1.8
revision-id: 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: 2052.1.315.1.7
revision-id: 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: 2052.1.315.1.6
revision-id: 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: 2052.1.315.1.5
revision-id: 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: 2052.1.315.1.4
revision-id: 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: 2052.1.315.1.3
revision-id: 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: 2052.1.315.1.2
revision-id: 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: 2052.1.326
revision-id: 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: 2052.1.322.1.2
revision-id: 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: 2052.1.322.1.1
revision-id: 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: 2052.1.325
revision-id: 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: 2052.1.324.1.1
revision-id: 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: 2052.1.315.2.1
revision-id: 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: 2052.1.324
revision-id: 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: 2052.1.323.1.7
revision-id: 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: 2052.1.323.1.6
revision-id: 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: 2052.1.323.1.5
revision-id: 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: 2052.1.323.1.4
revision-id: 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: 2052.1.323.1.3
revision-id: 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: 2052.1.323.1.2
revision-id: 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: 2052.1.323.1.1
revision-id: 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: 2052.1.323
revision-id: 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
revision-id: 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: 2052.1.322
revision-id: 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: 2052.1.318.3.2
revision-id: 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: 2052.1.318.3.1
revision-id: 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: 2052.1.321
revision-id: 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: 2052.1.282.1.6
revision-id: 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: 2052.1.282.1.5
revision-id: 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: 2052.1.282.1.4
revision-id: 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: 2052.1.282.1.3
revision-id: 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: 2052.1.282.1.2
revision-id: 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: 2052.1.282.1.1
revision-id: 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: 2052.1.320
revision-id: 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: 2052.1.319.1.1
revision-id: 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: 2052.1.314.1.2
revision-id: 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: 2052.1.314.1.1
revision-id: 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: 2052.1.319
revision-id: 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: 2052.1.318.1.1
revision-id: 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: 2052.1.318.2.1
revision-id: 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: 2052.1.318
revision-id: 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: 2052.1.269.2.7
revision-id: 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: 2052.1.317
revision-id: 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: 2052.1.309.1.1
revision-id: 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: 2052.1.316
revision-id: 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: 2052.1.315.1.1
revision-id: 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: 2052.1.271.2.4
revision-id: 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: 2052.1.271.2.3
revision-id: 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: 2052.1.306.2.1
revision-id: 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: 2052.1.271.2.2
revision-id: 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: 2052.1.271.2.1.1.2
revision-id: 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: 2052.1.271.2.1.1.1
revision-id: 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: 2052.1.271.2.1
revision-id: 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: 2052.1.271.3.1
revision-id: 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: 2052.1.315
revision-id: 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: 2052.1.311.3.4
revision-id: 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: 2052.1.311.3.3
revision-id: 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: 2052.1.311.3.2
revision-id: 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: 2052.1.311.3.1
revision-id: 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: 2052.1.301.3.8.1.11
revision-id: 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: 2052.1.301.3.8.1.10
revision-id: 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: 2052.1.301.3.8.1.8.1.1
revision-id: 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: 2052.1.301.3.8.1.9
revision-id: 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: 2052.1.301.3.8.1.8
revision-id: 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: 2052.1.301.3.8.1.7
revision-id: 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: 2052.1.301.3.8.1.6
revision-id: 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: 2052.1.301.3.8.1.5
revision-id: 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: 2052.1.301.3.8.1.4
revision-id: 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: 2052.1.301.3.8.1.3
revision-id: 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: 2052.1.301.3.8.1.2
revision-id: 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: 2052.1.301.3.8.1.1
revision-id: 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: 2052.1.314
revision-id: 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: 2052.1.311.2.5
revision-id: 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: 2052.1.311.2.4
revision-id: 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: 2052.1.311.2.3
revision-id: 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: 2052.1.311.2.2
revision-id: 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: 2052.1.311.2.1
revision-id: 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: 2052.1.313
revision-id: 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: 2052.1.311.1.4
revision-id: 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: 2052.1.311.1.3
revision-id: 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: 2052.1.311.1.2
revision-id: 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: 2052.1.311.1.1
revision-id: 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: 2052.1.312
revision-id: 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
revision-id: 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: 2052.1.311
revision-id: 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: 2052.1.308.1.8
revision-id: 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: 2052.1.308.1.7
revision-id: 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: 2052.1.308.1.6
revision-id: 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: 2052.1.308.1.5
revision-id: 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: 2052.1.308.1.4
revision-id: 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: 2052.1.308.1.3
revision-id: 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: 2052.1.308.1.2
revision-id: 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: 2052.1.308.1.1
revision-id: 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: 2052.1.310
revision-id: 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: 2052.1.301.3.14
revision-id: 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: 2052.1.309
revision-id: 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: 2052.1.301.3.13
revision-id: 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: 2052.1.308
revision-id: 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: 2052.1.301.3.12
revision-id: 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: 2052.1.301.3.11
revision-id: 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: 2052.1.301.3.10
revision-id: 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: 2052.1.301.3.9
revision-id: 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: 2052.1.301.3.8
revision-id: 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: 2052.1.301.3.7
revision-id: 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: 2052.1.301.3.6
revision-id: 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: 2052.1.301.3.5
revision-id: 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: 2052.1.301.3.4
revision-id: 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: 2052.1.301.3.3
revision-id: 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: 2052.1.301.3.2
revision-id: 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: 2052.1.301.3.1
revision-id: 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: 2052.1.307
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.306.1.1
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.306
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.305
revision-id: 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: 2052.1.286.5.1
revision-id: 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: 2052.1.304
revision-id: 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: 2052.1.269.2.4.1.10
revision-id: 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: 2052.1.269.2.4.1.9
revision-id: 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: 2052.1.269.2.4.1.8
revision-id: 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: 2052.1.269.2.4.1.7
revision-id: 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: 2052.1.269.2.4.1.6
revision-id: 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: 2052.1.269.2.4.1.5
revision-id: 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: 2052.1.269.2.4.1.4
revision-id: 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: 2052.1.269.2.4.1.3
revision-id: 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: 2052.1.269.2.4.1.2
revision-id: 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: 2052.1.269.2.4.1.1
revision-id: 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: 2052.1.303
revision-id: 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: 2052.1.301.2.1
revision-id: 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: 2052.1.205.2.2
revision-id: 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: 2052.1.205.2.1
revision-id: 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: 2052.1.302
revision-id: 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: 2052.1.301.1.1
revision-id: 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: 2052.1.298.1.1
revision-id: 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: 2052.1.301
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.300
revision-id: 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: 2052.1.296.2.1
revision-id: 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: 2052.1.299
revision-id: 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: 2052.1.273.3.5
revision-id: 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: 2052.1.273.3.4
revision-id: 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: 2052.1.273.3.3
revision-id: 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: 2052.1.273.3.2
revision-id: 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: 2052.1.273.3.1
revision-id: 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: 2052.1.298
revision-id: 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: 2052.1.266.2.4
revision-id: 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: 2052.1.266.2.3
revision-id: 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: 2052.1.266.2.2
revision-id: 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: 2052.1.266.2.1
revision-id: 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: 2052.1.297
revision-id: 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: 2052.1.296.1.2
revision-id: 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: 2052.1.296.1.1
revision-id: 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: 2052.1.286.4.10
revision-id: 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: 2052.1.286.4.9
revision-id: 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: 2052.1.286.4.8
revision-id: 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: 2052.1.286.4.7
revision-id: 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: 2052.1.286.4.6
revision-id: 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: 2052.1.286.4.5
revision-id: 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: 2052.1.286.4.4
revision-id: 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: 2052.1.286.4.3
revision-id: 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: 2052.1.286.4.2
revision-id: 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: 2052.1.286.4.1
revision-id: 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: 2052.1.296
revision-id: 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: 2052.1.295.1.1
revision-id: 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: 2052.1.272.3.3
revision-id: 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: 2052.1.272.3.2
revision-id: 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: 2052.1.272.3.1
revision-id: 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: 2052.1.295
revision-id: 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: 2052.1.292.1.4
revision-id: 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: 2052.1.292.1.3
revision-id: 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: 2052.1.292.1.2
revision-id: 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: 2052.1.294
revision-id: 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: 2052.1.292.1.1
revision-id: 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: 2052.1.281.1.1
revision-id: 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: 2052.1.293
revision-id: 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: 2052.1.286.3.1
revision-id: 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: 2052.1.292
revision-id: 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
revision-id: 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: 2052.1.291
revision-id: 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: 2052.1.288.1.1
revision-id: 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: 2052.1.273.2.5
revision-id: 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: 2052.1.273.2.4
revision-id: 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: 2052.1.273.2.3
revision-id: 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: 2052.1.273.2.2
revision-id: 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: 2052.1.273.2.1
revision-id: 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: 2052.1.290
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.289
revision-id: 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: 2052.1.277.1.2
revision-id: 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: 2052.1.277.1.1
revision-id: 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: 2052.1.288
revision-id: 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: 2052.1.287.1.1
revision-id: 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: 2052.1.286.2.1
revision-id: 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: 2052.1.287
revision-id: 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: 2052.1.286.1.1
revision-id: 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: 2052.1.286
revision-id: 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: 2052.1.269.2.6
revision-id: 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: 2052.1.285
revision-id: 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
revision-id: 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: 2052.1.284
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.283
revision-id: 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: 2052.1.269.2.5
revision-id: 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: 2052.1.269.2.4
revision-id: 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: 2052.1.269.2.3
revision-id: 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: 2052.1.269.2.2
revision-id: 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: 2052.1.282
revision-id: 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
revision-id: 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: 2052.1.281
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.280
revision-id: 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: 2052.1.279.1.1
revision-id: 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: 2052.1.279
revision-id: 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: 2052.1.278.1.1
revision-id: 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: 2052.1.278
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.277
revision-id: 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: 2052.1.276.1.1
revision-id: 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: 2052.1.272.2.4
revision-id: 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: 2052.1.272.2.3
revision-id: 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: 2052.1.272.2.2
revision-id: 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: 2052.1.272.2.1
revision-id: 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: 2052.1.276
revision-id: 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: 2052.1.275.1.1
revision-id: 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: 2052.1.169.5.22
revision-id: 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: 2052.1.169.5.21
revision-id: 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: 2052.1.169.5.20
revision-id: 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: 2052.1.169.5.19
revision-id: 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: 2052.1.169.5.18
revision-id: 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: 2052.1.169.5.17
revision-id: 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: 2052.1.169.5.16
revision-id: 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: 2052.1.169.5.15
revision-id: 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: 2052.1.169.5.14
revision-id: 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: 2052.1.169.5.13
revision-id: 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: 2052.1.169.5.12
revision-id: 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: 2052.1.169.5.11
revision-id: 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: 2052.1.169.5.10
revision-id: 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: 2052.1.169.5.9
revision-id: 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: 2052.1.169.5.8
revision-id: 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: 2052.1.169.5.7
revision-id: 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: 2052.1.169.5.6
revision-id: 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: 2052.1.169.5.5
revision-id: 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: 2052.1.169.5.4
revision-id: 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: 2052.1.169.5.3
revision-id: 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: 2052.1.169.5.2
revision-id: 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: 2052.1.169.5.1
revision-id: 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: 2052.1.275
revision-id: 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: 2052.1.274.1.1
revision-id: 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: 2052.1.242.4.4
revision-id: 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: 2052.1.242.4.3
revision-id: 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: 2052.1.242.4.2
revision-id: 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: 2052.1.242.4.1
revision-id: 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: 2052.1.274
revision-id: 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: 2052.1.273.1.2
revision-id: 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: 2052.1.273.1.1
revision-id: 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: 2052.1.272.1.2
revision-id: 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: 2052.1.272.1.1
revision-id: 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: 2052.1.273
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2052.1.272
revision-id: 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.
------------------------------------------------------------
revno: 2052.1.271.1.1
revision-id: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-07 23:00:12 +1100
message:
(robertc) Setup for 0.16 development.
------------------------------------------------------------
revno: 2052.1.271
revision-id: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
parent: pqm at pqm.ubuntu.com-20070307104544-59e3e6358e4bdb29
parent: bialix at ukr.net-20070306230900-mbyylf39npkof72m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 11:05:38 +0000
message:
(bialix) `bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
------------------------------------------------------------
revno: 2052.1.269.2.1
revision-id: bialix at ukr.net-20070306230900-mbyylf39npkof72m
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.numbering
timestamp: Wed 2007-03-07 01:09:00 +0200
message:
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
------------------------------------------------------------
revno: 2052.1.270
revision-id: pqm at pqm.ubuntu.com-20070307104544-59e3e6358e4bdb29
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: robertc at robertcollins.net-20070307091110-ga6qtkb917x13a0j
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 10:45:44 +0000
message:
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)
------------------------------------------------------------
revno: 2052.1.269.1.2
revision-id: robertc at robertcollins.net-20070307091110-ga6qtkb917x13a0j
parent: robertc at robertcollins.net-20070307080258-fi172acyjga89fz5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-07 20:11:10 +1100
message:
Skip new tests that depend on unicode file paths.
------------------------------------------------------------
revno: 2052.1.269.1.1
revision-id: robertc at robertcollins.net-20070307080258-fi172acyjga89fz5
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: robertc at robertcollins.net-20070307080048-zxljn4k8ydbi12py
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-07 19:02:58 +1100
message:
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)
------------------------------------------------------------
revno: 2052.1.203.2.239
revision-id: robertc at robertcollins.net-20070307080048-zxljn4k8ydbi12py
parent: robertc at robertcollins.net-20070307060453-57bjf3z967sc6cda
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 19:00:48 +1100
message:
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
------------------------------------------------------------
revno: 2052.1.203.2.238
revision-id: robertc at robertcollins.net-20070307060453-57bjf3z967sc6cda
parent: robertc at robertcollins.net-20070307054158-j7yh62s59nz3rqdy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 17:04:53 +1100
message:
Fix annotate_iter to lock the basis tree appropriately.
------------------------------------------------------------
revno: 2052.1.203.2.237
revision-id: robertc at robertcollins.net-20070307054158-j7yh62s59nz3rqdy
parent: mbp at sourcefrog.net-20070307030914-fb2gw9ae6lxcbbcd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 16:41:58 +1100
message:
Update NEWS and clean out BRANCH.TODO.
------------------------------------------------------------
revno: 2052.1.203.2.236
revision-id: mbp at sourcefrog.net-20070307030914-fb2gw9ae6lxcbbcd
parent: mbp at sourcefrog.net-20070307013155-kxvc6ppleyv8jswg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 14:09:14 +1100
message:
Review cleanups: mostly updating or removing todo comments.
------------------------------------------------------------
revno: 2052.1.203.2.235
revision-id: mbp at sourcefrog.net-20070307013155-kxvc6ppleyv8jswg
parent: robertc at robertcollins.net-20070307011411-0cmmc8atx67v3nv7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 12:31:55 +1100
message:
Add blackbox test that join gives clean error when the repository doesn't support rich roots
------------------------------------------------------------
revno: 2052.1.203.2.234
revision-id: robertc at robertcollins.net-20070307011411-0cmmc8atx67v3nv7
parent: john at arbash-meinel.com-20070307010431-xjvtqmf6aqeyosy1
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 12:14:11 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2052.1.203.2.233
revision-id: john at arbash-meinel.com-20070307010431-xjvtqmf6aqeyosy1
parent: robertc at robertcollins.net-20070306225507-natrr5l50ppfndpz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-03-06 19:04:31 -0600
message:
DirState.initialize returns a locked state, unlock as part of cleanup.
------------------------------------------------------------
revno: 2052.1.203.2.232
revision-id: robertc at robertcollins.net-20070306225507-natrr5l50ppfndpz
parent: robertc at robertcollins.net-20070306214551-ayvx2ziz2hgbkqm0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 09:55:07 +1100
message:
Make WorkingTree4 report support for references based on the repositories capabilities.
------------------------------------------------------------
revno: 2052.1.203.2.231
revision-id: robertc at robertcollins.net-20070306214551-ayvx2ziz2hgbkqm0
parent: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 08:45:51 +1100
message:
Add test showing reverts UI working as Aaron intended it to.
------------------------------------------------------------
revno: 2052.1.203.2.230
revision-id: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
parent: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:47:33 +1100
message:
Update tree format signatures to mention introducing bzr version.
------------------------------------------------------------
revno: 2052.1.203.2.229
revision-id: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
parent: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:21:01 +1100
message:
Fix remaining test failures.
------------------------------------------------------------
revno: 2052.1.203.2.228
revision-id: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
parent: robertc at robertcollins.net-20070306125822-gs9rgs7v2erqgf2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:08:53 +1100
message:
Make all test_add_reference tests pass again.
------------------------------------------------------------
revno: 2052.1.203.2.227
revision-id: robertc at robertcollins.net-20070306125822-gs9rgs7v2erqgf2d
parent: robertc at robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 23:58:22 +1100
message:
Make all test_commit tests pass.
------------------------------------------------------------
revno: 2052.1.203.2.226
revision-id: robertc at robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
parent: mbp at sourcefrog.net-20070306121306-n387xz1h5aguv1he
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 23:28:18 +1100
message:
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
------------------------------------------------------------
revno: 2052.1.203.2.225
revision-id: mbp at sourcefrog.net-20070306121306-n387xz1h5aguv1he
parent: mbp at sourcefrog.net-20070306120030-2m551vgy28ma9kn0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 23:13:06 +1100
message:
Prohibit dirstate from getting entries called ..
------------------------------------------------------------
revno: 2052.1.203.2.224
revision-id: mbp at sourcefrog.net-20070306120030-2m551vgy28ma9kn0
parent: mbp at sourcefrog.net-20070306112615-493rbu77ars2g8vt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 23:00:30 +1100
message:
TestBranch6 doesn't need to do add('.')
------------------------------------------------------------
revno: 2052.1.203.2.223
revision-id: mbp at sourcefrog.net-20070306112615-493rbu77ars2g8vt
parent: mbp at sourcefrog.net-20070306111631-gfhevzp0oi5kx7hw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 22:26:15 +1100
message:
add stubbed out join blackbox test
------------------------------------------------------------
revno: 2052.1.203.2.222
revision-id: mbp at sourcefrog.net-20070306111631-gfhevzp0oi5kx7hw
parent: robertc at robertcollins.net-20070306110403-37dnhgg7rshx97mp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 22:16:31 +1100
message:
Add DirState repr so we get meaningful messages
------------------------------------------------------------
revno: 2052.1.203.2.221
revision-id: robertc at robertcollins.net-20070306110403-37dnhgg7rshx97mp
parent: robertc at robertcollins.net-20070306105127-tdec4zgv1tkfgi1d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 22:04:03 +1100
message:
Remove unused function.
------------------------------------------------------------
revno: 2052.1.203.2.220
revision-id: robertc at robertcollins.net-20070306105127-tdec4zgv1tkfgi1d
parent: mbp at sourcefrog.net-20070306104738-ua4ifiix8zuvhv87
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 21:51:27 +1100
message:
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
------------------------------------------------------------
revno: 2052.1.203.2.219
revision-id: mbp at sourcefrog.net-20070306104738-ua4ifiix8zuvhv87
parent: robertc at robertcollins.net-20070306102901-y25mgksdvocjmib8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 21:47:38 +1100
message:
fix unbound local error in cmd_join
------------------------------------------------------------
revno: 2052.1.203.2.218
revision-id: robertc at robertcollins.net-20070306102901-y25mgksdvocjmib8
parent: mbp at sourcefrog.net-20070306102233-xr93c99y5y7pod64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 21:29:01 +1100
message:
Make the nested tree commit smoke test be more rigourous.
------------------------------------------------------------
revno: 2052.1.203.2.217
revision-id: mbp at sourcefrog.net-20070306102233-xr93c99y5y7pod64
parent: robertc at robertcollins.net-20070306092410-7ls3yg0dk1l0b2dj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Tue 2007-03-06 21:22:33 +1100
message:
docs
------------------------------------------------------------
revno: 2052.1.203.2.216
revision-id: robertc at robertcollins.net-20070306092410-7ls3yg0dk1l0b2dj
parent: robertc at robertcollins.net-20070306091708-p46394jg9hg5jzjq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 20:24:10 +1100
message:
simplify merge_nested tests.
------------------------------------------------------------
revno: 2052.1.203.2.215
revision-id: robertc at robertcollins.net-20070306091708-p46394jg9hg5jzjq
parent: robertc at robertcollins.net-20070306084140-10rlo4bozpfvuebh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 20:17:08 +1100
message:
Hook directory-tree-reference detection into dirstate _iter_changes.
------------------------------------------------------------
revno: 2052.1.203.2.214
revision-id: robertc at robertcollins.net-20070306084140-10rlo4bozpfvuebh
parent: robertc at robertcollins.net-20070306072420-xfvlsmm6hw0rrqe9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 19:41:40 +1100
message:
Get _iter_changes on dirstate passing the subtree tests.
------------------------------------------------------------
revno: 2052.1.203.2.213
revision-id: robertc at robertcollins.net-20070306072420-xfvlsmm6hw0rrqe9
parent: robertc at robertcollins.net-20070306065234-iq1i2xm003oxvaoi
parent: mbp at sourcefrog.net-20070306050546-3lujsd390sq65um0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 18:24:20 +1100
message:
Merge Martin.
------------------------------------------------------------
revno: 2052.1.203.2.206.1.1
revision-id: mbp at sourcefrog.net-20070306050546-3lujsd390sq65um0
parent: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 16:05:46 +1100
message:
Add BzrDir.retire_bzrdir and partly fix subsume
------------------------------------------------------------
revno: 2052.1.203.2.212
revision-id: robertc at robertcollins.net-20070306065234-iq1i2xm003oxvaoi
parent: robertc at robertcollins.net-20070306063500-ihgarcmlv48p2gu0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 17:52:34 +1100
message:
Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade.
------------------------------------------------------------
revno: 2052.1.203.2.211
revision-id: robertc at robertcollins.net-20070306063500-ihgarcmlv48p2gu0
parent: robertc at robertcollins.net-20070306052123-xfits0qiztraqs7m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 17:35:00 +1100
message:
Remove knit2 repository format- it has never been supported.
------------------------------------------------------------
revno: 2052.1.203.2.210
revision-id: robertc at robertcollins.net-20070306052123-xfits0qiztraqs7m
parent: robertc at robertcollins.net-20070306051023-3bd91ashnq3ppdkh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 16:21:23 +1100
message:
Fix test_join with dirstate default.
------------------------------------------------------------
revno: 2052.1.203.2.209
revision-id: robertc at robertcollins.net-20070306051023-3bd91ashnq3ppdkh
parent: robertc at robertcollins.net-20070306042050-as7r5l839l2yiks0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 16:10:23 +1100
message:
Remove circular imports in bzrdir format definitions.
------------------------------------------------------------
revno: 2052.1.203.2.208
revision-id: robertc at robertcollins.net-20070306042050-as7r5l839l2yiks0
parent: robertc at robertcollins.net-20070306040616-0m74enszgwqd5iid
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 15:20:50 +1100
message:
Remove more references to 'experimental' formats.
------------------------------------------------------------
revno: 2052.1.203.2.207
revision-id: robertc at robertcollins.net-20070306040616-0m74enszgwqd5iid
parent: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 15:06:16 +1100
message:
Reinstate format change for test_workingtree_4
------------------------------------------------------------
revno: 2052.1.203.2.206
revision-id: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
parent: mbp at sourcefrog.net-20070306033644-x3nw3eqytkbuig9q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 14:57:57 +1100
message:
Remove duplicate test_unique_root_id_per_tree
------------------------------------------------------------
revno: 2052.1.203.2.205
revision-id: mbp at sourcefrog.net-20070306033644-x3nw3eqytkbuig9q
parent: robertc at robertcollins.net-20070306023715-0ly3m7xrl29pgvn0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 14:36:44 +1100
message:
factor out WorkingTree4._directory_is_tree_reference
------------------------------------------------------------
revno: 2052.1.203.2.204
revision-id: robertc at robertcollins.net-20070306023715-0ly3m7xrl29pgvn0
parent: mbp at sourcefrog.net-20070306023028-eqnd3kfvn19hwl26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 13:37:15 +1100
message:
Fix info and status again.
------------------------------------------------------------
revno: 2052.1.203.2.203
revision-id: mbp at sourcefrog.net-20070306023028-eqnd3kfvn19hwl26
parent: mbp at sourcefrog.net-20070306022326-3yj7nwipfi6xegu1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 13:30:28 +1100
message:
doc
------------------------------------------------------------
revno: 2052.1.203.2.202
revision-id: mbp at sourcefrog.net-20070306022326-3yj7nwipfi6xegu1
parent: robertc at robertcollins.net-20070306020408-xjicm1vcxd0mhuvd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 13:23:26 +1100
message:
WorkingTree_4.kind should report tree-references if they're
branches on disk, regardless of what's in the working dirstate.
Add a per-workingtree test that mixes up the kinds of files and
reads them back.
------------------------------------------------------------
revno: 2052.1.203.2.201
revision-id: robertc at robertcollins.net-20070306020408-xjicm1vcxd0mhuvd
parent: mbp at sourcefrog.net-20070306015734-kpimc8npv6b3fr4k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 13:04:08 +1100
message:
Test_info needed updating after freezing the meaning of 'knit' format dirs.
------------------------------------------------------------
revno: 2052.1.203.2.200
revision-id: mbp at sourcefrog.net-20070306015734-kpimc8npv6b3fr4k
parent: robertc at robertcollins.net-20070306014805-w2cfio713i2pv6oe
parent: mbp at sourcefrog.net-20070306013713-f88tleofav7dmjzj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 12:57:34 +1100
message:
Add simple test for WorkingTree.kind
------------------------------------------------------------
revno: 2052.1.203.2.191.2.4
revision-id: mbp at sourcefrog.net-20070306013713-f88tleofav7dmjzj
parent: mbp at sourcefrog.net-20070306012722-e91h0sxbcutqb4ng
parent: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 12:37:13 +1100
message:
merge
------------------------------------------------------------
revno: 2052.1.203.2.191.2.3
revision-id: mbp at sourcefrog.net-20070306012722-e91h0sxbcutqb4ng
parent: mbp at sourcefrog.net-20070306001752-nc3cg4q7wai9a53c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 12:27:22 +1100
message:
Comments and better assertions in InterDirStateTree
------------------------------------------------------------
revno: 2052.1.203.2.191.2.2
revision-id: mbp at sourcefrog.net-20070306001752-nc3cg4q7wai9a53c
parent: mbp at sourcefrog.net-20070306001539-u50spfvz7v2c1pun
parent: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 11:17:52 +1100
message:
merge dirstate
------------------------------------------------------------
revno: 2052.1.203.2.191.2.1
revision-id: mbp at sourcefrog.net-20070306001539-u50spfvz7v2c1pun
parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Tue 2007-03-06 11:15:39 +1100
message:
review fixes from robert
------------------------------------------------------------
revno: 2052.1.203.2.199
revision-id: robertc at robertcollins.net-20070306014805-w2cfio713i2pv6oe
parent: robertc at robertcollins.net-20070306013710-itl1i2q0ld7bgdke
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:48:05 +1100
message:
Fix definition of knit format; typos are not good.
------------------------------------------------------------
revno: 2052.1.203.2.198
revision-id: robertc at robertcollins.net-20070306013710-itl1i2q0ld7bgdke
parent: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:37:10 +1100
message:
All test_join tests passing.
------------------------------------------------------------
revno: 2052.1.203.2.197
revision-id: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
parent: robertc at robertcollins.net-20070306011508-6ncdgqqlxb84esmr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:28:24 +1100
message:
Get all working_4 tests passing.
------------------------------------------------------------
revno: 2052.1.203.2.196
revision-id: robertc at robertcollins.net-20070306011508-6ncdgqqlxb84esmr
parent: robertc at robertcollins.net-20070306005352-axjk5vdian1wnyx9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:15:08 +1100
message:
Fix test_upgrade defects related to non local or absent working trees.
------------------------------------------------------------
revno: 2052.1.203.2.195
revision-id: robertc at robertcollins.net-20070306005352-axjk5vdian1wnyx9
parent: robertc at robertcollins.net-20070306002836-59i29dpv57h6i8a3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 11:53:52 +1100
message:
Fix set_reference_revision on dirstate format trees.
------------------------------------------------------------
revno: 2052.1.203.2.194
revision-id: robertc at robertcollins.net-20070306002836-59i29dpv57h6i8a3
parent: robertc at robertcollins.net-20070306002528-zkvfpjt0dwzwz85l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 11:28:36 +1100
message:
[BROKEN] Many updates to stop using experimental formats in tests.
------------------------------------------------------------
revno: 2052.1.203.2.193
revision-id: robertc at robertcollins.net-20070306002528-zkvfpjt0dwzwz85l
parent: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
parent: robertc at robertcollins.net-20070305091133-bjk279of5h029hpg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 11:25:28 +1100
message:
Implement upgrade for working trees.
------------------------------------------------------------
revno: 2052.1.203.2.191.1.1
revision-id: robertc at robertcollins.net-20070305091133-bjk279of5h029hpg
parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Mon 2007-03-05 20:11:33 +1100
message:
Implement upgrade for working trees.
------------------------------------------------------------
revno: 2052.1.203.2.192
revision-id: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-03-05 15:28:03 -0600
message:
Add support for executable bit under win32
------------------------------------------------------------
revno: 2052.1.203.2.191
revision-id: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
parent: mbp at sourcefrog.net-20070305064503-mf6hwihhvgnf88wg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:45:21 +1100
message:
additional fix for subtree comparison
------------------------------------------------------------
revno: 2052.1.203.2.190
revision-id: mbp at sourcefrog.net-20070305064503-mf6hwihhvgnf88wg
parent: mbp at sourcefrog.net-20070305063046-unnu602hw4j5jgrq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:45:03 +1100
message:
assertEqual can take an option message
------------------------------------------------------------
revno: 2052.1.203.2.189
revision-id: mbp at sourcefrog.net-20070305063046-unnu602hw4j5jgrq
parent: mbp at sourcefrog.net-20070305061143-feioqg2poiixysp6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:30:46 +1100
message:
Add and fix up basic comparison of subtrees.
------------------------------------------------------------
revno: 2052.1.203.2.188
revision-id: mbp at sourcefrog.net-20070305061143-feioqg2poiixysp6
parent: mbp at sourcefrog.net-20070305060734-xq5zyucm5puufr6z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:11:43 +1100
message:
Set common root id in comparison tests
------------------------------------------------------------
revno: 2052.1.203.2.187
revision-id: mbp at sourcefrog.net-20070305060734-xq5zyucm5puufr6z
parent: mbp at sourcefrog.net-20070305055824-8pw7naoogm3ujbrx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:07:34 +1100
message:
set common root ids in more tests
------------------------------------------------------------
revno: 2052.1.203.2.186
revision-id: mbp at sourcefrog.net-20070305055824-8pw7naoogm3ujbrx
parent: mbp at sourcefrog.net-20070305055805-xdc5z7z2o6c0n7ok
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:58:24 +1100
message:
Fix up root id for some more comparison tests
------------------------------------------------------------
revno: 2052.1.203.2.185
revision-id: mbp at sourcefrog.net-20070305055805-xdc5z7z2o6c0n7ok
parent: mbp at sourcefrog.net-20070305054951-gvy36e097zta9nyj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:58:05 +1100
message:
assertEqual uses pformat to show results
------------------------------------------------------------
revno: 2052.1.203.2.184
revision-id: mbp at sourcefrog.net-20070305054951-gvy36e097zta9nyj
parent: mbp at sourcefrog.net-20070305050600-4oib0crvql5oiedd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:49:51 +1100
message:
Fixes for some comparison tests; repr of DirStateRevisionTree
------------------------------------------------------------
revno: 2052.1.203.2.183
revision-id: mbp at sourcefrog.net-20070305050600-4oib0crvql5oiedd
parent: mbp at sourcefrog.net-20070305045534-pqrd3x4sy71x6ttw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:06:00 +1100
message:
add missing _must_be_locked and a better message
------------------------------------------------------------
revno: 2052.1.203.2.182
revision-id: mbp at sourcefrog.net-20070305045534-pqrd3x4sy71x6ttw
parent: mbp at sourcefrog.net-20070305042053-7janauma57nr4kjf
parent: mbp at sourcefrog.net-20070305041353-o81chijxnnurl2bv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 15:55:34 +1100
message:
merge dirstate and trunk
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.6
revision-id: mbp at sourcefrog.net-20070305041353-o81chijxnnurl2bv
parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
parent: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 15:13:53 +1100
message:
merge dirstate (and trunk)
------------------------------------------------------------
revno: 2052.1.203.2.151.1.98
revision-id: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:43:56 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2052.1.203.2.181
revision-id: mbp at sourcefrog.net-20070305042053-7janauma57nr4kjf
parent: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 15:20:53 +1100
message:
test_nested_merge must hold lock while looking at inventory
------------------------------------------------------------
revno: 2052.1.203.2.180
revision-id: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
parent: mbp at sourcefrog.net-20070305035848-xs1fgcwovuthekyq
parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 15:15:38 +1100
message:
merge dirstate
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.5
revision-id: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
parent: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:55:31 +1100
message:
Tree.id2path should raise NoSuchId, not return None.
Add tree implementation test for this and update WorkingTree_4.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.4
revision-id: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
parent: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:45:10 +1100
message:
merge dirstate
------------------------------------------------------------
revno: 2052.1.203.2.151.1.97
revision-id: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
parent: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:10:21 +1100
message:
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.96
revision-id: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
parent: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 12:15:25 +1100
message:
Change _iter_changes interface to yield both old and new paths.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.95
revision-id: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 09:10:43 +1100
message:
Add convenience utf8 decode routine for handling strings that might be None
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.3
revision-id: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
parent: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:34:20 +1100
message:
cherrypick support for tree-references in dirstate
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.2
revision-id: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
parent: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Sat 2007-03-03 13:21:25 +1100
message:
Add more dirstate root-id-changing tests
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92.1.1
revision-id: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Sat 2007-03-03 12:47:29 +1100
message:
fix missing import
------------------------------------------------------------
revno: 2052.1.203.2.179
revision-id: mbp at sourcefrog.net-20070305035848-xs1fgcwovuthekyq
parent: mbp at sourcefrog.net-20070305005222-udndz0dnl2vorbpi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 14:58:48 +1100
message:
enhanced set_path_id_with_parents test
------------------------------------------------------------
revno: 2052.1.203.2.178
revision-id: mbp at sourcefrog.net-20070305005222-udndz0dnl2vorbpi
parent: mbp at sourcefrog.net-20070305004001-tyu9v25z44f1a2e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Mon 2007-03-05 11:52:22 +1100
message:
test_set_path_id_with_parents shouldn't depend on tree default root id
------------------------------------------------------------
revno: 2052.1.203.2.177
revision-id: mbp at sourcefrog.net-20070305004001-tyu9v25z44f1a2e8
parent: mbp at sourcefrog.net-20070304053725-6pawqsvzge6fgvpy
parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Mon 2007-03-05 11:40:01 +1100
message:
merge dirstate sorting fix, add more validation tests
------------------------------------------------------------
revno: 2052.1.203.2.151.1.94
revision-id: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
parent: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Sun 2007-03-04 19:09:09 +1100
message:
Fix dirstate sorting bug and refine the _validate() assertions:
In this format the dirblocks are sorted by directory treated as a series
of components, validate needs to be updated to take that into account.
When there are multiple entries at the same path they are be sorted by id.
Add a test for this.
------------------------------------------------------------
revno: 2052.1.203.2.176
revision-id: mbp at sourcefrog.net-20070304053725-6pawqsvzge6fgvpy
parent: mbp at sourcefrog.net-20070303014813-fs0ojs875xo3ng8o
parent: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Sun 2007-03-04 16:37:25 +1100
message:
Merge dirstate and some small cleanups
------------------------------------------------------------
revno: 2052.1.203.2.151.1.93
revision-id: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Sun 2007-03-04 16:11:09 +1100
message:
Add support for tree-references in dirstate
------------------------------------------------------------
revno: 2052.1.203.2.175
revision-id: mbp at sourcefrog.net-20070303014813-fs0ojs875xo3ng8o
parent: mbp at sourcefrog.net-20070302094441-8gupjnz50wivvmj8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Sat 2007-03-03 12:48:13 +1100
message:
fix missing import
------------------------------------------------------------
revno: 2052.1.203.2.174
revision-id: mbp at sourcefrog.net-20070302094441-8gupjnz50wivvmj8
parent: mbp at sourcefrog.net-20070302092757-gjmoq58z9setp7kp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 20:44:41 +1100
message:
remove AB1 WorkingTree and experimental-knit3
------------------------------------------------------------
revno: 2052.1.203.2.173
revision-id: mbp at sourcefrog.net-20070302092757-gjmoq58z9setp7kp
parent: mbp at sourcefrog.net-20070302091457-r8xcdqoyesxfuijs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 20:27:57 +1100
message:
Set default wt to 4, as in dirstate branch
------------------------------------------------------------
revno: 2052.1.203.2.172
revision-id: mbp at sourcefrog.net-20070302091457-r8xcdqoyesxfuijs
parent: mbp at sourcefrog.net-20070302085638-pr8pa43gffwig209
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 20:14:57 +1100
message:
Recognize 't' (tree-reference) minikind in DirState._get_entry
------------------------------------------------------------
revno: 2052.1.203.2.171
revision-id: mbp at sourcefrog.net-20070302085638-pr8pa43gffwig209
parent: mbp at sourcefrog.net-20070302085516-0yyuvauummgcycsm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 19:56:38 +1100
message:
Fix up blackbox test_add to avoid depending on inventory not being held in memory
------------------------------------------------------------
revno: 2052.1.203.2.170
revision-id: mbp at sourcefrog.net-20070302085516-0yyuvauummgcycsm
parent: mbp at sourcefrog.net-20070301122840-6exf6ilcew2mcn1g
parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 19:55:16 +1100
message:
merge dirstate
------------------------------------------------------------
revno: 2052.1.203.2.151.1.92
revision-id: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
parent: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Fri 2007-03-02 18:57:54 +1100
message:
Test for smart_add(save=false) should be run against all WorkingTrees; adjust the test to more precisely cover the contract.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.91
revision-id: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
parent: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 15:40:12 +1100
message:
Move unknown detection in long status into the delta creation, saving a tree-scan.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.90
revision-id: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
parent: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 14:47:56 +1100
message:
Add unversioned path reporting to TreeDelta.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.89
revision-id: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
parent: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 21:19:49 -0600
message:
Revert back to base64.encodestring() It seems codes.encoder() is actually a wrapper around encodestring() not the other way around.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.88
revision-id: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
parent: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 13:58:30 +1100
message:
Enable InterTree._iter_changes symlink tests.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.87
revision-id: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
parent: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 13:49:53 +1100
message:
Dont walk unversioned directories in _iter_changes.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.86
revision-id: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
parent: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
parent: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 20:33:27 -0600
message:
Fix tests broken by dirstate caching sha1 and stat values.
Change _iter_changes so that it call update_entry() at the beginning.
this gives us a chance to have files change kind, and still get
the sha1 value from the cache rather than re-reading the file.
Some small updates for executable bits on win32.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.9
revision-id: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
parent: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:30:56 -0600
message:
one more test that needs to ignore dirstate
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.8
revision-id: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
parent: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:22:58 -0600
message:
Fix another tests that was assuming dirstate was identical
between branches.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.7
revision-id: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
parent: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:11:59 -0600
message:
Some updates to how we handle the executable bit. In preparation for supporting Win32
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.6
revision-id: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
parent: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 19:38:06 -0600
message:
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.5
revision-id: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
parent: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 19:27:53 -0600
message:
Fix a small bug when we have a symlink that does not need to be re-read.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.4
revision-id: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
parent: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 18:27:06 -0600
message:
do not update_entry from disk if it is supposed to be absent or renamed
and make sure to use the current target_details afterwards
in case something has changed.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.3
revision-id: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 18:07:29 -0600
message:
(broken) Change get_sha1_for_entry into update_entry
which reads off of the disk, and updates dirblocks.
This includes handling when files change into directories, and other
such content changes.
For some reason it breaks higher level tests, so for now, I'm
leaving this as a local commit until I can sort out the rest.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.85
revision-id: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
parent: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 12:06:12 +1100
message:
Teach _iter_changes to gather unversioned path details upon request.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.84
revision-id: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:59:30 -0600
message:
[merge] WorkingTree4 no longer uses the HashCache.
This saves 1-2s on a 'bzr status' in a 55k entry tree.
Locks are also updated to be non-blocking, and DirState will try to
write out its contents if it has been changed even if currently
read-locked, by trying to grab a write lock for the write.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.2
revision-id: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
parent: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 15:56:19 -0600
message:
Update to dirstate locking.
Move all of WT4.lock_* functions locally, so that they can
properly interact and cleanup around when we lock/unlock the
dirstate file.
Change all Lock objects to be non-blocking. So that if someone
grabs a lock on the DirState we find out immediately, rather
than blocking.
Change WT4.unlock() so that if the dirstate is dirty, it will
save the contents even if it only has a read lock.
It does this by trying to take a write lock, if it fails
we just ignore it. If it succeeds, then we can flush to disk.
This is more important now that DirState tracks file changes.
It allows 'bzr status' to update the cached stat and sha values.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83.1.1
revision-id: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 13:58:38 -0600
message:
Update WorkingTree4 so that it doesn't use a HashCache,
instead caching the sha values and stat fingerprint in the 'current'
section.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.83
revision-id: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
parent: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:48:50 -0600
message:
Update some obvious copyright headers to include 2007.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.82
revision-id: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
parent: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:06:38 -0600
message:
Fix a small typo that causes _iter_changes to break.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.81
revision-id: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
parent: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:01:33 -0600
message:
Be optimistic about .bzr/branch/revision-history already being in utf8.
Decoding all 178k revisions for a mozilla tree takes about 3s / 15s for a 'bzr status'.
Branch6 will do better by caching last_revision rather than the complete history.
But for now, it looks a lot better if we just assume the revisions are utf8.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.80
revision-id: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
parent: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 09:54:18 -0600
message:
Don't decode the path entry until we've actually decided to return the tuple.
This saves somewhere between 500 - 1000ms on the Moz tree.
It will be more noticable when we don't do the extra directory walking
(where we have to decode all of the path names again).
------------------------------------------------------------
revno: 2052.1.203.2.151.1.79
revision-id: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
parent: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 23:20:44 +1100
message:
Some BRANCH.TODO updates.
------------------------------------------------------------
revno: 2052.1.203.2.169
revision-id: mbp at sourcefrog.net-20070301122840-6exf6ilcew2mcn1g
parent: mbp at sourcefrog.net-20070301101403-v2ey2v53rhzprmds
parent: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
parent: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 23:28:40 +1100
message:
(broken) merge dirstate branch
------------------------------------------------------------
revno: 2052.1.203.2.151.1.78
revision-id: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
parent: robertc at robertcollins.net-20070301115646-t40d51cvqsrok6b5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-robert
timestamp: Thu 2007-03-01 23:04:50 +1100
message:
Add DirState._validate and call from the tests
------------------------------------------------------------
revno: 2052.1.203.2.151.1.77
revision-id: robertc at robertcollins.net-20070301115646-t40d51cvqsrok6b5
parent: robertc at robertcollins.net-20070301115027-7ch3pnc922va6fr5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 22:56:46 +1100
message:
Make test_iter_reverse_revision_history flush the working tree after commit before merging, as merge still does _write_inventory.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.76
revision-id: robertc at robertcollins.net-20070301115027-7ch3pnc922va6fr5
parent: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 22:50:27 +1100
message:
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.75
revision-id: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
parent: robertc at robertcollins.net-20070301111653-xz97hibpktk2y5co
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-robert
timestamp: Thu 2007-03-01 22:21:42 +1100
message:
WorkingTree._add only needs to lock the tree - avoids lock reentry error
------------------------------------------------------------
revno: 2052.1.203.2.151.1.74
revision-id: robertc at robertcollins.net-20070301111653-xz97hibpktk2y5co
parent: robertc at robertcollins.net-20070301095035-qq2jbr6p4ggdlu1t
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 22:16:53 +1100
message:
Test adding of roots to trees, it was broken on WorkingTree4.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.73
revision-id: robertc at robertcollins.net-20070301095035-qq2jbr6p4ggdlu1t
parent: robertc at robertcollins.net-20070301094642-jjtzsx00wz14j110
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 20:50:35 +1100
message:
Fix info for the new default format - these tests really need refactoring.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.72
revision-id: robertc at robertcollins.net-20070301094642-jjtzsx00wz14j110
parent: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 20:46:42 +1100
message:
Update cmd_deleted to lock around inventory access.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.71
revision-id: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
parent: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 20:34:26 +1100
message:
Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test.
------------------------------------------------------------
revno: 2052.1.203.2.168
revision-id: mbp at sourcefrog.net-20070301101403-v2ey2v53rhzprmds
parent: mbp at sourcefrog.net-20070301090216-vhh2444yosrvw6ll
parent: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 21:14:03 +1100
message:
merge robert, debugging
------------------------------------------------------------
revno: 2052.1.203.2.151.1.70
revision-id: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
parent: robertc at robertcollins.net-20070301084414-h302pw7vt7wllqb6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 19:50:03 +1100
message:
Workaround WorkingTree4 not having a native remove() in test_cat.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.69
revision-id: robertc at robertcollins.net-20070301084414-h302pw7vt7wllqb6
parent: mbp at sourcefrog.net-20070301083325-e87nhnnpx3i18nea
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 19:44:14 +1100
message:
Fix all blackbox add tests, and the add --from-ids case in the UI.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.68
revision-id: mbp at sourcefrog.net-20070301083325-e87nhnnpx3i18nea
parent: robertc at robertcollins.net-20070301080114-dt6xpp7v0envbati
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-robert
timestamp: Thu 2007-03-01 19:33:25 +1100
message:
Add a test for setting the root id in a dirstate with parent trees
------------------------------------------------------------
revno: 2052.1.203.2.151.1.67
revision-id: robertc at robertcollins.net-20070301080114-dt6xpp7v0envbati
parent: robertc at robertcollins.net-20070301074339-34mc7tfym7o4uugf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 19:01:14 +1100
message:
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.66
revision-id: robertc at robertcollins.net-20070301074339-34mc7tfym7o4uugf
parent: robertc at robertcollins.net-20070301072736-dc00wtcb7py592re
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 18:43:39 +1100
message:
MutableTree.add only needs a tree write lock.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.65
revision-id: robertc at robertcollins.net-20070301072736-dc00wtcb7py592re
parent: robertc at robertcollins.net-20070301071122-yhy7vchlazynnb8y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 18:27:36 +1100
message:
Split test_root_revision_entry into tree and repository portions.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.64
revision-id: robertc at robertcollins.net-20070301071122-yhy7vchlazynnb8y
parent: robertc at robertcollins.net-20070301065052-d08k4x37bchwo48e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 18:11:22 +1100
message:
Disabled test_repository.test_create_basis_inventory, a test that tests tree behaviour in the wrong place - its future is being discussed.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.63
revision-id: robertc at robertcollins.net-20070301065052-d08k4x37bchwo48e
parent: robertc at robertcollins.net-20070301061944-y1jw05ufqdpw4yx5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 17:50:52 +1100
message:
Fix cmd_renames to lock around inventory access.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.62
revision-id: robertc at robertcollins.net-20070301061944-y1jw05ufqdpw4yx5
parent: robertc at robertcollins.net-20070301054630-ff4zf6s3odxfic71
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 17:19:44 +1100
message:
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.61
revision-id: robertc at robertcollins.net-20070301054630-ff4zf6s3odxfic71
parent: robertc at robertcollins.net-20070301053439-rf8mkppoqutiy7fa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:46:30 +1100
message:
Remove exploratory cruft.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.60
revision-id: robertc at robertcollins.net-20070301053439-rf8mkppoqutiy7fa
parent: robertc at robertcollins.net-20070301052802-zwbocbr7z5vyptad
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:34:39 +1100
message:
Make the assertStatus blackbox helper clearer.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.59
revision-id: robertc at robertcollins.net-20070301052802-zwbocbr7z5vyptad
parent: robertc at robertcollins.net-20070301052607-x77gnbfssigedky4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:28:02 +1100
message:
Remove a break-lock test that was duplicating lower level testing without adding value.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.58
revision-id: robertc at robertcollins.net-20070301052607-x77gnbfssigedky4
parent: robertc at robertcollins.net-20070301052056-h3byz7nuk38la3os
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:26:07 +1100
message:
Fix a blackbox test to not use inventory to determine tree size.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.57
revision-id: robertc at robertcollins.net-20070301052056-h3byz7nuk38la3os
parent: robertc at robertcollins.net-20070301051807-3qz6wj0jtjsieyj2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:20:56 +1100
message:
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.56
revision-id: robertc at robertcollins.net-20070301051807-3qz6wj0jtjsieyj2
parent: robertc at robertcollins.net-20070301050247-ufh99m2ze45d7mol
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:18:07 +1100
message:
Document behaviour of tree.path2id("path/").
------------------------------------------------------------
revno: 2052.1.203.2.151.1.55
revision-id: robertc at robertcollins.net-20070301050247-ufh99m2ze45d7mol
parent: robertc at robertcollins.net-20070301050153-9wdn7gdori263v9e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:02:47 +1100
message:
Whitespace fix.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.54
revision-id: robertc at robertcollins.net-20070301050153-9wdn7gdori263v9e
parent: robertc at robertcollins.net-20070301050053-u0ac7vavyzplbjz1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:01:53 +1100
message:
in test_inv, stop abusing the inventory interface to get tree alterations to occur.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.53
revision-id: robertc at robertcollins.net-20070301050053-u0ac7vavyzplbjz1
parent: robertc at robertcollins.net-20070301042839-hgs5fy98vuws6iau
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 16:00:53 +1100
message:
Make the dirstate API changes be prominently documented for upgraders.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.52
revision-id: robertc at robertcollins.net-20070301042839-hgs5fy98vuws6iau
parent: robertc at robertcollins.net-20070301042042-vmcypp3mjnvuwft5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:28:39 +1100
message:
Lock trees in Merge3Merger correctly.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.51
revision-id: robertc at robertcollins.net-20070301042042-vmcypp3mjnvuwft5
parent: robertc at robertcollins.net-20070301041307-yendz2ijpubqmfgq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:20:42 +1100
message:
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.50
revision-id: robertc at robertcollins.net-20070301041307-yendz2ijpubqmfgq
parent: robertc at robertcollins.net-20070301040645-1ky0urtukkb9gdxa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:13:07 +1100
message:
Remove unguarded call to find_interesting in test_find_interesting - its tested by the actual code that does the work.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.49
revision-id: robertc at robertcollins.net-20070301040645-1ky0urtukkb9gdxa
parent: robertc at robertcollins.net-20070301035615-apsvyiyqk6pqext2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:06:45 +1100
message:
Lock trees passed in to build_tree.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.48
revision-id: robertc at robertcollins.net-20070301035615-apsvyiyqk6pqext2
parent: robertc at robertcollins.net-20070301035205-lfdthhpjoudb07b8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 14:56:15 +1100
message:
Deprecated and make work with DirState trees 'transform.find_interesting'.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.47
revision-id: robertc at robertcollins.net-20070301035205-lfdthhpjoudb07b8
parent: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 14:52:05 +1100
message:
Improve applyDeprecated warning message.
------------------------------------------------------------
revno: 2052.1.203.2.167
revision-id: mbp at sourcefrog.net-20070301090216-vhh2444yosrvw6ll
parent: mbp at sourcefrog.net-20070301075656-srwqme1s2d721937
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 20:02:16 +1100
message:
Change WorkingTree4.initialize to only get a random root id if not based on a revisiontree
------------------------------------------------------------
revno: 2052.1.203.2.166
revision-id: mbp at sourcefrog.net-20070301075656-srwqme1s2d721937
parent: mbp at sourcefrog.net-20070301055733-a977ktcx75cqtqyb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 18:56:56 +1100
message:
(broken) Add Tree.get_root_id() & test
Add unique root on WorkingTree4 at construction time and test this: currently
fails trying to set_path_id when the tree has parents.
------------------------------------------------------------
revno: 2052.1.203.2.165
revision-id: mbp at sourcefrog.net-20070301055733-a977ktcx75cqtqyb
parent: mbp at sourcefrog.net-20070301052819-5cbjhypodsf6ebgy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 16:57:33 +1100
message:
Add AB1 test that new trees get unique root ids
------------------------------------------------------------
revno: 2052.1.203.2.164
revision-id: mbp at sourcefrog.net-20070301052819-5cbjhypodsf6ebgy
parent: mbp at sourcefrog.net-20070301040742-5vo1bk19e7bnzquc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 16:28:19 +1100
message:
Change the default format for some tests from AB1 back to WorkingTreeFormat3
------------------------------------------------------------
revno: 2052.1.203.2.163
revision-id: mbp at sourcefrog.net-20070301040742-5vo1bk19e7bnzquc
parent: mbp at sourcefrog.net-20070301034802-8m8jqq0wohyyu17c
parent: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
committer: mbp at sourcefrog.net
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 15:07:42 +1100
message:
Merge Robert/John's dirstate work
------------------------------------------------------------
revno: 2052.1.203.2.151.1.46
revision-id: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
parent: robertc at robertcollins.net-20070301025530-4yx1nlo3ze29bajg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 14:20:19 +1100
message:
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.45
revision-id: robertc at robertcollins.net-20070301025530-4yx1nlo3ze29bajg
parent: robertc at robertcollins.net-20070301023547-g7w3o81gwczes50y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 13:55:30 +1100
message:
Handle the source and target paths both being relocated from another path in the tree - this is possible with a pending merge.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.44
revision-id: robertc at robertcollins.net-20070301023547-g7w3o81gwczes50y
parent: robertc at robertcollins.net-20070301020403-xxmzwvejmkeiimkm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 13:35:47 +1100
message:
Lock the working tree while pulling to work around _iter_changes not supplying the old path, and dirstate not allowing unlocked inventory access.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.43
revision-id: robertc at robertcollins.net-20070301020403-xxmzwvejmkeiimkm
parent: robertc at robertcollins.net-20070301020131-1ft93vppfz275x0p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 13:04:03 +1100
message:
Fix fileid_involved tests to not access inventories when not needed.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.42
revision-id: robertc at robertcollins.net-20070301020131-1ft93vppfz275x0p
parent: john at arbash-meinel.com-20070301015628-3qy7ndtsui6ya4ix
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 13:01:31 +1100
message:
WorkingTree4 only needs a tree write lock during initialize, not a deep write lock.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.41
revision-id: john at arbash-meinel.com-20070301015628-3qy7ndtsui6ya4ix
parent: robertc at robertcollins.net-20070301015005-ydqud90417giqbhg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 19:56:28 -0600
message:
WorkingTree.unversion() should not raise if unversioning a child and a parent.
Also switch all calls to os.path.join() over to osutils.pathjoin() for correctness
on win32.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.40
revision-id: robertc at robertcollins.net-20070301015005-ydqud90417giqbhg
parent: robertc at robertcollins.net-20070301013354-y4tv9zwh2s8djge7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 12:50:05 +1100
message:
Tweak pathjoin to be correct in its assertion about parameter types.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.39
revision-id: robertc at robertcollins.net-20070301013354-y4tv9zwh2s8djge7
parent: john at arbash-meinel.com-20070301010753-ga844l1djraerga7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 12:33:54 +1100
message:
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.38
revision-id: john at arbash-meinel.com-20070301010753-ga844l1djraerga7
parent: robertc at robertcollins.net-20070301010230-fh8p34iloqh7ua5j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 19:07:53 -0600
message:
show_diff_trees() should lock any extra trees it is passed.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.37
revision-id: robertc at robertcollins.net-20070301010230-fh8p34iloqh7ua5j
parent: john at arbash-meinel.com-20070301004745-2hwuavq5wgmi2idi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 12:02:30 +1100
message:
Dont use a basis tree that is not in the tree's parents for revert testing - its not guaranteed usable.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.36
revision-id: john at arbash-meinel.com-20070301004745-2hwuavq5wgmi2idi
parent: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 18:47:45 -0600
message:
All trees should implement get_file_mtime()
------------------------------------------------------------
revno: 2052.1.203.2.162
revision-id: mbp at sourcefrog.net-20070301034802-8m8jqq0wohyyu17c
parent: mbp at sourcefrog.net-20070301034456-ck62y1icsmsp1a8n
parent: mbp at sourcefrog.net-20070227061158-thegg4xka7257q8f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 14:48:02 +1100
message:
compare_subtrees skips formats that can't do subtrees
------------------------------------------------------------
revno: 2052.1.203.2.160.1.2
revision-id: mbp at sourcefrog.net-20070227061158-thegg4xka7257q8f
parent: mbp at sourcefrog.net-20070227060323-142rxg5dq06h0w8l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 17:11:58 +1100
message:
test_compare_subtrees runs against all trees that claim to support
references, rather than hardcoding WorkingTree4.
------------------------------------------------------------
revno: 2052.1.203.2.160.1.1
revision-id: mbp at sourcefrog.net-20070227060323-142rxg5dq06h0w8l
parent: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 17:03:23 +1100
message:
Remove outdated inventory doctest
------------------------------------------------------------
revno: 2052.1.203.2.161
revision-id: mbp at sourcefrog.net-20070301034456-ck62y1icsmsp1a8n
parent: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
parent: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 14:44:56 +1100
message:
merge some of dirstate, update comparison tests to keep tree roots the same unless they're meant to differ
------------------------------------------------------------
revno: 2052.1.203.2.151.1.35
revision-id: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
parent: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 17:36:39 -0600
message:
Handle the case when a directory has been removed, and isn't the last entry.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.34
revision-id: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
parent: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 16:40:54 -0600
message:
Clean up test_bad_files, and fix a bug in _iter_changes when
we get to an unknown file.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.33
revision-id: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
parent: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 16:11:01 -0600
message:
More inner loop tuning of walkdirs, can save as much as 5%
(drops time on LP tree from 100-105ms, to 95-100ms)
Also, unify all walkdirs variants to have minimal variation.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.32
revision-id: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
parent: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 15:50:11 -0600
message:
Add tests that the walkdirs variants work on unicode paths.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.31
revision-id: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
parent: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 14:39:36 -0600
message:
Minor cleanup.
rather than indexing a tuple all the time, save it as source/target_minikind
use the cached decoder rather than looking it up all the time
drops 'bzr status' on lp tree from 1.34s => 1.2s
------------------------------------------------------------
revno: 2052.1.203.2.151.1.30
revision-id: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
parent: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 14:32:08 -0600
message:
Don't cache the parent entry for root, since it is different than all other entries.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.29
revision-id: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
parent: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 13:35:28 -0600
message:
approx 300ms of 'time bzr status' in lp tree by caching last parent info
------------------------------------------------------------
revno: 2052.1.203.2.151.1.28
revision-id: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
parent: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 13:22:44 -0600
message:
shave about 10% of the time by switching to _walkdirs_utf8
------------------------------------------------------------
revno: 2052.1.203.2.151.1.27
revision-id: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
parent: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 12:13:00 -0600
message:
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
------------------------------------------------------------
revno: 2052.1.203.2.151.1.26
revision-id: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
parent: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 10:57:19 -0600
message:
correct the docstring for walkdirs.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.25
revision-id: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
parent: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 10:00:32 -0600
message:
Shave off 200+ ms of 'time bzr status' in lp tree
We don't need to look up source and target parents of an entry if
we know it hasn't moved, and we already have one, then we have the other.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.24
revision-id: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
parent: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 09:44:12 -0600
message:
Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.23
revision-id: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
parent: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 09:41:01 -0600
message:
remove out-dated doc test in inventory
------------------------------------------------------------
revno: 2052.1.203.2.151.1.22
revision-id: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
parent: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-27 16:07:53 -0600
message:
add a test that shows _iter_changes works when only contents have changed, and nothing is considered newly added.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.21
revision-id: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-27 15:32:16 -0600
message:
Get iter_changes working again, by fixing set_parent_trees to
create trees with the correct block order.
------------------------------------------------------------
revno: 2052.1.203.2.160
revision-id: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
parent: mbp at sourcefrog.net-20070226144759-5xfdve14d83esg7u
parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 16:51:36 +1100
message:
(merge) updates from dirstate branch
------------------------------------------------------------
revno: 2052.1.203.2.151.1.20
revision-id: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
parent: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 21:09:28 -0600
message:
update test for format 3, and enable caching of path split while lock is held.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.19
revision-id: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
parent: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 20:48:45 -0600
message:
disable the new test for now, since it triggers a pdb trace and hangs the test suite.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.18
revision-id: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
parent: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 20:44:58 -0600
message:
Change the sort order to match walkdirs() and iter_entries_by_dir()
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.6
revision-id: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
parent: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:58:06 -0600
message:
Because the disk format (sorting) has now changed
bump the format number. Converting between them is trivial, and
could actually be done on the fly if desired.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.5
revision-id: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
parent: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:30:27 -0600
message:
Add a test that dirstate adds records in the right order.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.4
revision-id: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
parent: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:08:04 -0600
message:
Rather than using split hunks, implement a bisect_dirblocks
which knows that it is bisecting dirblocks and only compares the first
hunk, and does the comparison in split mode.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.3
revision-id: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
parent: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 18:41:09 -0600
message:
Add the ability to cache the split output
rather than having to always split paths.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.2
revision-id: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
parent: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 18:34:12 -0600
message:
Add a helper function, which allows us to store keys as plain paths,
but bisect across them as split paths.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17.1.1
revision-id: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 17:05:06 -0600
message:
(broken) Update the test to actually expose the iter_changes bug.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.17
revision-id: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
parent: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:11:07 -0600
message:
Add another test that makes sure we can add as long as the file_id isn't current.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.16
revision-id: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
parent: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:08:14 -0600
message:
Make sure adding a duplicate file_id raises DuplicateFileId.
This adds an explicit test for it, updates Inventory to raise the right error,
and updates Dirstate.add() to also check for a duplicated file_id.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.15
revision-id: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
parent: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:51:04 -0600
message:
Try to create an intertree test that exposes the walkdir vs dirstate mismatch. No luck yet.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.14
revision-id: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
parent: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:17:03 -0600
message:
Make set_root_id() a no-op if the id doesn't change,
and change the test_merge_core tests to flush the state to disk, since
they are hanging onto a write lock.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.13
revision-id: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
parent: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:18:58 -0600
message:
find an edge case in our _get_entry logic and fix it.
Also, id2path doesn't need to grab the index, just use _get_entry.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.12
revision-id: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
parent: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 11:09:38 -0600
message:
Some comments on merge code, fix merge tests that
assume basis_tree() is valid after the tree has been modified.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.11
revision-id: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
parent: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:59:24 -0600
message:
Avoid directly accessing tree.inventory in merge.py
------------------------------------------------------------
revno: 2052.1.203.2.151.1.10
revision-id: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
parent: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:53:16 -0600
message:
Handle the case when we are adding a file to an empty directory.
Add a suite of tests for WorkingTree.add()
------------------------------------------------------------
revno: 2052.1.203.2.151.1.9
revision-id: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
parent: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:19:02 -0600
message:
Add more tests for WorkingTree.move() and a similar suite
for WorkingTree.rename_one().
------------------------------------------------------------
revno: 2052.1.203.2.151.1.8
revision-id: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
parent: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 09:27:17 -0600
message:
Lock the tree when using a commit builder.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.7
revision-id: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
parent: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:54:44 +1100
message:
continue iteration at the right point for InterDirStateTree._iter_changes.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.6
revision-id: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
parent: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:14:05 +1100
message:
Test for iterating changes past empty directories.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.5
revision-id: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
parent: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:54:23 +1100
message:
Back out changing default format: its not ready yet.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.4
revision-id: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
parent: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:27:55 +1100
message:
Test InterTree._iter_changes with missing (absent but versioned) files.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.3
revision-id: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
parent: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:53:30 +1100
message:
Add tests for _iter_changes with symlinks, disabled until unversioned file support is added, as that affects the test expected value.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.2
revision-id: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
parent: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:19:29 +1100
message:
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
------------------------------------------------------------
revno: 2052.1.203.2.151.1.1
revision-id: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 20:11:26 -0600
message:
_iter_changes should return Unicode paths.
Also, support NULL_REVISION by special casing the source_index
and just stating that all entries are absent.
------------------------------------------------------------
revno: 2052.1.203.2.159
revision-id: mbp at sourcefrog.net-20070226144759-5xfdve14d83esg7u
parent: mbp at sourcefrog.net-20070226142446-sfvznepsaggqnril
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 01:47:59 +1100
message:
reference-trees in dirstate pass all tests.
_iter_changes crudely changed not to be an iterator, so it can hold the
lock for the whole time.
Add DirStateRevisionTree.kind()
------------------------------------------------------------
revno: 2052.1.203.2.158
revision-id: mbp at sourcefrog.net-20070226142446-sfvznepsaggqnril
parent: mbp at sourcefrog.net-20070226044445-g0o7a0u9qypajqv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 01:24:46 +1100
message:
Most of the integration of dirstate and subtree
------------------------------------------------------------
revno: 2052.1.203.2.157
revision-id: mbp at sourcefrog.net-20070226044445-g0o7a0u9qypajqv2
parent: mbp at sourcefrog.net-20070226033932-c8fp56jfjksinn2z
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:44:45 +1100
message:
merge merge_modified test and cleanups
------------------------------------------------------------
revno: 2052.1.203.2.156
revision-id: mbp at sourcefrog.net-20070226033932-c8fp56jfjksinn2z
parent: mbp at sourcefrog.net-20070226032255-z0w592rrwil1xtqm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:39:32 +1100
message:
Merge WorkingTree implementation back from trunk
------------------------------------------------------------
revno: 2052.1.203.2.155
revision-id: mbp at sourcefrog.net-20070226032255-z0w592rrwil1xtqm
parent: mbp at sourcefrog.net-20070226031951-yd7bashmx3mjkmep
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:22:55 +1100
message:
Better assertion message from InterDirStateTree._iter_changes
------------------------------------------------------------
revno: 2052.1.203.2.154
revision-id: mbp at sourcefrog.net-20070226031951-yd7bashmx3mjkmep
parent: mbp at sourcefrog.net-20070226031310-7alk7pvlb8fg0asn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:19:51 +1100
message:
Better assertion message from InterDirStateTree._iter_changes
------------------------------------------------------------
revno: 2052.1.203.2.153
revision-id: mbp at sourcefrog.net-20070226031310-7alk7pvlb8fg0asn
parent: mbp at sourcefrog.net-20070226025624-4cfvc1r2it0oxxt2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:13:10 +1100
message:
Add get_symlink_target in base WorkingTree
------------------------------------------------------------
revno: 2052.1.203.2.152
revision-id: mbp at sourcefrog.net-20070226025624-4cfvc1r2it0oxxt2
parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
parent: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:56:24 +1100
message:
(broken) merge aaron's workingtree format changes
------------------------------------------------------------
revno: 2052.1.203.2.104.1.9
revision-id: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
parent: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:33:42 -0500
message:
Fix test locking for dirstate
------------------------------------------------------------
revno: 2052.1.203.2.104.1.8
revision-id: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
parent: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:15:16 -0500
message:
Merge refactoring of add_reference
------------------------------------------------------------
revno: 2052.1.203.2.104.1.7
revision-id: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
parent: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
parent: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sat 2007-02-24 11:11:32 -0500
message:
Merge from dirstate
------------------------------------------------------------
revno: 2052.1.203.2.104.1.6
revision-id: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
parent: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sat 2007-02-24 10:31:00 -0500
message:
Fix update to set unique roots, and work with dirstate
------------------------------------------------------------
revno: 2052.1.203.2.104.1.5
revision-id: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
parent: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Fri 2007-02-23 00:47:54 -0500
message:
fix revision_tree tests
------------------------------------------------------------
revno: 2052.1.203.2.104.1.4
revision-id: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
parent: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
parent: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Fri 2007-02-23 00:47:26 -0500
message:
merge from dirstate
------------------------------------------------------------
revno: 2052.1.203.2.104.1.3
revision-id: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
parent: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 23:45:30 -0500
message:
tweak tests
------------------------------------------------------------
revno: 2052.1.203.2.104.1.2
revision-id: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
parent: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 23:25:29 -0500
message:
Merge fix from mainline
------------------------------------------------------------
revno: 2052.1.203.2.104.1.1
revision-id: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
parent: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 00:51:57 -0500
message:
Merge from by-reference-trees
------------------------------------------------------------
revno: 2052.1.48.3.37
revision-id: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
parent: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 01:06:06 -0500
message:
rename working tree format 4 to AB1 everywhere
------------------------------------------------------------
revno: 2052.1.48.3.36
revision-id: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
parent: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 00:43:18 -0500
message:
avoid subtree commit when converting a work tree into a revision tree
------------------------------------------------------------
revno: 2052.1.48.3.35
revision-id: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
parent: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 00:12:55 -0500
message:
equality operations on bzrdir
------------------------------------------------------------
revno: 2052.1.48.3.34
revision-id: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
parent: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 16:11:19 -0500
message:
Fix BzrDir.cloning_metadir with no format
------------------------------------------------------------
revno: 2052.1.48.3.33
revision-id: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
parent: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 15:21:42 -0500
message:
Handle unique roots in tests for TreeTransform.iter_changes
------------------------------------------------------------
revno: 2052.1.48.3.32
revision-id: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
parent: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 15:14:04 -0500
message:
fix tree format, basis_tree call, in sprout
------------------------------------------------------------
revno: 2052.1.48.3.31
revision-id: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
parent: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-16 02:02:19 -0500
message:
Merged bzr.dev (17 tests failing)
------------------------------------------------------------
revno: 2052.1.48.3.30
revision-id: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
parent: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
parent: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-09 02:16:20 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.48.3.29
revision-id: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
parent: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-09 02:12:55 -0500
message:
Get merge working initially
------------------------------------------------------------
revno: 2052.1.48.3.28
revision-id: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
parent: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 18:39:08 -0500
message:
Make sprout recursive
------------------------------------------------------------
revno: 2052.1.48.3.27
revision-id: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
parent: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 15:17:00 -0500
message:
Enable nested commits
------------------------------------------------------------
revno: 2052.1.48.3.26
revision-id: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
parent: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 13:28:27 -0500
message:
checkout type is maintained for subtrees
------------------------------------------------------------
revno: 2052.1.48.3.25
revision-id: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
parent: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 12:02:41 -0500
message:
add subsubtree to test
------------------------------------------------------------
revno: 2052.1.48.3.24
revision-id: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
parent: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-01-26 00:34:35 -0500
message:
Get all tests passing again
------------------------------------------------------------
revno: 2052.1.48.3.23
revision-id: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
parent: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-25 23:18:44 -0500
message:
Nested checkouts kinda work
------------------------------------------------------------
revno: 2052.1.48.3.22
revision-id: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
parent: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-25 23:00:12 -0500
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.48.3.21
revision-id: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
parent: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2007-01-15 08:10:20 -0500
message:
Work on checking out by-reference trees
------------------------------------------------------------
revno: 2052.1.48.3.20
revision-id: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
parent: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-11 23:48:18 -0500
message:
Implement tree comparison for tree references
------------------------------------------------------------
revno: 2052.1.48.3.19
revision-id: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
parent: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-11 00:16:28 -0500
message:
Ensure commit preserves reference revision
------------------------------------------------------------
revno: 2052.1.48.3.18
revision-id: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
parent: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 23:42:06 -0500
message:
Get commit working for tree references
------------------------------------------------------------
revno: 2052.1.48.3.17
revision-id: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
parent: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 22:46:53 -0500
message:
Remove get_format_*, make FormatRegistry.register_metadir vary working tree
------------------------------------------------------------
revno: 2052.1.48.3.16
revision-id: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
parent: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 22:10:41 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.48.3.15
revision-id: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
parent: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2006-12-22 00:14:34 -0500
message:
get test suite passing
------------------------------------------------------------
revno: 2052.1.48.3.14
revision-id: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
parent: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2006-12-21 22:28:50 -0500
message:
Test workingtree4 format, prevent use with old repos
------------------------------------------------------------
revno: 2052.1.48.3.13
revision-id: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
parent: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2006-12-21 21:00:06 -0500
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.48.3.12
revision-id: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
parent: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 18:32:28 -0500
message:
Stop generating unique roots for WorkingTree3
------------------------------------------------------------
revno: 2052.1.48.3.11
revision-id: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
parent: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 00:49:23 -0500
message:
Add join --reference support
------------------------------------------------------------
revno: 2052.1.48.3.10
revision-id: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
parent: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 00:27:48 -0500
message:
Ensure added references are serialized properly, beef up Workingtreee3
------------------------------------------------------------
revno: 2052.1.48.3.9
revision-id: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
parent: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 22:36:30 -0500
message:
Clean up BzrNewError usage
------------------------------------------------------------
revno: 2052.1.48.3.8
revision-id: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
parent: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 22:11:05 -0500
message:
Add add_reference
------------------------------------------------------------
revno: 2052.1.48.3.7
revision-id: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
parent: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 13:46:53 -0500
message:
Merge from mainline
------------------------------------------------------------
revno: 2052.1.48.3.6
revision-id: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
parent: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 13:14:39 -0500
message:
Make add recursive for children of added entries
------------------------------------------------------------
revno: 2052.1.48.3.5
revision-id: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
parent: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
parent: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 02:39:19 -0500
message:
Merge nested-trees work
------------------------------------------------------------
revno: 1731.1.51.1.25
revision-id: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
parent: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-10-15 14:48:56 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.51.1.24
revision-id: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
parent: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-14 12:01:29 -0400
message:
Fix test case use of get_knit2_format
------------------------------------------------------------
revno: 1731.1.51.1.23
revision-id: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
parent: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-10-08 17:35:16 -0400
message:
Throw user-friendly error splitting in shared repo with wrong format
------------------------------------------------------------
revno: 1731.1.51.1.22
revision-id: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
parent: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 22:34:49 -0400
message:
Initial work on split command
------------------------------------------------------------
revno: 1731.1.51.1.21
revision-id: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
parent: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:22:58 -0400
message:
Ensure extracting a subtree dupes the branch
------------------------------------------------------------
revno: 1731.1.51.1.20
revision-id: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
parent: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:13:52 -0400
message:
Add copyright notice to join tests
------------------------------------------------------------
revno: 1731.1.51.1.19
revision-id: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
parent: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:11:51 -0400
message:
update join tests
------------------------------------------------------------
revno: 1731.1.51.1.18
revision-id: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
parent: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:07:32 -0400
message:
Get extract in repository under test
------------------------------------------------------------
revno: 1731.1.51.1.17
revision-id: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
parent: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 09:17:20 -0400
message:
Support extracting with checkouts
------------------------------------------------------------
revno: 1731.1.51.1.16
revision-id: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
parent: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-10-02 17:41:43 -0400
message:
Get extract working for standalone trees
------------------------------------------------------------
revno: 1731.1.51.1.15
revision-id: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
parent: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-10-02 12:20:29 -0400
message:
merge unique-root
------------------------------------------------------------
revno: 1731.1.51.1.14
revision-id: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
parent: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 20:16:29 -0400
message:
Update for API change
------------------------------------------------------------
revno: 1731.1.51.1.13
revision-id: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
parent: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 20:03:28 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.51.1.12
revision-id: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
parent: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 00:14:39 -0400
message:
Clean up subsume test
------------------------------------------------------------
revno: 1731.1.51.1.11
revision-id: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
parent: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 23:16:49 -0400
message:
Subsume destroys working tree metadata
------------------------------------------------------------
revno: 1731.1.51.1.10
revision-id: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
parent: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 23:13:27 -0400
message:
Change test for rich root data
------------------------------------------------------------
revno: 1731.1.51.1.9
revision-id: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
parent: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 22:50:07 -0400
message:
Merge destroy_tree from bzr.ab
------------------------------------------------------------
revno: 1731.1.51.1.8
revision-id: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
parent: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 20:08:31 -0400
message:
Merge from unique-root
------------------------------------------------------------
revno: 1731.1.51.1.7
revision-id: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
parent: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Thu 2006-09-28 17:09:53 -0400
message:
Add join command
------------------------------------------------------------
revno: 1731.1.51.1.6
revision-id: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
parent: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 13:01:13 -0400
message:
Ensure subsume data survives reopening the tree
------------------------------------------------------------
revno: 1731.1.51.1.5
revision-id: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
parent: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 12:55:25 -0400
message:
Ensure versionedfile will be produced for subsumed tree root
------------------------------------------------------------
revno: 1731.1.51.1.4
revision-id: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
parent: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 12:16:10 -0400
message:
Ensure subsume works with Knit2 repos
------------------------------------------------------------
revno: 1731.1.51.1.3
revision-id: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
parent: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 08:00:16 -0400
message:
Handle unversioned parents during subsume
------------------------------------------------------------
revno: 1731.1.51.1.2
revision-id: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
parent: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 01:22:01 -0400
message:
Test subsume failure modes
------------------------------------------------------------
revno: 1731.1.51.1.1
revision-id: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 00:15:52 -0400
message:
Initial subsume implementation
------------------------------------------------------------
revno: 2052.1.48.3.4
revision-id: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
parent: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Tue 2006-11-28 07:58:57 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.48.3.3
revision-id: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
parent: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 14:56:20 -0500
message:
Start of work on format 4 trees
------------------------------------------------------------
revno: 2052.1.48.3.2
revision-id: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
parent: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 14:17:04 -0500
message:
Add tests for format 7, enforce number
------------------------------------------------------------
revno: 2052.1.48.3.1
revision-id: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 13:30:57 -0500
message:
Start roundtripping tree-reference entries
------------------------------------------------------------
revno: 2052.1.203.2.151
revision-id: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
parent: robertc at robertcollins.net-20070226011304-8m29bgwjl3iey0g9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 12:32:38 +1100
message:
Handle specific_files natively for WorkingTreeFormat4._iter_changes.
------------------------------------------------------------
revno: 2052.1.203.2.150
revision-id: robertc at robertcollins.net-20070226011304-8m29bgwjl3iey0g9
parent: robertc at robertcollins.net-20070226010636-gqr477uau3uckz9x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 12:13:04 +1100
message:
Unbreak status --short.
------------------------------------------------------------
revno: 2052.1.203.2.149
revision-id: robertc at robertcollins.net-20070226010636-gqr477uau3uckz9x
parent: john at arbash-meinel.com-20070226004721-mxcueak27y98r1vk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 12:06:36 +1100
message:
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
------------------------------------------------------------
revno: 2052.1.203.2.148
revision-id: john at arbash-meinel.com-20070226004721-mxcueak27y98r1vk
parent: john at arbash-meinel.com-20070226004531-f5j0onpamaehk9ob
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 18:47:21 -0600
message:
lock a basis tree during a commit test.
------------------------------------------------------------
revno: 2052.1.203.2.147
revision-id: john at arbash-meinel.com-20070226004531-f5j0onpamaehk9ob
parent: john at arbash-meinel.com-20070225232832-0i66e7smyz5po931
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 18:45:31 -0600
message:
Move fast id => path lookups down into DirState
It belongs there anyway, and it means all _get_entry(file_id) lookups
will be improved, rather than just id2path.
------------------------------------------------------------
revno: 2052.1.203.2.146
revision-id: john at arbash-meinel.com-20070225232832-0i66e7smyz5po931
parent: robertc at robertcollins.net-20070225225034-fts7vcvfhkqwcms8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 17:28:32 -0600
message:
Implement move_directory by factoring out move_one
as a helper function, and then implementing a recursive update for
all moved dirblocks.
------------------------------------------------------------
revno: 2052.1.203.2.145
revision-id: robertc at robertcollins.net-20070225225034-fts7vcvfhkqwcms8
parent: john at arbash-meinel.com-20070225220748-zhn0hzx6zo92vfcz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 09:50:34 +1100
message:
Support unbreakable locks for trees.
------------------------------------------------------------
revno: 2052.1.203.2.144
revision-id: john at arbash-meinel.com-20070225220748-zhn0hzx6zo92vfcz
parent: robertc at robertcollins.net-20070225215219-xrrl2gv0hfw6ijzh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 16:07:48 -0600
message:
Simplify update_minimal a bit more, by making id_index a
cached variable, which is updated on mutating operations
also use this to implement a faster id2path, and add direct tests
since id2path now uses a more complex implementation.
------------------------------------------------------------
revno: 2052.1.203.2.143
revision-id: robertc at robertcollins.net-20070225215219-xrrl2gv0hfw6ijzh
parent: john at arbash-meinel.com-20070225210822-22ll2yy3qfeo5bko
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 08:52:19 +1100
message:
Update break-lock blackbox test to not break with dirstate as the default tree format. Unfortunately this slightly reduces test coverage of the UI.
------------------------------------------------------------
revno: 2052.1.203.2.142
revision-id: john at arbash-meinel.com-20070225210822-22ll2yy3qfeo5bko
parent: john at arbash-meinel.com-20070225203634-gkj6ic15hpadb5np
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 15:08:22 -0600
message:
Simplify the update_minimal api a little bit, and document the parameters.
Switch from kind => minikind, since we frequently already have that anyway,
and update_minimal is a thin wrapper on changing the dirblocks in memory, not
converting from an Inventory.
------------------------------------------------------------
revno: 2052.1.203.2.141
revision-id: john at arbash-meinel.com-20070225203634-gkj6ic15hpadb5np
parent: john at arbash-meinel.com-20070225191617-wcc828lmf5sdad47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 14:36:34 -0600
message:
Some small changes to move tests.
------------------------------------------------------------
revno: 2052.1.203.2.140
revision-id: john at arbash-meinel.com-20070225191617-wcc828lmf5sdad47
parent: john at arbash-meinel.com-20070225185403-hzll8ix723xzy06o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 13:16:17 -0600
message:
Update tests to ensure basis tree is not modified
Small bugfixes for things that would only be triggered if update_minimal
failed.
------------------------------------------------------------
revno: 2052.1.203.2.139
revision-id: john at arbash-meinel.com-20070225185403-hzll8ix723xzy06o
parent: john at arbash-meinel.com-20070225181821-e55vnu73mm0kzmxe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 12:54:03 -0600
message:
test cases for moving after a file has already been moved.
Fix some more WorkingTree4.move() bugs.
------------------------------------------------------------
revno: 2052.1.203.2.138
revision-id: john at arbash-meinel.com-20070225181821-e55vnu73mm0kzmxe
parent: john at arbash-meinel.com-20070225172022-1lz2vdjp84vp3lu3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 12:18:21 -0600
message:
implement several new WorkingTree.move() tests
and fix the bugs in WorkingTree4.move() that it uncovers.
------------------------------------------------------------
revno: 2052.1.203.2.137
revision-id: john at arbash-meinel.com-20070225172022-1lz2vdjp84vp3lu3
parent: john at arbash-meinel.com-20070225171143-dcj0kgtu8kf2o0is
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 11:20:22 -0600
message:
Move the WorkingTree.move() tests into their own module
and remove the requirement for maintaining api compatibility for the
new WorkingTreeFormat4, its ugly and deprecated anyway.
------------------------------------------------------------
revno: 2052.1.203.2.136
revision-id: john at arbash-meinel.com-20070225171143-dcj0kgtu8kf2o0is
parent: john at arbash-meinel.com-20070225170249-fcgtqn57yinqxsc2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 11:11:43 -0600
message:
(James Westby) add read locks around read_working_inventory() in test_commit_move
------------------------------------------------------------
revno: 2052.1.203.2.135
revision-id: john at arbash-meinel.com-20070225170249-fcgtqn57yinqxsc2
parent: john at arbash-meinel.com-20070225165633-d9x1okv4g33idiya
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 11:02:49 -0600
message:
Add locking in the test_commit_kind_changes test.
------------------------------------------------------------
revno: 2052.1.203.2.134
revision-id: john at arbash-meinel.com-20070225165633-d9x1okv4g33idiya
parent: john at arbash-meinel.com-20070225162253-8expr1vlo70wxp72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:56:33 -0600
message:
Add a tree-test for get_symlink_target
and implement it in DirStateRevisionTree.
------------------------------------------------------------
revno: 2052.1.203.2.133
revision-id: john at arbash-meinel.com-20070225162253-8expr1vlo70wxp72
parent: john at arbash-meinel.com-20070225144550-3rcyjf6ui5oo0gaf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:22:53 -0600
message:
Implement _paths2ids using bisect recursive rather than loading
the whole dataset from disk. But leave it disabled until it can actually benefit
us by having other code paths not require the whole dir-state in memory.
------------------------------------------------------------
revno: 2052.1.203.2.132
revision-id: john at arbash-meinel.com-20070225144550-3rcyjf6ui5oo0gaf
parent: john at arbash-meinel.com-20070224164555-575dae290us6da8o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 08:45:50 -0600
message:
Implement _bisect_recursive, which uses multiple bisect calls to
handle renames and finding entries in subdirs.
As is, this could be hooked into paths2ids() if the dirstate has not been loaded yet.
However, it doesn't quite provide enough, since the parsed entries would probably not
be saved. Further, the multiple bisect calls are less efficient then they could be,
because they do not remember the last bisect call.
We should explore switching to a caching structure, which maintains all records that
have been processed, in a structure that can be in-memory searched before going back
to disk.
------------------------------------------------------------
revno: 2052.1.203.2.131
revision-id: john at arbash-meinel.com-20070224164555-575dae290us6da8o
parent: john at arbash-meinel.com-20070224160033-rr51vbz5f91z6jvw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sat 2007-02-24 10:45:55 -0600
message:
Change the return values for bisect functions so they just return
the found dictionaries. This saves processing, and is more useful for a future
_bisect_recursive function.
------------------------------------------------------------
revno: 2052.1.203.2.130
revision-id: john at arbash-meinel.com-20070224160033-rr51vbz5f91z6jvw
parent: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sat 2007-02-24 10:00:33 -0600
message:
Add a very similar function which grabs everything for a particular directory block.
------------------------------------------------------------
revno: 2052.1.203.2.129
revision-id: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
parent: john at arbash-meinel.com-20070223220821-yjinik850b8szgqj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-23 16:51:01 -0600
message:
Start cleaning up the code, and fix one more edge case
when last_entry == first_entry, we don't want to have duplicated entries
in the output.
------------------------------------------------------------
revno: 2052.1.203.2.128
revision-id: john at arbash-meinel.com-20070223220821-yjinik850b8szgqj
parent: john at arbash-meinel.com-20070223213737-k94ppwskpppa7nds
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-23 16:08:21 -0600
message:
Rather than falling over when the page size is to small, just increase it and try again.
------------------------------------------------------------
revno: 2052.1.203.2.127
revision-id: john at arbash-meinel.com-20070223213737-k94ppwskpppa7nds
parent: john at arbash-meinel.com-20070223211937-2reect5p16takng2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-23 15:37:37 -0600
message:
Expand the test suite to cover more cases.
------------------------------------------------------------
revno: 2052.1.203.2.126
revision-id: john at arbash-meinel.com-20070223211937-2reect5p16takng2
parent: john at arbash-meinel.com-20070223174705-n1j4wyfh5jrlku7s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-23 15:19:37 -0600
message:
Switch the bisect code to support the fact that we can have
repeated (dir, name) pairs (dir, name, file_id) is the unique key.
Also, fix some edge cases when the page size is small so that we don't get clean
divisions of records per page.
------------------------------------------------------------
revno: 2052.1.203.2.125
revision-id: john at arbash-meinel.com-20070223174705-n1j4wyfh5jrlku7s
parent: john at arbash-meinel.com-20070223151256-g1imdh471lwffdzs
parent: john at arbash-meinel.com-20070222154410-svh8iq9j7f8ci302
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-23 11:47:05 -0600
message:
Initial effort at adding a basic _bisect function to DirState.
It doesn't handle the fact that a single path can occur multiple times, but that
will be fixed.
------------------------------------------------------------
revno: 2052.1.203.2.88.1.2
revision-id: john at arbash-meinel.com-20070222154410-svh8iq9j7f8ci302
parent: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-jam
timestamp: Thu 2007-02-22 09:44:10 -0600
message:
(broken) some basic work on adding bisect functionality to dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.124
revision-id: john at arbash-meinel.com-20070223151256-g1imdh471lwffdzs
parent: john at arbash-meinel.com-20070223150732-bjo6ava5jclmkjg3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-alt
timestamp: Fri 2007-02-23 09:12:56 -0600
message:
Remove direct access to Dirstate prefering dirstate.Dirstate
------------------------------------------------------------
revno: 2052.1.203.2.123
revision-id: john at arbash-meinel.com-20070223150732-bjo6ava5jclmkjg3
parent: robertc at robertcollins.net-20070223051206-jqheguu2qeyqab14
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-alt
timestamp: Fri 2007-02-23 09:07:32 -0600
message:
Simple line wrapping cleanup in test_dirstate.py
------------------------------------------------------------
revno: 2052.1.203.2.122
revision-id: robertc at robertcollins.net-20070223051206-jqheguu2qeyqab14
parent: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-23 16:12:06 +1100
message:
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
------------------------------------------------------------
revno: 2052.1.203.2.121
revision-id: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
parent: john at arbash-meinel.com-20070223025058-dw62sga95cx45hvg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 21:01:08 -0600
message:
split out the WorkingTreeFormat4 tests into a separate test file
and clean up the imports of both files.
------------------------------------------------------------
revno: 2052.1.203.2.120
revision-id: john at arbash-meinel.com-20070223025058-dw62sga95cx45hvg
parent: robertc at robertcollins.net-20070223020403-ojzvhu79itqx004a
parent: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 20:50:58 -0600
message:
[merge] in work for adding DirState.lock_* methods
------------------------------------------------------------
revno: 2052.1.203.2.116.1.3
revision-id: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
parent: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 20:24:10 -0600
message:
XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again
------------------------------------------------------------
revno: 2052.1.203.2.116.1.2
revision-id: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
parent: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 20:16:44 -0600
message:
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
broken because we have timing issues with parent ids disappearing on us
------------------------------------------------------------
revno: 2052.1.203.2.116.1.1
revision-id: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
parent: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
parent: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 19:11:22 -0600
message:
Update the dirstate tests to lock and unlock properly.
Change the lock.WriteLock functions so that they open in 'rb+' mode instead
of automatically truncating the file.
test_dirstate.py now passes, but we need to figure out or locking mechanism for
WorkingTree4. (does it just lock at the same time as Tree.lock_write()?)
------------------------------------------------------------
revno: 2052.1.203.2.115.1.2
revision-id: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
parent: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 22:45:49 +0000
message:
(broken) Add the locking methods.
* Callers should now use lock_read and lock_write before they do
anything with dirstate.
* You can only grab a single lock on the object, and can't unlock it
if not locked.
* initialize now returns a writelocked object to the caller.
* This breaks the tests massively, sorry, as they need to do locking now.
- Currently the main problem is the dirstate never being flushed to disk,
so all tests trip the assertion that the header is incorrect.
------------------------------------------------------------
revno: 2052.1.203.2.115.1.1
revision-id: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
parent: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 21:22:53 +0000
message:
Store the filename of the dirstate in an attribute.
* Store the filename so that it can be more adventurous in what it does
with the file.
* Callers of the constructor should now pass the path to it, and any
methods that want to access the path should do so through self._filename.
------------------------------------------------------------
revno: 2052.1.203.2.119
revision-id: robertc at robertcollins.net-20070223020403-ojzvhu79itqx004a
parent: robertc at robertcollins.net-20070223013602-qrkqs22lbp5jrfsv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-23 13:04:03 +1100
message:
Give RevisionTree a repr method.
------------------------------------------------------------
revno: 2052.1.203.2.118
revision-id: robertc at robertcollins.net-20070223013602-qrkqs22lbp5jrfsv
parent: robertc at robertcollins.net-20070223011050-5psttlyujfn5b5em
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-23 12:36:02 +1100
message:
Change _iter_changes tests to lock the tested trees - its an iterator interface so implicit locks dont ensure the tree is locked - callers need to lock and thus so do our tests.
------------------------------------------------------------
revno: 2052.1.203.2.117
revision-id: robertc at robertcollins.net-20070223011050-5psttlyujfn5b5em
parent: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-23 12:10:50 +1100
message:
Add an InterDirStateTree InterTree optimiser.
------------------------------------------------------------
revno: 2052.1.203.2.116
revision-id: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
parent: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 17:26:15 -0600
message:
hack in a faster id2path, ultimately we want something different.
------------------------------------------------------------
revno: 2052.1.203.2.115
revision-id: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
parent: john at arbash-meinel.com-20070222195349-10k878qe13qdhoqd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 14:23:20 -0600
message:
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
we don't need the same safety checks, since we are loading from a state
which should already be consistent.
------------------------------------------------------------
revno: 2052.1.203.2.114
revision-id: john at arbash-meinel.com-20070222195349-10k878qe13qdhoqd
parent: john at arbash-meinel.com-20070222184235-2q0gcimvw3qqudx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 13:53:49 -0600
message:
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
(_get_inventory was originally 2.34s before merging bzr.dev)
------------------------------------------------------------
revno: 2052.1.203.2.113
revision-id: john at arbash-meinel.com-20070222184235-2q0gcimvw3qqudx4
parent: john at arbash-meinel.com-20070222181111-kbu6t6vc4e9u5yin
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:42:35 -0600
message:
545ms, 600ms: Switch memory model from storing kind to using minikind
Need to profile effect on _generate_inventory, but makes a significant improvement for
both fast path and slow path, and should have minimal effect elsewhere.
------------------------------------------------------------
revno: 2052.1.203.2.112
revision-id: john at arbash-meinel.com-20070222181111-kbu6t6vc4e9u5yin
parent: john at arbash-meinel.com-20070222180033-j9r02x6h5nl0e38c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:11:11 -0600
message:
610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
------------------------------------------------------------
revno: 2052.1.203.2.111
revision-id: john at arbash-meinel.com-20070222180033-j9r02x6h5nl0e38c
parent: john at arbash-meinel.com-20070222174747-dlbg1982hqbjcjqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:00:33 -0600
message:
575ms: Remove the inner else in favor of a second loop which just cleans up the root block versus contents-of-root block
------------------------------------------------------------
revno: 2052.1.203.2.110
revision-id: john at arbash-meinel.com-20070222174747-dlbg1982hqbjcjqu
parent: john at arbash-meinel.com-20070222165055-9n3m8v0qwjc5kh20
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 11:47:47 -0600
message:
Inlining the conversion and using dirblock form instead of a list and then converting shaves another 50ms off. From 650ms => 600ms
------------------------------------------------------------
revno: 2052.1.203.2.109
revision-id: john at arbash-meinel.com-20070222165055-9n3m8v0qwjc5kh20
parent: john at arbash-meinel.com-20070222164842-ctd1jolh1nhjvmxb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 10:50:55 -0600
message:
Previous change is 709-724ms => 650-675ms on mozilla sized tree.
------------------------------------------------------------
revno: 2052.1.203.2.108
revision-id: john at arbash-meinel.com-20070222164842-ctd1jolh1nhjvmxb
parent: john at arbash-meinel.com-20070222153923-cpynsmaz50pdncre
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 10:48:42 -0600
message:
tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
Presumably because list[:] has to create a list, which is then converted again into a
tuple().
------------------------------------------------------------
revno: 2052.1.203.2.107
revision-id: john at arbash-meinel.com-20070222153923-cpynsmaz50pdncre
parent: john at arbash-meinel.com-20070222150435-vtrqx5i64319z8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 09:39:23 -0600
message:
(working), fix dirstate to use utf8 file ids.
Also fix a bug in _generate_inventory for non-ascii paths. It was
combining the decoded path with the utf8 prefix and assuming the
whole thing was utf8.
------------------------------------------------------------
revno: 2052.1.203.2.106
revision-id: john at arbash-meinel.com-20070222150435-vtrqx5i64319z8pz
parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 09:04:35 -0600
message:
[merge] bzr.dev 2298 (broken)
------------------------------------------------------------
revno: 2052.1.203.2.105
revision-id: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 17:08:39 +1100
message:
Unfuck InterTree.compare which I broke with the paths2ids implementation.
------------------------------------------------------------
revno: 2052.1.203.2.104
revision-id: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
parent: robertc at robertcollins.net-20070222024924-bokuavlg2yglgtja
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 16:06:58 +1100
message:
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.103
revision-id: robertc at robertcollins.net-20070222024924-bokuavlg2yglgtja
parent: robertc at robertcollins.net-20070222024555-fxhlp024havpj9hd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 13:49:24 +1100
message:
Document some future tests for paths2ids.
------------------------------------------------------------
revno: 2052.1.203.2.102
revision-id: robertc at robertcollins.net-20070222024555-fxhlp024havpj9hd
parent: robertc at robertcollins.net-20070222014109-t8lpcgnp6xr63zv8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 13:45:55 +1100
message:
Use Tree.path2ids in status operations.
------------------------------------------------------------
revno: 2052.1.203.2.101
revision-id: robertc at robertcollins.net-20070222014109-t8lpcgnp6xr63zv8
parent: robertc at robertcollins.net-20070222011730-zff5fh9qvxrcqa56
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:41:09 +1100
message:
Finish making Tree.ids2paths support the file_ids_across_trees api.
------------------------------------------------------------
revno: 2052.1.203.2.100
revision-id: robertc at robertcollins.net-20070222011730-zff5fh9qvxrcqa56
parent: robertc at robertcollins.net-20070222011415-dtqnanb4cxdl4zus
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:17:30 +1100
message:
Create a paths2ids api to replace find_ids_across_trees, with tests.
------------------------------------------------------------
revno: 2052.1.203.2.99
revision-id: robertc at robertcollins.net-20070222011415-dtqnanb4cxdl4zus
parent: robertc at robertcollins.net-20070222011012-edaxufwi05dcn4az
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:14:15 +1100
message:
Dirstate - fix _find_block to create missing blocks when the parent is versioned in the current tree, and fix handling of relocated entries in _make_absent.
------------------------------------------------------------
revno: 2052.1.203.2.98
revision-id: robertc at robertcollins.net-20070222011012-edaxufwi05dcn4az
parent: john at arbash-meinel.com-20070221224546-3frplqdi81632elw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 12:10:12 +1100
message:
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
------------------------------------------------------------
revno: 2052.1.203.2.97
revision-id: john at arbash-meinel.com-20070221224546-3frplqdi81632elw
parent: robertc at robertcollins.net-20070221111037-k1t9jg5dsgfywz49
parent: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-21 16:45:46 -0600
message:
Change the inner parsing loop to reduce number of passes, saves about 15% of the time to read and convert to an Inventory
------------------------------------------------------------
revno: 2052.1.203.2.88.1.1
revision-id: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
parent: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-21 14:17:10 -0600
message:
Rewrite the inner parsing loop, needs performance testing.
------------------------------------------------------------
revno: 2052.1.203.2.96
revision-id: robertc at robertcollins.net-20070221111037-k1t9jg5dsgfywz49
parent: robertc at robertcollins.net-20070221032018-7aon9e56q3sitz6q
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 22:10:37 +1100
message:
Restore dirstate to all tests passing condition.
------------------------------------------------------------
revno: 2052.1.203.2.95
revision-id: robertc at robertcollins.net-20070221032018-7aon9e56q3sitz6q
parent: robertc at robertcollins.net-20070221013745-7d0ho05wt5btnfyl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 14:20:18 +1100
message:
Fix WorkingTree4.get_file_sha1 to actually work.
------------------------------------------------------------
revno: 2052.1.203.2.94
revision-id: robertc at robertcollins.net-20070221013745-7d0ho05wt5btnfyl
parent: robertc at robertcollins.net-20070221010813-zn13zy3wzd53i3vz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 12:37:45 +1100
message:
DirState: handle id lookup redirects correctly.
------------------------------------------------------------
revno: 2052.1.203.2.93
revision-id: robertc at robertcollins.net-20070221010813-zn13zy3wzd53i3vz
parent: jw+debian at jameswestby.net-20070220222431-t4esb34p4zxqcqxm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 12:08:13 +1100
message:
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
------------------------------------------------------------
revno: 2052.1.203.2.92
revision-id: jw+debian at jameswestby.net-20070220222431-t4esb34p4zxqcqxm
parent: jw+debian at jameswestby.net-20070220222024-aotahb9hjsef3m44
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Tue 2007-02-20 22:24:31 +0000
message:
Make the WorkingTree4 has_id use the new _get_entry rather than _get_row.
------------------------------------------------------------
revno: 2052.1.203.2.91
revision-id: jw+debian at jameswestby.net-20070220222024-aotahb9hjsef3m44
parent: robertc at robertcollins.net-20070220212335-2zkgn5uemfgig260
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Tue 2007-02-20 22:20:24 +0000
message:
Correct the mistakes in the logic of _get_block_entry_index.
* The exit condition compared all the tuple, rather than the first part,
so it would always trigger.
* The wrong variable was incremented, so it would infinite loop if it wasn't
for the above mistake.
------------------------------------------------------------
revno: 2052.1.203.2.90
revision-id: robertc at robertcollins.net-20070220212335-2zkgn5uemfgig260
parent: robertc at robertcollins.net-20070220205121-3xw8a0qe1uql9eeq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 08:23:35 +1100
message:
Correct DirState._entries_to_current_state to group entries by directory properly.
------------------------------------------------------------
revno: 2052.1.203.2.89
revision-id: robertc at robertcollins.net-20070220205121-3xw8a0qe1uql9eeq
parent: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 07:51:21 +1100
message:
Fix addition of relocation records when we encounter the correct location first try.
------------------------------------------------------------
revno: 2052.1.203.2.88
revision-id: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
parent: robertc at robertcollins.net-20070220084410-3msfwqdxfnvi0qa0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 07:04:47 +1100
message:
Significant steps back to operation.
------------------------------------------------------------
revno: 2052.1.203.2.87
revision-id: robertc at robertcollins.net-20070220084410-3msfwqdxfnvi0qa0
parent: jw+debian at jameswestby.net-20070219221104-c7a9q48h134qrvib
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-20 19:44:10 +1100
message:
core dirstate tests passing with new structure.
------------------------------------------------------------
revno: 2052.1.203.2.86
revision-id: jw+debian at jameswestby.net-20070219221104-c7a9q48h134qrvib
parent: robertc at robertcollins.net-20070219123342-nkosu3g3mt511h59
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Mon 2007-02-19 22:11:04 +0000
message:
Port test_set_path_id_no_parents to the new format of expected entry output.
------------------------------------------------------------
revno: 2052.1.203.2.85
revision-id: robertc at robertcollins.net-20070219123342-nkosu3g3mt511h59
parent: john at arbash-meinel.com-20070217040647-1kl4s4bfi01cz1jb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-19 23:33:42 +1100
message:
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
------------------------------------------------------------
revno: 2052.1.203.2.84
revision-id: john at arbash-meinel.com-20070217040647-1kl4s4bfi01cz1jb
parent: john at arbash-meinel.com-20070217033450-q6dtvrwl24ckzg5o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-16 22:06:47 -0600
message:
Remove now-unecessary encode/decode calls for revision ids.
Restore some file_id encode/decode calls because the code still expects unicode file ids.
------------------------------------------------------------
revno: 2052.1.203.2.83
revision-id: john at arbash-meinel.com-20070217033450-q6dtvrwl24ckzg5o
parent: robertc at robertcollins.net-20070216142321-2m20xds02xuigsv6
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Fri 2007-02-16 21:34:50 -0600
message:
[merge] bzr.dev 2294
------------------------------------------------------------
revno: 2052.1.203.2.82
revision-id: robertc at robertcollins.net-20070216142321-2m20xds02xuigsv6
parent: robertc at robertcollins.net-20070216071959-8jibybk31injks6p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Sat 2007-02-17 01:23:21 +1100
message:
various notes about find_ids_across_trees
------------------------------------------------------------
revno: 2052.1.203.2.81
revision-id: robertc at robertcollins.net-20070216071959-8jibybk31injks6p
parent: robertc at robertcollins.net-20070216070433-1r4p40b7s3hecuks
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 18:19:59 +1100
message:
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
------------------------------------------------------------
revno: 2052.1.203.2.80
revision-id: robertc at robertcollins.net-20070216070433-1r4p40b7s3hecuks
parent: robertc at robertcollins.net-20070216065950-axser9wg4u3ta0zs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 18:04:33 +1100
message:
In status, read lock the old and new trees being used to let data caching occur.
------------------------------------------------------------
revno: 2052.1.203.2.79
revision-id: robertc at robertcollins.net-20070216065950-axser9wg4u3ta0zs
parent: robertc at robertcollins.net-20070216065753-svdi0okn46e24474
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:59:50 +1100
message:
Take out repository locks from Dirstate revision trees, to improve file text access performance.
------------------------------------------------------------
revno: 2052.1.203.2.78
revision-id: robertc at robertcollins.net-20070216065753-svdi0okn46e24474
parent: robertc at robertcollins.net-20070216064426-tfdvexihpqq05csl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:57:53 +1100
message:
Really finish the prior commit.
------------------------------------------------------------
revno: 2052.1.203.2.77
revision-id: robertc at robertcollins.net-20070216064426-tfdvexihpqq05csl
parent: robertc at robertcollins.net-20070216061015-60p0vv623cigcg5x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:44:26 +1100
message:
Tune working inventory generation more: walk the blocks, skipping deleted rows.
------------------------------------------------------------
revno: 2052.1.203.2.76
revision-id: robertc at robertcollins.net-20070216061015-60p0vv623cigcg5x
parent: robertc at robertcollins.net-20070216060239-yvf7pfd94kv9vqy4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:10:15 +1100
message:
Add tests for revision trees with a different unique root to the current tree.
------------------------------------------------------------
revno: 2052.1.203.2.75
revision-id: robertc at robertcollins.net-20070216060239-yvf7pfd94kv9vqy4
parent: robertc at robertcollins.net-20070216023942-8oxrm3qtriwc54w0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:02:39 +1100
message:
Correct generation of revisiontree inventories to handle out of order parents.
------------------------------------------------------------
revno: 2052.1.203.2.74
revision-id: robertc at robertcollins.net-20070216023942-8oxrm3qtriwc54w0
parent: robertc at robertcollins.net-20070216022139-bia82eszdktack3k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 13:39:42 +1100
message:
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
------------------------------------------------------------
revno: 2052.1.203.2.73
revision-id: robertc at robertcollins.net-20070216022139-bia82eszdktack3k
parent: john at arbash-meinel.com-20070216010712-31haaz780hytg7e5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 13:21:39 +1100
message:
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first.
------------------------------------------------------------
revno: 2052.1.203.2.72
revision-id: john at arbash-meinel.com-20070216010712-31haaz780hytg7e5
parent: john at arbash-meinel.com-20070216005529-97uws9mank4hh12q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 19:07:12 -0600
message:
Add some tests for WorkingTree.basis_tree()
------------------------------------------------------------
revno: 2052.1.203.2.71
revision-id: john at arbash-meinel.com-20070216005529-97uws9mank4hh12q
parent: john at arbash-meinel.com-20070215231054-4xry7q64qpodj762
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 18:55:29 -0600
message:
Add a test for list_files, and implement it for DirStateRevisionTree
------------------------------------------------------------
revno: 2052.1.203.2.70
revision-id: john at arbash-meinel.com-20070215231054-4xry7q64qpodj762
parent: john at arbash-meinel.com-20070215225145-2a7c9snlv3pf87si
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 17:10:54 -0600
message:
Minor improvements to DirStateRevisionTree.walkdirs()
------------------------------------------------------------
revno: 2052.1.203.2.69
revision-id: john at arbash-meinel.com-20070215225145-2a7c9snlv3pf87si
parent: john at arbash-meinel.com-20070215223629-gt6hhv9b20maurze
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 16:51:45 -0600
message:
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
------------------------------------------------------------
revno: 2052.1.203.2.68
revision-id: john at arbash-meinel.com-20070215223629-gt6hhv9b20maurze
parent: john at arbash-meinel.com-20070215223149-fu9dp59wij4p8dkl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 16:36:29 -0600
message:
Switch the WorkingTree4 internals to use state._get_block_row_index
------------------------------------------------------------
revno: 2052.1.203.2.67
revision-id: john at arbash-meinel.com-20070215223149-fu9dp59wij4p8dkl
parent: john at arbash-meinel.com-20070215222834-dx28dfubjs9d0kd8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 16:31:49 -0600
message:
Switch to the fast form for path2id
------------------------------------------------------------
revno: 2052.1.203.2.66
revision-id: john at arbash-meinel.com-20070215222834-dx28dfubjs9d0kd8
parent: john at arbash-meinel.com-20070215202429-gouwaqj9541v25wf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 16:28:34 -0600
message:
Move _get_row and _get_block_row_index into Dirstate itself.
------------------------------------------------------------
revno: 2052.1.203.2.65
revision-id: john at arbash-meinel.com-20070215202429-gouwaqj9541v25wf
parent: john at arbash-meinel.com-20070215193713-z5sdz6594q7isee0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 14:24:29 -0600
message:
override path2id because it should be optimized anyway
and fix some double encoding and missed encoding bugs
now \.tree_implementations.*test_test all passes
------------------------------------------------------------
revno: 2052.1.203.2.64
revision-id: john at arbash-meinel.com-20070215193713-z5sdz6594q7isee0
parent: john at arbash-meinel.com-20070215183224-grz0nmma8kve7go0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 13:37:13 -0600
message:
Add the DirStateRevisionTree to the list of 'tree_implementations'
Start fixing some tests by just locking the tree before testing.
------------------------------------------------------------
revno: 2052.1.203.2.63
revision-id: john at arbash-meinel.com-20070215183224-grz0nmma8kve7go0
parent: john at arbash-meinel.com-20070215175900-28ukh0bwk1lnv1qq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 12:32:24 -0600
message:
track down a couple other places where we are using list_files.
------------------------------------------------------------
revno: 2052.1.203.2.62
revision-id: john at arbash-meinel.com-20070215175900-28ukh0bwk1lnv1qq
parent: john at arbash-meinel.com-20070215175610-171tue5qcl4zm6vf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 11:59:00 -0600
message:
add a workingtree_implementations test that makes sure smart_add_tree orks properly
and fix smart_add_tree to ensure that it takes out a lock_tree_write()
------------------------------------------------------------
revno: 2052.1.203.2.61
revision-id: john at arbash-meinel.com-20070215175610-171tue5qcl4zm6vf
parent: john at arbash-meinel.com-20070215171830-7xzy2cxja9g6vclm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 11:56:10 -0600
message:
Find callers of list_files() and make sure the tree is always locked.
------------------------------------------------------------
revno: 2052.1.203.2.60
revision-id: john at arbash-meinel.com-20070215171830-7xzy2cxja9g6vclm
parent: robertc at robertcollins.net-20070215100815-sh7ng5cpouingmzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 11:18:30 -0600
message:
Add an explicit exception since tree.list_files() requires a lock (at least for dirstate
------------------------------------------------------------
revno: 2052.1.203.2.59
revision-id: robertc at robertcollins.net-20070215100815-sh7ng5cpouingmzz
parent: robertc at robertcollins.net-20070214222504-fu4k745u7lznoh08
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 21:08:15 +1100
message:
All WorkingTree4 and dirstate tests passing.
------------------------------------------------------------
revno: 2052.1.203.2.58
revision-id: robertc at robertcollins.net-20070214222504-fu4k745u7lznoh08
parent: robertc at robertcollins.net-20070214221641-41crm4kbh5js20bw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 09:25:04 +1100
message:
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.
------------------------------------------------------------
revno: 2052.1.203.2.57
revision-id: robertc at robertcollins.net-20070214221641-41crm4kbh5js20bw
parent: robertc at robertcollins.net-20070214221212-ow4z8jo4pwyisa0s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 09:16:41 +1100
message:
Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.
------------------------------------------------------------
revno: 2052.1.203.2.56
revision-id: robertc at robertcollins.net-20070214221212-ow4z8jo4pwyisa0s
parent: john at arbash-meinel.com-20070214220734-2ekcmk21rhm2z5dw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 09:12:12 +1100
message:
Dirstate: bring set_last_revision into line with the tested API.
------------------------------------------------------------
revno: 2052.1.203.2.55
revision-id: john at arbash-meinel.com-20070214220734-2ekcmk21rhm2z5dw
parent: robertc at robertcollins.net-20070214215125-ugt6gf11ywavs2y1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 16:07:34 -0600
message:
add extra flush() call to make _update_tree work for dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.54
revision-id: robertc at robertcollins.net-20070214215125-ugt6gf11ywavs2y1
parent: robertc at robertcollins.net-20070214205005-e5gw6c0rnuertm3s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 08:51:25 +1100
message:
Add in non-normalized filename sanity check to dirstate add().
------------------------------------------------------------
revno: 2052.1.203.2.53
revision-id: robertc at robertcollins.net-20070214205005-e5gw6c0rnuertm3s
parent: robertc at robertcollins.net-20070214203333-kt6kfmyz5eum5q2s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 07:50:05 +1100
message:
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
------------------------------------------------------------
revno: 2052.1.203.2.52
revision-id: robertc at robertcollins.net-20070214203333-kt6kfmyz5eum5q2s
parent: john at arbash-meinel.com-20070214201536-eo2cnbwo3bh1tu9v
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-15 07:33:33 +1100
message:
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.
------------------------------------------------------------
revno: 2052.1.203.2.51
revision-id: john at arbash-meinel.com-20070214201536-eo2cnbwo3bh1tu9v
parent: john at arbash-meinel.com-20070214201327-16eleapizxjo7vm6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:15:36 -0600
message:
simple rewrap for 79 char lines
------------------------------------------------------------
revno: 2052.1.203.2.50
revision-id: john at arbash-meinel.com-20070214201327-16eleapizxjo7vm6
parent: john at arbash-meinel.com-20070214200940-s84qp76syr3kywlt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:13:27 -0600
message:
merge only needs a lock_tree_write() on the working tree, not a full lock_write()
------------------------------------------------------------
revno: 2052.1.203.2.49
revision-id: john at arbash-meinel.com-20070214200940-s84qp76syr3kywlt
parent: jw+debian at jameswestby.net-20070214192716-dto5wr6vv56osswj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:09:40 -0600
message:
set_state_from_inventory needs to include NULL records for parents when there wasn't an entry before
------------------------------------------------------------
revno: 2052.1.203.2.48
revision-id: jw+debian at jameswestby.net-20070214192716-dto5wr6vv56osswj
parent: robertc at robertcollins.net-20070214100748-wyhniu27ko2l7z8j
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 19:27:16 +0000
message:
Write out a placeholder for parent info when a file is added.
* When a file is added it's parent information is not known, but it is
required to be in the file.
* There is a problem with this fix though, as if the file is read in
and then written back out this information will be filtered out and lost.
* Test case for seeing the problem is
test_clone_preserves_content.\*WorkingTreeFormat4
------------------------------------------------------------
revno: 2052.1.203.2.47
revision-id: robertc at robertcollins.net-20070214100748-wyhniu27ko2l7z8j
parent: robertc at robertcollins.net-20070214095222-tj115lpmfiy3htvq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 21:07:48 +1100
message:
Adjust walkdirs tests to talk a lock around walk_dirs.
------------------------------------------------------------
revno: 2052.1.203.2.46
revision-id: robertc at robertcollins.net-20070214095222-tj115lpmfiy3htvq
parent: robertc at robertcollins.net-20070214093211-hwsla8ly0tfycav4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 20:52:22 +1100
message:
Dirstate - unversion should set the tree state as dirty.
------------------------------------------------------------
revno: 2052.1.203.2.45
revision-id: robertc at robertcollins.net-20070214093211-hwsla8ly0tfycav4
parent: robertc at robertcollins.net-20070214090400-907zspzmm0dic4wh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 20:32:11 +1100
message:
Dirstate - fix revision_tree() behaviour to match the interface contract.
------------------------------------------------------------
revno: 2052.1.203.2.44
revision-id: robertc at robertcollins.net-20070214090400-907zspzmm0dic4wh
parent: robertc at robertcollins.net-20070214064814-723gt18wj42pxj54
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 20:04:00 +1100
message:
Fix tree unlock on readonly Format4 trees with dirty hashcache.
------------------------------------------------------------
revno: 2052.1.203.2.43
revision-id: robertc at robertcollins.net-20070214064814-723gt18wj42pxj54
parent: robertc at robertcollins.net-20070214062537-inmwv4a1bx2asgs1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 17:48:14 +1100
message:
WorkingTree4.add must not require a file to exist to add it when kind etc is given.
------------------------------------------------------------
revno: 2052.1.203.2.42
revision-id: robertc at robertcollins.net-20070214062537-inmwv4a1bx2asgs1
parent: robertc at robertcollins.net-20070214062034-o6mom1aj7j313if6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 17:25:37 +1100
message:
Fix WorkingTree4.set_parent_trees.
------------------------------------------------------------
revno: 2052.1.203.2.41
revision-id: robertc at robertcollins.net-20070214062034-o6mom1aj7j313if6
parent: robertc at robertcollins.net-20070214061315-2dvvt300ok9119x0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 17:20:34 +1100
message:
Fix Dirstate.get_parent_ids to return a copy of the ids, not a list whose mutation will break us.
------------------------------------------------------------
revno: 2052.1.203.2.40
revision-id: robertc at robertcollins.net-20070214061315-2dvvt300ok9119x0
parent: robertc at robertcollins.net-20070214054023-yq9exvslp2ww0nwy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 17:13:15 +1100
message:
Remove incomplete and unused dirstate api add_parent_tree.
------------------------------------------------------------
revno: 2052.1.203.2.39
revision-id: robertc at robertcollins.net-20070214054023-yq9exvslp2ww0nwy
parent: robertc at robertcollins.net-20070214053253-6m06wl1s9kiw0qcv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 16:40:23 +1100
message:
WorkingTree4: flush can only be used during write locks.
------------------------------------------------------------
revno: 2052.1.203.2.38
revision-id: robertc at robertcollins.net-20070214053253-6m06wl1s9kiw0qcv
parent: robertc at robertcollins.net-20070214051339-kio8v4q522dcczm3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 16:32:53 +1100
message:
Fix WorkingTree4.pull to work.
------------------------------------------------------------
revno: 2052.1.203.2.37
revision-id: robertc at robertcollins.net-20070214051339-kio8v4q522dcczm3
parent: robertc at robertcollins.net-20070214042212-mx6vagld7pedmyfw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 16:13:39 +1100
message:
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
------------------------------------------------------------
revno: 2052.1.203.2.36
revision-id: robertc at robertcollins.net-20070214042212-mx6vagld7pedmyfw
parent: robertc at robertcollins.net-20070214034605-wwq4di8g2nsbp8ni
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 15:22:12 +1100
message:
Fix Dirstate unversioning of entries which are in a parent.
------------------------------------------------------------
revno: 2052.1.203.2.35
revision-id: robertc at robertcollins.net-20070214034605-wwq4di8g2nsbp8ni
parent: robertc at robertcollins.net-20070214031748-u6cmsmmerm0zdqfh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:46:05 +1100
message:
Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability.
------------------------------------------------------------
revno: 2052.1.203.2.34
revision-id: robertc at robertcollins.net-20070214031748-u6cmsmmerm0zdqfh
parent: robertc at robertcollins.net-20070214023735-cj9eimb7jkccho6i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 14:17:48 +1100
message:
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
------------------------------------------------------------
revno: 2052.1.203.2.33
revision-id: robertc at robertcollins.net-20070214023735-cj9eimb7jkccho6i
parent: robertc at robertcollins.net-20070214003125-9k98ublv24yghhb1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 13:37:35 +1100
message:
Correct thunko in refactoring a few commits back.
------------------------------------------------------------
revno: 2052.1.203.2.32
revision-id: robertc at robertcollins.net-20070214003125-9k98ublv24yghhb1
parent: robertc at robertcollins.net-20070213225854-eiul6077abs31bxe
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 11:31:25 +1100
message:
Make test_clear_merge_conflicts pass for dirstate. This involved working
around an apparent race condition with file.truncate not truncating - the
dirstate file shrinks but later readers see the old file length and
content.
------------------------------------------------------------
revno: 2052.1.203.2.31
revision-id: robertc at robertcollins.net-20070213225854-eiul6077abs31bxe
parent: robertc at robertcollins.net-20070213222322-48liwrvbanmvlc24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 09:58:54 +1100
message:
Work in progress to make merge_inner work with dirstate trees.
------------------------------------------------------------
revno: 2052.1.203.2.30
revision-id: robertc at robertcollins.net-20070213222322-48liwrvbanmvlc24
parent: robertc at robertcollins.net-20070213220121-xqmcyci92igsufix
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 09:23:22 +1100
message:
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.
------------------------------------------------------------
revno: 2052.1.203.2.29
revision-id: robertc at robertcollins.net-20070213220121-xqmcyci92igsufix
parent: robertc at robertcollins.net-20070213215415-6mq85vvc26ia5xgi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 09:01:21 +1100
message:
Change the error raised from Dirstate.add for an unversioned parent path to match the WorkingTree interface.
------------------------------------------------------------
revno: 2052.1.203.2.28
revision-id: robertc at robertcollins.net-20070213215415-6mq85vvc26ia5xgi
parent: john at arbash-meinel.com-20070213214821-kixuzfqak8kh72hx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-14 08:54:15 +1100
message:
TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.27
revision-id: john at arbash-meinel.com-20070213214821-kixuzfqak8kh72hx
parent: john at arbash-meinel.com-20070213214527-ldycawt3gusmy0nn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:48:21 -0600
message:
Fix a copyright statement to let 'source' tests pass
------------------------------------------------------------
revno: 2052.1.203.2.26
revision-id: john at arbash-meinel.com-20070213214527-ldycawt3gusmy0nn
parent: john at arbash-meinel.com-20070213213438-ckxvudqmy5sa6pmu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:45:27 -0600
message:
Use a clearer variable for num_present_parents while reading dirblocks
------------------------------------------------------------
revno: 2052.1.203.2.25
revision-id: john at arbash-meinel.com-20070213213438-ckxvudqmy5sa6pmu
parent: john at arbash-meinel.com-20070213213402-05v5g7g3bsbrxb3p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:34:38 -0600
message:
DirstateRevisionTrees need to be read_locked before they will work as BasisTree
------------------------------------------------------------
revno: 2052.1.203.2.24
revision-id: john at arbash-meinel.com-20070213213402-05v5g7g3bsbrxb3p
parent: john at arbash-meinel.com-20070213210556-zw42d3te8rv50hct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:34:02 -0600
message:
When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision
------------------------------------------------------------
revno: 2052.1.203.2.23
revision-id: john at arbash-meinel.com-20070213210556-zw42d3te8rv50hct
parent: robertc at robertcollins.net-20070213111943-atz18s4v89dn3hkk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:05:56 -0600
message:
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
------------------------------------------------------------
revno: 2052.1.203.2.22
revision-id: robertc at robertcollins.net-20070213111943-atz18s4v89dn3hkk
parent: robertc at robertcollins.net-20070213074405-cr50y24l7n7fon56
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 22:19:43 +1100
message:
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
------------------------------------------------------------
revno: 2052.1.203.2.21
revision-id: robertc at robertcollins.net-20070213074405-cr50y24l7n7fon56
parent: robertc at robertcollins.net-20070213061520-3ga0hywdijgr8fxg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 18:44:05 +1100
message:
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass.
------------------------------------------------------------
revno: 2052.1.203.2.20
revision-id: robertc at robertcollins.net-20070213061520-3ga0hywdijgr8fxg
parent: robertc at robertcollins.net-20070213055402-vn9c5sctppi2wanj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 17:15:20 +1100
message:
Bypass irrelevant basis_inventory tests for dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.19
revision-id: robertc at robertcollins.net-20070213055402-vn9c5sctppi2wanj
parent: robertc at robertcollins.net-20070213053056-ypqby2efbram4k53
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 16:54:02 +1100
message:
Remove unneeded and unportable WorkingTree basis-inventory test
'test_basis_inv_gets_revision' which checks that when we
set a parent tree in a working tree with an inventory with no
revision_id, the revision_id is correctly stored.
However, Repository.deserialise_inventory always sets the revision_id
(for Knit1) and ensures its there (for Knit2).
------------------------------------------------------------
revno: 2052.1.203.2.18
revision-id: robertc at robertcollins.net-20070213053056-ypqby2efbram4k53
parent: robertc at robertcollins.net-20070213042134-typgrsy56uftta7x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 16:30:56 +1100
message:
Dirstate: all tree_implementation tests passing.
------------------------------------------------------------
revno: 2052.1.203.2.17
revision-id: robertc at robertcollins.net-20070213042134-typgrsy56uftta7x
parent: robertc at robertcollins.net-20070213040523-hmubxccedv85k967
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:21:34 +1100
message:
tweaks - finishes off all the test_test_trees tests for dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.16
revision-id: robertc at robertcollins.net-20070213040523-hmubxccedv85k967
parent: robertc at robertcollins.net-20070213014233-9jtxnsrljncqdtgt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:05:23 +1100
message:
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
------------------------------------------------------------
revno: 2052.1.203.2.15
revision-id: robertc at robertcollins.net-20070213014233-9jtxnsrljncqdtgt
parent: robertc at robertcollins.net-20070212230308-yvh5jufj1dng75wm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 12:42:33 +1100
message:
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
------------------------------------------------------------
revno: 2052.1.203.2.14
revision-id: robertc at robertcollins.net-20070212230308-yvh5jufj1dng75wm
parent: robertc at robertcollins.net-20070212223329-275infbfdfv1d24d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 10:03:08 +1100
message:
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
------------------------------------------------------------
revno: 2052.1.203.2.13
revision-id: robertc at robertcollins.net-20070212223329-275infbfdfv1d24d
parent: robertc at robertcollins.net-20070212122016-09nzj20fdc5a7olk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Tue 2007-02-13 09:33:29 +1100
message:
Test adding of directories to the root of a dirstate.
------------------------------------------------------------
revno: 2052.1.203.2.12
revision-id: robertc at robertcollins.net-20070212122016-09nzj20fdc5a7olk
parent: robertc at robertcollins.net-20070212092321-1zbfcmcg58o5fwwc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 23:20:16 +1100
message:
Partial implementation of WorkingTree4._add.
------------------------------------------------------------
revno: 2052.1.203.2.11
revision-id: robertc at robertcollins.net-20070212092321-1zbfcmcg58o5fwwc
parent: robertc at robertcollins.net-20070212090246-p4c9wjssp07jmrj7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 20:23:21 +1100
message:
Fix the format 4 tree layout test.
------------------------------------------------------------
revno: 2052.1.203.2.10
revision-id: robertc at robertcollins.net-20070212090246-p4c9wjssp07jmrj7
parent: robertc at robertcollins.net-20070212050917-gq1g6szx07seanfr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 20:02:46 +1100
message:
Now all tests matching dirstate pass - added generation of inventories for parent trees.
------------------------------------------------------------
revno: 2052.1.203.2.9
revision-id: robertc at robertcollins.net-20070212050917-gq1g6szx07seanfr
parent: robertc at robertcollins.net-20070212021844-o0olslhyd0e675jc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 16:09:17 +1100
message:
Dirstate: Fix setting of parent trees to record data about entries not in
the current tree, and fix serialisation and deserialisation to correctly
save and retrieve all entries and parents.
------------------------------------------------------------
revno: 2052.1.203.2.8
revision-id: robertc at robertcollins.net-20070212021844-o0olslhyd0e675jc
parent: robertc at robertcollins.net-20070212011000-ow0mqc9fpayx7ugz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 13:18:44 +1100
message:
First DirState.add() method test passing.
------------------------------------------------------------
revno: 2052.1.203.2.7
revision-id: robertc at robertcollins.net-20070212011000-ow0mqc9fpayx7ugz
parent: robertc at robertcollins.net-20070212010052-o042kqo4bqwb5s16
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 12:10:00 +1100
message:
test_set_parent_trees_no_content dirstate test now passing.
------------------------------------------------------------
revno: 2052.1.203.2.6
revision-id: robertc at robertcollins.net-20070212010052-o042kqo4bqwb5s16
parent: robertc at robertcollins.net-20070212003219-534i22hhko16tf5f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 12:00:52 +1100
message:
Correct row updates during DirState.set_parent_trees.
------------------------------------------------------------
revno: 2052.1.203.2.5
revision-id: robertc at robertcollins.net-20070212003219-534i22hhko16tf5f
parent: robertc at robertcollins.net-20070209065559-snwodn5i9mu8om4w
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-12 11:32:19 +1100
message:
Fix getting two different tree roots in the set_parent_trees_no_content dirstate test.
------------------------------------------------------------
revno: 2052.1.203.2.4
revision-id: robertc at robertcollins.net-20070209065559-snwodn5i9mu8om4w
parent: robertc at robertcollins.net-20070208204707-e1uhlli4t3ozgeil
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-09 17:55:59 +1100
message:
Snapshot dirstate development
------------------------------------------------------------
revno: 2052.1.203.2.3
revision-id: robertc at robertcollins.net-20070208204707-e1uhlli4t3ozgeil
parent: robertc at robertcollins.net-20070208001102-k5hy63o7om2amnp1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-09 07:47:07 +1100
message:
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
------------------------------------------------------------
revno: 2052.1.203.2.2
revision-id: robertc at robertcollins.net-20070208001102-k5hy63o7om2amnp1
parent: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-08 11:11:02 +1100
message:
Partial updates for API changes in trunk.
------------------------------------------------------------
revno: 2052.1.203.2.1
revision-id: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-01 23:00:35 -0600
message:
Update a clean branch with the dirstate improvements.
------------------------------------------------------------
revno: 1852.4.26
revision-id: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
parent: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
parent: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: WorkingTreeFormat4 as the default tree format.
timestamp: Thu 2007-02-01 22:56:09 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.4.24.1.1
revision-id: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
parent: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: WorkingTree Format 4
timestamp: Thu 2007-02-01 22:55:26 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.8
revision-id: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
parent: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status-benchmarks
timestamp: Thu 2007-02-01 22:53:48 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.19
revision-id: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
parent: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_write_inventory
timestamp: Thu 2007-02-01 22:51:48 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.5
revision-id: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
parent: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: Tree.walkdirs
timestamp: Thu 2007-02-01 22:49:38 -0600
message:
[merge] bzr.dev 2255, resolve conflicts, update copyrights
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.7
revision-id: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
parent: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-02-01 22:23:24 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.6
revision-id: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
parent: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-01-18 18:01:12 -0600
message:
Fix an invalid access to bzrlib.xml6 in workingtree.py
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.5
revision-id: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-01-18 17:45:24 -0600
message:
[merge] bzr.dev 2240
------------------------------------------------------------
revno: 1852.4.25
revision-id: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTreeFormat4 as the default tree format.
timestamp: Fri 2006-12-08 14:19:36 +1100
message:
Snapshot state
------------------------------------------------------------
revno: 1852.4.24
revision-id: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
parent: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-10-16 12:20:12 +1000
message:
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
------------------------------------------------------------
revno: 1852.4.23
revision-id: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
parent: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-10-06 10:41:27 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.7
revision-id: robertc at robertcollins.net-20061006003850-31476149984a1a02
parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Fri 2006-10-06 10:38:50 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.18
revision-id: robertc at robertcollins.net-20061006003734-c1f35733490cb427
parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Fri 2006-10-06 10:37:34 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.4
revision-id: robertc at robertcollins.net-20061006003453-c840b2008705450b
parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-10-06 10:34:53 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.4
revision-id: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-10-06 10:33:41 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.4.22
revision-id: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
parent: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-10-04 13:37:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.6
revision-id: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Wed 2006-10-04 13:33:44 +1000
message:
merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.17
revision-id: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Wed 2006-10-04 12:12:35 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.3
revision-id: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Wed 2006-10-04 11:56:39 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.3
revision-id: robertc at robertcollins.net-20061004014835-764aa46abec8451b
parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Wed 2006-10-04 11:48:35 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1852.4.21
revision-id: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
parent: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-10-04 11:38:38 +1000
message:
(Robert Collins, John Meinel) Update WorkingTree Format 4 format string to be nicer to read.
------------------------------------------------------------
revno: 1852.4.20
revision-id: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
parent: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-09-13 13:43:46 +1000
message:
Steps toward an object model.
------------------------------------------------------------
revno: 1852.4.19
revision-id: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
parent: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-09-11 15:36:48 +1000
message:
Get DirState objects roundtripping an add of a ghost tree.
------------------------------------------------------------
revno: 1852.4.18
revision-id: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
parent: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-09-08 15:57:25 +1000
message:
Write top level acceptance test for dirstate.
------------------------------------------------------------
revno: 1852.4.17
revision-id: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
parent: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-09-08 14:33:01 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.5
revision-id: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Fri 2006-09-08 14:30:58 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.16
revision-id: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Fri 2006-09-08 14:30:20 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.2
revision-id: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-09-08 14:28:01 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.2
revision-id: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
parent: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-09-08 14:20:58 +1000
message:
Implement WorkingTree interface conformance tests for
WorkingTree.revision_tree. As part of this, refactor the basis_tree method
to use revision_tree to access the cached basis inventory.
(Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.1
revision-id: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-09-08 11:58:47 +1000
message:
Add a new method ``Tree.revision_tree`` which allows access to cached
trees for arbitrary revisions. This allows the in development dirstate
tree format to provide access to the callers to cached copies of
inventory data which are cheaper to access than inventories from the
repository. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 1852.4.16
revision-id: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
parent: robertc at robertcollins.net-20060802081150-6041cc7808a58320
parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-08-07 17:19:28 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.4
revision-id: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-08-07 17:19:19 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.15
revision-id: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Mon 2006-08-07 17:19:10 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.1
revision-id: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
parent: pqm at pqm.ubuntu.com-20060806235730-876748deb30a3d2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-08-07 17:18:55 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.4.15
revision-id: robertc at robertcollins.net-20060802081150-6041cc7808a58320
parent: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-08-02 18:11:50 +1000
message:
Ensure Format4 working trees start with a dirstate.
------------------------------------------------------------
revno: 1852.4.14
revision-id: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
parent: robertc at robertcollins.net-20060801024856-8d077236a204de35
parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-08-02 15:55:06 +1000
message:
Merge _write_inventory test.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.14
revision-id: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Wed 2006-08-02 15:44:51 +1000
message:
test that WorkingTree._write_inventory works as expected by the current code.
------------------------------------------------------------
revno: 1852.4.13
revision-id: robertc at robertcollins.net-20060801024856-8d077236a204de35
parent: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:48:56 +1000
message:
2-parent case working.
------------------------------------------------------------
revno: 1852.4.12
revision-id: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
parent: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:34:25 +1000
message:
get actual parent info for the first parent.
------------------------------------------------------------
revno: 1852.4.11
revision-id: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
parent: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:17:03 +1000
message:
Get one content containing test passing.
------------------------------------------------------------
revno: 1852.4.10
revision-id: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
parent: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:10:24 +1000
message:
Use just the tree api to generate dirstate information.
------------------------------------------------------------
revno: 1852.4.9
revision-id: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
parent: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:47:19 +1000
message:
Merge Tree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.3
revision-id: robertc at robertcollins.net-20060731134709-61df962ef27379f6
parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-07-31 23:47:09 +1000
message:
Merge Tree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13
revision-id: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 23:46:52 +1000
message:
Add WorkingTree.walkdirs benchmarks.
------------------------------------------------------------
revno: 1852.4.8
revision-id: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
parent: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:05:17 +1000
message:
get current dirstat tests all passing.
------------------------------------------------------------
revno: 1852.4.7
revision-id: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
parent: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:00:32 +1000
message:
Merge in bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.2
revision-id: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-07-31 23:00:10 +1000
message:
Merge in bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.12
revision-id: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
parent: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 22:57:18 +1000
message:
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.11
revision-id: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
parent: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 21:19:48 +1000
message:
Tree.walkdirs handles missing contents in workingtrees.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.10
revision-id: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
parent: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 17:18:54 +1000
message:
Tweak the Tree.walkdirs interface more to be more useful.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.9
revision-id: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
parent: robertc at robertcollins.net-20060731045034-092027e3f462f644
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:50:51 +1000
message:
Add missing test script.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.8
revision-id: robertc at robertcollins.net-20060731045034-092027e3f462f644
parent: robertc at robertcollins.net-20060731041731-5e25624f04900907
parent: robertc at robertcollins.net-20060731043747-26893f2e873e7816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:50:34 +1000
message:
Merge walkdirs tidyup.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.7
revision-id: robertc at robertcollins.net-20060731041731-5e25624f04900907
parent: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:17:31 +1000
message:
Start testing behaviour of unknowns in WorkingTree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.6
revision-id: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
parent: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
parent: robertc at robertcollins.net-20060730140221-19d4964ea23f4406
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 00:09:17 +1000
message:
Merge osutils.walkdirs improvements.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.5
revision-id: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
parent: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sun 2006-07-30 02:04:35 +1000
message:
Add missing test_walkdirs test file.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.4
revision-id: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
parent: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
parent: pqm at pqm.ubuntu.com-20060729144556-473b3c46dfa061a7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sun 2006-07-30 02:04:16 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.3
revision-id: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
parent: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sat 2006-07-29 13:57:49 +1000
message:
Add a first-cut Tree.walkdirs method.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.2
revision-id: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
parent: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
parent: pqm at pqm.ubuntu.com-20060728165219-3a441adb0af54ef8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sat 2006-07-29 11:49:10 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.1
revision-id: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
parent: robertc at robertcollins.net-20060725062142-a8ba77276b76c8cf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-07-28 19:00:47 +1000
message:
Add a complex test tree for use with Tree.walkdirs.
------------------------------------------------------------
revno: 1852.4.6
revision-id: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
parent: robertc at robertcollins.net-20060727010824-1574387ff896add8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-28 11:21:52 +1000
message:
start hooking in the prototype dirstate serialiser.
------------------------------------------------------------
revno: 1852.4.5
revision-id: robertc at robertcollins.net-20060727010824-1574387ff896add8
parent: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Thu 2006-07-27 11:08:24 +1000
message:
merge single file status benchmark.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.1
revision-id: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Thu 2006-07-27 11:08:05 +1000
message:
Add single file status benchmark.
------------------------------------------------------------
revno: 1852.4.4
revision-id: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
parent: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-07-26 17:49:58 +1000
message:
Merge Tree.changes_from work.
------------------------------------------------------------
revno: 1852.4.3
revision-id: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
parent: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
parent: robertc at robertcollins.net-20060717072302-c398045e6dcc577d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-17 17:23:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.4.2
revision-id: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
parent: robertc at robertcollins.net-20060714054631-831827119939d138
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-14 16:01:10 +1000
message:
Introduce a WorkingTree Format 4, which is the new dirstate format.
------------------------------------------------------------
revno: 1852.4.1
revision-id: robertc at robertcollins.net-20060714054631-831827119939d138
parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
parent: robertc at robertcollins.net-20060714052817-76f18c3e784ed1ef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-14 15:46:31 +1000
message:
Merge in prepatory work for adding WorkingTreeFormat4.
------------------------------------------------------------
revno: 2052.1.269
revision-id: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: pqm at pqm.ubuntu.com-20070306152511-aa137bb63d6e3a62
parent: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 15:59:43 +0000
message:
(John Arbash Meinel) Change safe_*_id to issue a deprecation warning, and clean up places that were still generating unicode ids.
------------------------------------------------------------
revno: 2052.1.257.4.14
revision-id: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
parent: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:43:47 -0600
message:
The parameter is 'conflict_path' not 'conflict_file_path'
------------------------------------------------------------
revno: 2052.1.257.4.13
revision-id: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
parent: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:36:36 -0600
message:
Conflicts go through Stanza so the need to be aware of utf8 versus unicode file ids.
------------------------------------------------------------
revno: 2052.1.257.4.12
revision-id: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
parent: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:12:18 -0600
message:
[merge] bzr.dev 2319
(broken) Conflicts generate unicode file ids, will fix in next commit.
------------------------------------------------------------
revno: 2052.1.257.4.11
revision-id: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
parent: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 13:27:06 -0600
message:
Change Branch5._gen_revision_history() to be a bit faster about reading all revisions.
------------------------------------------------------------
revno: 2052.1.257.4.10
revision-id: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
parent: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 12:59:00 -0600
message:
(fixed) Fix the last few tests that were explicitly passing around unicode ids
------------------------------------------------------------
revno: 2052.1.257.4.9
revision-id: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
parent: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:19:17 -0600
message:
WorkingTree.merged_modified() needs to switch back to utf8 file ids.
And AddCustomIDAction should also be generating utf8 ids.
------------------------------------------------------------
revno: 2052.1.257.4.8
revision-id: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
parent: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:10:52 -0600
message:
TextStores don't require Unicode file_ids anymore. test_a passes
------------------------------------------------------------
revno: 2052.1.257.4.7
revision-id: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
parent: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:09:40 -0600
message:
Update VersionedFile tests to ensure that they can take Unicode,
but issue a warning when doing so.
------------------------------------------------------------
revno: 2052.1.257.4.6
revision-id: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
parent: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:51:24 -0600
message:
Update the 'escaped store' tests to use both unicode and utf8 file ids.
------------------------------------------------------------
revno: 2052.1.257.4.5
revision-id: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
parent: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:40:35 -0600
message:
Change bundle_data to use the sanitizing form of safe_*_id
------------------------------------------------------------
revno: 2052.1.257.4.4
revision-id: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
parent: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:35:03 -0600
message:
Change what warnings are raised, and add tests that they are used.
------------------------------------------------------------
revno: 2052.1.257.4.3
revision-id: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
parent: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:19:48 -0600
message:
(broken) change safe_*_id to emit a warning.
This causes lots of tests to start failing.
------------------------------------------------------------
revno: 2052.1.257.4.2
revision-id: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
parent: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:06:57 -0600
message:
Change iter_entries_by_dir to avoid extra file id safety checks.
------------------------------------------------------------
revno: 2052.1.257.4.1
revision-id: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 09:56:52 -0600
message:
[merge] iter_entries_by_dir fix
------------------------------------------------------------
revno: 2052.1.268
revision-id: pqm at pqm.ubuntu.com-20070306152511-aa137bb63d6e3a62
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: john at arbash-meinel.com-20070306144324-6kl9fhww8x8m690s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 15:25:11 +0000
message:
(Kent Gibson) Normalize ignore patterns to avoid problems with path seperators.
------------------------------------------------------------
revno: 2052.1.267.1.1
revision-id: john at arbash-meinel.com-20070306144324-6kl9fhww8x8m690s
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: warthog618 at gmail.com-20070305232108-r9dnnjjsruycxon3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-03-06 08:43:24 -0600
message:
(Kent Gibson) Normalize ignore patterns to avoid problems with path seperators.
------------------------------------------------------------
revno: 2052.1.246.8.4
revision-id: warthog618 at gmail.com-20070305232108-r9dnnjjsruycxon3
parent: warthog618 at gmail.com-20070302075441-m5ek2v3j6z5gti2m
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Tue 2007-03-06 08:21:08 +0900
message:
Fix whitespace and alignment.
------------------------------------------------------------
revno: 2052.1.246.8.3
revision-id: warthog618 at gmail.com-20070302075441-m5ek2v3j6z5gti2m
parent: warthog618 at gmail.com-20070302003438-c9ju53dq662l0edr
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Fri 2007-03-02 16:54:41 +0900
message:
Extended test cases to test bug 86451.
------------------------------------------------------------
revno: 2052.1.246.8.2
revision-id: warthog618 at gmail.com-20070302003438-c9ju53dq662l0edr
parent: warthog618 at gmail.com-20070301084600-mce8y9te2o548h5r
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Fri 2007-03-02 09:34:38 +0900
message:
Review fixes for lp86451 patch.
------------------------------------------------------------
revno: 2052.1.246.8.1
revision-id: warthog618 at gmail.com-20070301084600-mce8y9te2o548h5r
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Thu 2007-03-01 17:46:00 +0900
message:
Normalise ignore patterns to use '/' path separator.
Also fixes bug 86451 where a trailing '\' crashes pattern matching.
Added detection and correction of trailing '\' in ignore REs that would
escape the closing bracket.
------------------------------------------------------------
revno: 2052.1.267
revision-id: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
parent: bialix at ukr.net-20070306080508-43s3c6gz2nqikt8m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 11:47:11 +0000
message:
(bialix) update comment about stderr (trivial)
------------------------------------------------------------
revno: 2052.1.266.1.1
revision-id: bialix at ukr.net-20070306080508-43s3c6gz2nqikt8m
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Tue 2007-03-06 10:05:08 +0200
message:
update comment about stderr (trivial)
------------------------------------------------------------
revno: 2052.1.266
revision-id: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
parent: pqm at pqm.ubuntu.com-20070306001952-643bf00bcf1c1160
parent: bialix at ukr.net-20070306001057-icg2bwq1pprq0wkx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 00:37:58 +0000
message:
(bialix,r=john) little fix for manpage generator (handling absent
help for commands options)
------------------------------------------------------------
revno: 2052.1.257.3.2
revision-id: bialix at ukr.net-20070306001057-icg2bwq1pprq0wkx
parent: bialix at ukr.net-20070302235316-8n8d4osjeha5c4ge
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: manpage.test
timestamp: Tue 2007-03-06 02:10:57 +0200
message:
removed implemented todo (r=john)
------------------------------------------------------------
revno: 2052.1.257.3.1
revision-id: bialix at ukr.net-20070302235316-8n8d4osjeha5c4ge
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: "Alexander Belchenko <bialix at ukr.net>"
branch nick: manpage.test
timestamp: Sat 2007-03-03 01:53:16 +0200
message:
Fix for selftest of man generator with instaled plugin 'htmllog' (no help for plugin's log formatter)
------------------------------------------------------------
revno: 2052.1.265
revision-id: pqm at pqm.ubuntu.com-20070306001952-643bf00bcf1c1160
parent: pqm at pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
parent: bialix at ukr.net-20070305154543-k4614opjp0z5y4w5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 00:19:52 +0000
message:
(bialix,r=andrew) win32-specific fixes for selftest (blackbox)
------------------------------------------------------------
revno: 2052.1.257.2.8
revision-id: bialix at ukr.net-20070305154543-k4614opjp0z5y4w5
parent: bialix at ukr.net-20070305153358-7e3w7roi09wu3hy6
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 17:45:43 +0200
message:
note about flushing stderr (suggested by Andrew)
------------------------------------------------------------
revno: 2052.1.257.2.7
revision-id: bialix at ukr.net-20070305153358-7e3w7roi09wu3hy6
parent: bialix at ukr.net-20070305143428-3carp6uibk6yume4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 17:33:58 +0200
message:
Skip permission denied (on win32) during selftest cleanup
------------------------------------------------------------
revno: 2052.1.257.2.6
revision-id: bialix at ukr.net-20070305143428-3carp6uibk6yume4
parent: bialix at ukr.net-20070305143000-g5fw5i2k7ot6am2n
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 16:34:28 +0200
message:
bzr now use Win32 API to determine Application Data location, and don't rely solely on $APPDATA
------------------------------------------------------------
revno: 2052.1.257.2.5
revision-id: bialix at ukr.net-20070305143000-g5fw5i2k7ot6am2n
parent: bialix at ukr.net-20070304002813-bfca6obrj3xcqy7y
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 16:30:00 +0200
message:
test_bzr_connect_to_bzr_ssh: win32-compatibility
------------------------------------------------------------
revno: 2052.1.257.2.4
revision-id: bialix at ukr.net-20070304002813-bfca6obrj3xcqy7y
parent: bialix at ukr.net-20070304002646-tqoi7yf0b0cz400i
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:28:13 +0200
message:
SmartServerPipeStreamMedium: binary mode should be forced for media
------------------------------------------------------------
revno: 2052.1.257.2.3
revision-id: bialix at ukr.net-20070304002646-tqoi7yf0b0cz400i
parent: bialix at ukr.net-20070304002513-hmkxrjl39aplqr4a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:26:46 +0200
message:
blackbox.test_mv: using safe osutils.rename instead of os.rename
------------------------------------------------------------
revno: 2052.1.257.2.2
revision-id: bialix at ukr.net-20070304002513-hmkxrjl39aplqr4a
parent: bialix at ukr.net-20070304001602-mhzsxzstjkxt50ao
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:25:13 +0200
message:
Python 2.5 on Windows XP produce slightly different error message (No such file)
------------------------------------------------------------
revno: 2052.1.257.2.1
revision-id: bialix at ukr.net-20070304001602-mhzsxzstjkxt50ao
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:16:02 +0200
message:
flush sys.stderr before os._exit
------------------------------------------------------------
revno: 2052.1.264
revision-id: pqm at pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
parent: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 22:58:59 +0000
message:
resolve auto-resolves text conflicts by default
------------------------------------------------------------
revno: 2052.1.68.7.7
revision-id: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
parent: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Mon 2007-03-05 17:43:22 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.68.7.6
revision-id: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
parent: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: autoconflicts
timestamp: Mon 2007-03-05 16:12:41 -0500
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.68.7.5
revision-id: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
parent: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 12:17:53 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.68.7.4
revision-id: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
parent: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 12:05:34 -0500
message:
Fix normal resolve
------------------------------------------------------------
revno: 2052.1.68.7.3
revision-id: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
parent: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 11:23:45 -0500
message:
Update resolve command to automatically mark conflicts as resolved
------------------------------------------------------------
revno: 2052.1.68.7.2
revision-id: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
parent: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Fri 2007-03-02 20:09:18 -0500
message:
Move autoresolve functionality to workingtree
------------------------------------------------------------
revno: 2052.1.68.7.1
revision-id: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Mon 2006-11-06 01:36:17 -0500
message:
Add auto-resolve support to commit
------------------------------------------------------------
revno: 2052.1.263
revision-id: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
parent: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: john at arbash-meinel.com-20070305205142-3xhccyveuakkrj87
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 22:07:13 +0000
message:
(Vincent Ladeuil) invalid proxy vars should not cause a traceback (bug #87765)
------------------------------------------------------------
revno: 2052.1.262.1.1
revision-id: john at arbash-meinel.com-20070305205142-3xhccyveuakkrj87
parent: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: v.ladeuil+lp at free.fr-20070225121053-eh4u4ydukn97ht9q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-05 14:51:42 -0600
message:
(Vincent Ladeuil) invalid proxy vars should not cause a traceback (bug #87765)
------------------------------------------------------------
revno: 2052.1.246.7.1
revision-id: v.ladeuil+lp at free.fr-20070225121053-eh4u4ydukn97ht9q
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 87765
timestamp: Sun 2007-02-25 13:10:53 +0100
message:
Fix bug #87765: proxy env variables without scheme should cause
bzr to issue traceback.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox.test_invalid_proxy): New test for an proxy
not mentionning a scheme.
(TestProxyHttpServer.setUp): New attribute with the proxy raw
address.
(TestProxyHttpServer.test_http_proxy_without_scheme): New test
checking that InvalidURL is raised when an env variable specifies
no scheme.
(TestProxyHttpServer_pycurl): pycurl ignores invalid proxies,
check it in case it changes in the future.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.set_proxy): If we can't find a host in the proxy env
variable, raises InvalidURL.
------------------------------------------------------------
revno: 2052.1.262
revision-id: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: pqm at pqm.ubuntu.com-20070304031833-38a609e7e3fb3c5b
parent: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 20:27:15 +0000
message:
(Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
------------------------------------------------------------
revno: 2052.1.260.1.1
revision-id: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-05 14:12:56 -0600
message:
(Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
------------------------------------------------------------
revno: 2052.1.246.6.1
revision-id: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Johan Dahlberg <johan_d at lysator.liu.se>
branch nick: bugfix75577
timestamp: Sat 2007-03-03 14:47:31 +0900
message:
Fix bzrtools shelve command for removed lines beginning with "--"
(Johan Dahlberg, bug #75577)
------------------------------------------------------------
revno: 2052.1.261
revision-id: pqm at pqm.ubuntu.com-20070304031833-38a609e7e3fb3c5b
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: mbp at sourcefrog.net-20070304014718-xwe549s6zskew9hx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-04 03:18:33 +0000
message:
(mbp, trivial) Avoid false failure of test_dash_derror
------------------------------------------------------------
revno: 2052.1.256.1.1
revision-id: mbp at sourcefrog.net-20070304014718-xwe549s6zskew9hx
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: derror
timestamp: Sun 2007-03-04 12:47:18 +1100
message:
Avoid false failure of test_dash_derror
------------------------------------------------------------
revno: 2052.1.260
revision-id: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: john at arbash-meinel.com-20070302223607-ht1xxgyvfwom3m2t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 22:49:52 +0000
message:
(James Westby) Allow 'bzr cat' to be used against treeless repositories.
------------------------------------------------------------
revno: 2052.1.259.1.1
revision-id: john at arbash-meinel.com-20070302223607-ht1xxgyvfwom3m2t
parent: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: jw+debian at jameswestby.net-20070302181505-h0c9wyrvzp3wslpp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-02 16:36:07 -0600
message:
(James Westby) Allow 'bzr cat' to be used against treeless repositories.
------------------------------------------------------------
revno: 2052.1.257.1.2
revision-id: jw+debian at jameswestby.net-20070302181505-h0c9wyrvzp3wslpp
parent: jw+debian at jameswestby.net-20070302172650-4cjj7xzvpe93c72v
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 18:15:05 +0000
message:
Use BzrDir.open_containing_tree_or_branch as suggested by Aaron.
------------------------------------------------------------
revno: 2052.1.257.1.1
revision-id: jw+debian at jameswestby.net-20070302172650-4cjj7xzvpe93c72v
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 17:26:50 +0000
message:
Allow bzr cat to be used against treeless repositories.
* Currently if bzr cat is used against a treeless repo it fails as the
working tree can't be opened. As cat can work without a working tree
just ignore this error, and use the existing fallback path that opens
the branch instead.
------------------------------------------------------------
revno: 2052.1.259
revision-id: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: pqm at pqm.ubuntu.com-20070302193726-85e12b9ff3c35674
parent: abentley at panoramicfeedback.com-20070302175232-sp3et54asva32az5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 21:00:06 +0000
message:
Documentation cleanup (Brad Crittenden)
------------------------------------------------------------
revno: 2052.1.241.1.7
revision-id: abentley at panoramicfeedback.com-20070302175232-sp3et54asva32az5
parent: bac at canonical.com-20070302124045-3a9o45va231z0w0a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2007-03-02 12:52:32 -0500
message:
Fix heading formatting
------------------------------------------------------------
revno: 2052.1.241.1.6
revision-id: bac at canonical.com-20070302124045-3a9o45va231z0w0a
parent: bac at canonical.com-20070227221414-du51ihnpkdu59geo
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 07:40:45 -0500
message:
post review changes
------------------------------------------------------------
revno: 2052.1.241.1.5
revision-id: bac at canonical.com-20070227221414-du51ihnpkdu59geo
parent: bac at canonical.com-20070227221101-b854hjop5278bqqb
parent: joe at blow.com-20070227214342-ixfizya7jemgtady
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:14:14 -0500
message:
Merge from my LP branch
------------------------------------------------------------
revno: 2052.1.241.1.2.1.2
revision-id: joe at blow.com-20070227214342-ixfizya7jemgtady
parent: joe at blow.com-20070227212438-ndpq6lsmn9ahroz5
committer: joe blow <joe at blow.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 16:43:42 -0500
message:
Updated version_info.txt for grammar changes
------------------------------------------------------------
revno: 2052.1.241.1.2.1.1
revision-id: joe at blow.com-20070227212438-ndpq6lsmn9ahroz5
parent: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
committer: joe blow <joe at blow.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 16:24:38 -0500
message:
Updated documents for grammer, spelling, and clarity.
------------------------------------------------------------
revno: 2052.1.241.1.4
revision-id: bac at canonical.com-20070227221101-b854hjop5278bqqb
parent: bac at canonical.com-20070227220504-es0kpgzrjetontoi
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:11:01 -0500
message:
Merge from trunk.
------------------------------------------------------------
revno: 2052.1.241.1.3
revision-id: bac at canonical.com-20070227220504-es0kpgzrjetontoi
parent: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:05:04 -0500
message:
Updated version_info.txt for grammar changes
------------------------------------------------------------
revno: 2052.1.241.1.2
revision-id: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
parent: brad.crittenden at canonical.com-20070216171028-43ozltjcna8z4fu7
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
committer: Brad Crittenden <Brad.Crittenden at canonical.com>
branch nick: bzr.dev
timestamp: Mon 2007-02-26 15:56:10 -0500
message:
merge
------------------------------------------------------------
revno: 2052.1.241.1.1
revision-id: brad.crittenden at canonical.com-20070216171028-43ozltjcna8z4fu7
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: Brad Crittenden <Brad.Crittenden at canonical.com>
branch nick: bzr.dev
timestamp: Fri 2007-02-16 12:10:28 -0500
message:
Corrected some trivial grammar and spelling mistakes.
Corrected formating for enumerated lists.
Added reference to 'bzr resolve' which was omitted.
------------------------------------------------------------
revno: 2052.1.258
revision-id: pqm at pqm.ubuntu.com-20070302193726-85e12b9ff3c35674
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 19:37:26 +0000
message:
(John Arbash Meinel) fix a regression in Inventory.iter_entries_by_dir
------------------------------------------------------------
revno: 2052.1.252.1.2
revision-id: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-02 09:23:21 -0600
message:
Use a set for specific ids for Inventory.iter_entries_by_dir
------------------------------------------------------------
revno: 2052.1.257
revision-id: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
parent: mbp at sourcefrog.net-20070301071555-lalebdbi2pltrdnj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 07:30:00 +0000
message:
(mbp) tags in branch
------------------------------------------------------------
revno: 2052.1.168.2.49
revision-id: mbp at sourcefrog.net-20070301071555-lalebdbi2pltrdnj
parent: mbp at sourcefrog.net-20070301064729-1y0zb2ap6ntxm9d4
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 18:15:55 +1100
message:
merge trunk
------------------------------------------------------------
revno: 2052.1.168.2.48
revision-id: mbp at sourcefrog.net-20070301064729-1y0zb2ap6ntxm9d4
parent: mbp at sourcefrog.net-20070301043643-ho3snagjdl64a96g
parent: mbp at sourcefrog.net-20070301041528-14my1q8v0buynzut
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 17:47:29 +1100
message:
merge up tags and resultobject
------------------------------------------------------------
revno: 2052.1.245.1.6
revision-id: mbp at sourcefrog.net-20070301041528-14my1q8v0buynzut
parent: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Thu 2007-03-01 15:15:28 +1100
message:
Add docs for Results, give some members cleaner names
------------------------------------------------------------
revno: 2052.1.168.2.47
revision-id: mbp at sourcefrog.net-20070301043643-ho3snagjdl64a96g
parent: mbp at sourcefrog.net-20070301042655-ib2mllvaozai23c6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 15:36:43 +1100
message:
Empty BRANCH.TODO; things to do in the future are moved into launchpad bugs
------------------------------------------------------------
revno: 2052.1.168.2.46
revision-id: mbp at sourcefrog.net-20070301042655-ib2mllvaozai23c6
parent: mbp at sourcefrog.net-20070226055708-llf8iqw3ny1f3al6
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 15:26:55 +1100
message:
merge trunk
------------------------------------------------------------
revno: 2052.1.168.2.45
revision-id: mbp at sourcefrog.net-20070226055708-llf8iqw3ny1f3al6
parent: mbp at sourcefrog.net-20070226053612-21tf7x7uvb4qru1b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:57:08 +1100
message:
Make tags output less wide
------------------------------------------------------------
revno: 2052.1.168.2.44
revision-id: mbp at sourcefrog.net-20070226053612-21tf7x7uvb4qru1b
parent: mbp at sourcefrog.net-20070226053332-a0hjhbzhmjxmreq3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:36:12 +1100
message:
tags output needs newlines
------------------------------------------------------------
revno: 2052.1.168.2.43
revision-id: mbp at sourcefrog.net-20070226053332-a0hjhbzhmjxmreq3
parent: mbp at sourcefrog.net-20070226052905-7mt8m6871e9dym8e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:33:32 +1100
message:
Should clear tag file when upgrading format 5 to 6 to prevent warning
------------------------------------------------------------
revno: 2052.1.168.2.42
revision-id: mbp at sourcefrog.net-20070226052905-7mt8m6871e9dym8e
parent: mbp at sourcefrog.net-20070226050852-791ohdf63hd52yt1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:29:05 +1100
message:
Tag command refuses to replace existing tags unless you force it.
Add Tags.has_tag.
------------------------------------------------------------
revno: 2052.1.168.2.41
revision-id: mbp at sourcefrog.net-20070226050852-791ohdf63hd52yt1
parent: mbp at sourcefrog.net-20070226050833-jnc2m7sji8uzrnk8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:08:52 +1100
message:
Fix tag help (fullermd)
------------------------------------------------------------
revno: 2052.1.168.2.40
revision-id: mbp at sourcefrog.net-20070226050833-jnc2m7sji8uzrnk8
parent: mbp at sourcefrog.net-20070225114916-6ahkk1nkyknophma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:08:33 +1100
message:
stubbed-out tests
------------------------------------------------------------
revno: 2052.1.168.2.39
revision-id: mbp at sourcefrog.net-20070225114916-6ahkk1nkyknophma
parent: mbp at sourcefrog.net-20070225111726-w5a6asp76autb02f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:49:16 +1100
message:
Pull also merges tags and warns if they conflict
------------------------------------------------------------
revno: 2052.1.168.2.38
revision-id: mbp at sourcefrog.net-20070225111726-w5a6asp76autb02f
parent: mbp at sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:17:26 +1100
message:
Tag conflicts from push go to stdout.
Cleanup blackbox tests.
------------------------------------------------------------
revno: 2052.1.168.2.37
revision-id: mbp at sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
parent: mbp at sourcefrog.net-20070225105125-32o9nqxk062ncix0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:11:00 +1100
message:
Report conflicting tags from push.
Factor out PushResult.report()
------------------------------------------------------------
revno: 2052.1.168.2.36
revision-id: mbp at sourcefrog.net-20070225105125-32o9nqxk062ncix0
parent: mbp at sourcefrog.net-20070225104729-st8znu3255avneia
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 21:51:25 +1100
message:
Push and pull operations now merge tags and report conflicts in their result
------------------------------------------------------------
revno: 2052.1.168.2.35
revision-id: mbp at sourcefrog.net-20070225104729-st8znu3255avneia
parent: mbp at sourcefrog.net-20070222055851-5u09rtof609irx60
parent: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 21:47:29 +1100
message:
merge result-object changes
------------------------------------------------------------
revno: 2052.1.245.1.5
revision-id: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
parent: mbp at sourcefrog.net-20070225104016-np1gvynr1nqkbnpo
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Sun 2007-02-25 21:41:33 +1100
message:
Update hook docs
------------------------------------------------------------
revno: 2052.1.245.1.4
revision-id: mbp at sourcefrog.net-20070225104016-np1gvynr1nqkbnpo
parent: mbp at sourcefrog.net-20070223055544-ux2lcobwiudl3f53
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Sun 2007-02-25 21:40:16 +1100
message:
Push now returns a PushResult rather than just an integer.
This result object is also passed to the push hooks.
pull ui slightly clearer about what has happened.
------------------------------------------------------------
revno: 2052.1.245.1.3
revision-id: mbp at sourcefrog.net-20070223055544-ux2lcobwiudl3f53
parent: mbp at sourcefrog.net-20070223054511-g9ctoxpgcq0d2sl4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:55:44 +1100
message:
PullResult can pretend to be an int for api compatibility with old .pull()
------------------------------------------------------------
revno: 2052.1.245.1.2
revision-id: mbp at sourcefrog.net-20070223054511-g9ctoxpgcq0d2sl4
parent: mbp at sourcefrog.net-20070223053935-r601f8e1xwwljm21
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:45:11 +1100
message:
Cleanup imports
------------------------------------------------------------
revno: 2052.1.245.1.1
revision-id: mbp at sourcefrog.net-20070223053935-r601f8e1xwwljm21
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:39:35 +1100
message:
Pull now returns a PullResult rather than just an integer.
Remove old Branch.is_control_file function.
------------------------------------------------------------
revno: 2052.1.168.2.34
revision-id: mbp at sourcefrog.net-20070222055851-5u09rtof609irx60
parent: mbp at sourcefrog.net-20070222054903-nmadtvw96a88uq2w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:58:51 +1100
message:
Add a better test for tags command
------------------------------------------------------------
revno: 2052.1.168.2.33
revision-id: mbp at sourcefrog.net-20070222054903-nmadtvw96a88uq2w
parent: mbp at sourcefrog.net-20070222050352-98ohnhisvcc71ela
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:49:03 +1100
message:
Start support for flagging tag conflicts
------------------------------------------------------------
revno: 2052.1.168.2.32
revision-id: mbp at sourcefrog.net-20070222050352-98ohnhisvcc71ela
parent: mbp at sourcefrog.net-20070222045206-zxhd8xxpepbuw8uj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:03:52 +1100
message:
Slightly smarter tag merge
------------------------------------------------------------
revno: 2052.1.168.2.31
revision-id: mbp at sourcefrog.net-20070222045206-zxhd8xxpepbuw8uj
parent: mbp at sourcefrog.net-20070222043908-wt92joyurcxds96p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 15:52:06 +1100
message:
tag cleanups
------------------------------------------------------------
revno: 2052.1.168.2.30
revision-id: mbp at sourcefrog.net-20070222043908-wt92joyurcxds96p
parent: mbp at sourcefrog.net-20070222030533-4e9nxag9ykjffq3s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 15:39:08 +1100
message:
split out tag-merging code and add some tests
------------------------------------------------------------
revno: 2052.1.168.2.29
revision-id: mbp at sourcefrog.net-20070222030533-4e9nxag9ykjffq3s
parent: mbp at sourcefrog.net-20070222030454-qbli35zu25vq59q2
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 14:05:33 +1100
message:
merge status false-failure fix from dev
------------------------------------------------------------
revno: 2052.1.168.2.28
revision-id: mbp at sourcefrog.net-20070222030454-qbli35zu25vq59q2
parent: mbp at sourcefrog.net-20070221073559-lhmy548t6172pd5e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 14:04:54 +1100
message:
Integrate tags with Branch6:
Make a tags file when initializing a branch; warn if it's not there in case
someone has a branch using an unreleased version of this code.
------------------------------------------------------------
revno: 2052.1.168.2.27
revision-id: mbp at sourcefrog.net-20070221073559-lhmy548t6172pd5e
parent: mbp at sourcefrog.net-20070221053456-vyr6o0ehqnbetrvb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 18:35:59 +1100
message:
Start adding tags to Branch6
------------------------------------------------------------
revno: 2052.1.168.2.26
revision-id: mbp at sourcefrog.net-20070221053456-vyr6o0ehqnbetrvb
parent: mbp at sourcefrog.net-20070221051910-lk8hx799ohujeopd
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:34:56 +1100
message:
merge trunk, in particular new Branch6 changes
------------------------------------------------------------
revno: 2052.1.168.2.25
revision-id: mbp at sourcefrog.net-20070221051910-lk8hx799ohujeopd
parent: mbp at sourcefrog.net-20070221050828-yqvr0i3if980i8sy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:19:10 +1100
message:
doc
------------------------------------------------------------
revno: 2052.1.168.2.24
revision-id: mbp at sourcefrog.net-20070221050828-yqvr0i3if980i8sy
parent: mbp at sourcefrog.net-20070221050651-2if33edbetuiv2vf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:08:28 +1100
message:
Add tags command
------------------------------------------------------------
revno: 2052.1.168.2.23
revision-id: mbp at sourcefrog.net-20070221050651-2if33edbetuiv2vf
parent: mbp at sourcefrog.net-20070221044547-0a55m0h9euy2q43l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:06:51 +1100
message:
Fix TagsNotSupportedError
------------------------------------------------------------
revno: 2052.1.168.2.22
revision-id: mbp at sourcefrog.net-20070221044547-0a55m0h9euy2q43l
parent: mbp at sourcefrog.net-20070221040827-udbcbv0raghknyl5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 15:45:47 +1100
message:
doc
------------------------------------------------------------
revno: 2052.1.168.2.21
revision-id: mbp at sourcefrog.net-20070221040827-udbcbv0raghknyl5
parent: mbp at sourcefrog.net-20070220075000-2hz26ddu1hm28jrl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 15:08:27 +1100
message:
Add tag --delete command and implementation
------------------------------------------------------------
revno: 2052.1.168.2.20
revision-id: mbp at sourcefrog.net-20070220075000-2hz26ddu1hm28jrl
parent: mbp at sourcefrog.net-20070220054112-5ch1jqmy9m5zbk72
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 18:50:00 +1100
message:
Tag methods now available through Branch.tags.add_tag, etc
------------------------------------------------------------
revno: 2052.1.168.2.19
revision-id: mbp at sourcefrog.net-20070220054112-5ch1jqmy9m5zbk72
parent: mbp at sourcefrog.net-20070215012807-d5ocuw66i5j8dclk
parent: mbp at sourcefrog.net-20070220052557-e3jtl3uan4ynrtot
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 16:41:12 +1100
message:
merge bencode licence, branch todo
------------------------------------------------------------
revno: 2052.1.168.2.10.1.2
revision-id: mbp at sourcefrog.net-20070220052557-e3jtl3uan4ynrtot
parent: mbp at sourcefrog.net-20070220044754-ptovhd212hs4vkkf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 16:25:57 +1100
message:
add branch todo notes
------------------------------------------------------------
revno: 2052.1.168.2.10.1.1
revision-id: mbp at sourcefrog.net-20070220044754-ptovhd212hs4vkkf
parent: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 15:47:54 +1100
message:
add bencode utility
------------------------------------------------------------
revno: 2052.1.168.2.18
revision-id: mbp at sourcefrog.net-20070215012807-d5ocuw66i5j8dclk
parent: mbp at sourcefrog.net-20070215012329-blt2xfhup97r6w8h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-15 12:28:07 +1100
message:
get repository formats from new location
------------------------------------------------------------
revno: 2052.1.168.2.17
revision-id: mbp at sourcefrog.net-20070215012329-blt2xfhup97r6w8h
parent: mbp at sourcefrog.net-20070213131837-7p45uhe445mwk4c4
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-15 12:23:29 +1100
message:
merge up from bzr.dev to get metadir changes
------------------------------------------------------------
revno: 2052.1.168.2.16
revision-id: mbp at sourcefrog.net-20070213131837-7p45uhe445mwk4c4
parent: mbp at sourcefrog.net-20070213130100-haw30ue83sibl2lt
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Wed 2007-02-14 00:18:37 +1100
message:
Make Branch._transport be the branch's control file transport
------------------------------------------------------------
revno: 2052.1.168.2.15
revision-id: mbp at sourcefrog.net-20070213130100-haw30ue83sibl2lt
parent: mbp at sourcefrog.net-20070213082041-8z35j43es3r16fzv
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Wed 2007-02-14 00:01:00 +1100
message:
Store tag dictionary in bencode and accomodate non-ascii tags
Add bencode in util
------------------------------------------------------------
revno: 2052.1.168.2.14
revision-id: mbp at sourcefrog.net-20070213082041-8z35j43es3r16fzv
parent: mbp at sourcefrog.net-20070213080651-ccfwj9hatjya3j19
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Tue 2007-02-13 19:20:41 +1100
message:
cleanup
------------------------------------------------------------
revno: 2052.1.168.2.13
revision-id: mbp at sourcefrog.net-20070213080651-ccfwj9hatjya3j19
parent: mbp at sourcefrog.net-20070212114643-14sr6fjvz3cx6omz
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Tue 2007-02-13 19:06:51 +1100
message:
reconnect and fix up lower-level tests for tags
------------------------------------------------------------
revno: 2052.1.168.2.12
revision-id: mbp at sourcefrog.net-20070212114643-14sr6fjvz3cx6omz
parent: mbp at sourcefrog.net-20070212110825-3plwqzl5vlhf417k
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Mon 2007-02-12 22:46:43 +1100
message:
BzrBranchExperimental can now act as its own format
------------------------------------------------------------
revno: 2052.1.168.2.11
revision-id: mbp at sourcefrog.net-20070212110825-3plwqzl5vlhf417k
parent: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Mon 2007-02-12 22:08:25 +1100
message:
Get tag tests working again, stored in the Branch
------------------------------------------------------------
revno: 2052.1.168.2.10
revision-id: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
parent: mbp at sourcefrog.net-20070124050955-q7fed1sy7ddc78ui
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-12 18:18:26 +1100
message:
(broken) start moving things to branches
------------------------------------------------------------
revno: 2052.1.168.2.9
revision-id: mbp at sourcefrog.net-20070124050955-q7fed1sy7ddc78ui
parent: mbp at sourcefrog.net-20070121124213-8ksq92nrm3tzn6s9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-01-24 16:09:55 +1100
message:
Add specific tests for push -d and pull -d
------------------------------------------------------------
revno: 2052.1.168.2.8
revision-id: mbp at sourcefrog.net-20070121124213-8ksq92nrm3tzn6s9
parent: mbp at sourcefrog.net-20070121085653-ptonrp6w7ini27un
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-21 23:42:13 +1100
message:
Add -d option to push, pull, merge commands.
Tags now propagate between repositories by commands that move history around:
branch, push, pull, merge.
Add Repository.supports_tags method.
All Repository tag methods now raise TagsNotSupported if they're not.
------------------------------------------------------------
revno: 2052.1.168.2.7
revision-id: mbp at sourcefrog.net-20070121085653-ptonrp6w7ini27un
parent: mbp at sourcefrog.net-20070119084751-zcoq7c4t7yockec1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-21 19:56:53 +1100
message:
Add Repository.copy_tags_to
------------------------------------------------------------
revno: 2052.1.168.2.6
revision-id: mbp at sourcefrog.net-20070119084751-zcoq7c4t7yockec1
parent: mbp at sourcefrog.net-20070119083251-tr6zsf024kckx3lb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:47:51 +1100
message:
Add tag -r option
------------------------------------------------------------
revno: 2052.1.168.2.5
revision-id: mbp at sourcefrog.net-20070119083251-tr6zsf024kckx3lb
parent: mbp at sourcefrog.net-20070119083142-s0ukxl1znp363xfr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:32:51 +1100
message:
Better TagsNotSupported message
------------------------------------------------------------
revno: 2052.1.168.2.4
revision-id: mbp at sourcefrog.net-20070119083142-s0ukxl1znp363xfr
parent: mbp at sourcefrog.net-20070119024650-o12ekgnjski2v3ed
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:31:42 +1100
message:
Repositories which don't support tags now give a better message
------------------------------------------------------------
revno: 2052.1.168.2.3
revision-id: mbp at sourcefrog.net-20070119024650-o12ekgnjski2v3ed
parent: mbp at sourcefrog.net-20070116132138-vhziz9hpfc8za0uj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 13:46:50 +1100
message:
Add tag: revision namespace.
Change make_tag to set_tag
Add Branch.lookup_tag (defers to Branch.lookup_tag) for simplicity of callers,
and possibly to help formats where it's better to look up by branch.
Factor out RevisionInfo.from_revision_id
Separate tag storage into a _TagStore strategy within the Repository,
so they can be reused across formats.
------------------------------------------------------------
revno: 2052.1.168.2.2
revision-id: mbp at sourcefrog.net-20070116132138-vhziz9hpfc8za0uj
parent: mbp at sourcefrog.net-20070114085612-q90lx2g0firzu7z9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-01-17 00:21:38 +1100
message:
Add tag command and basic implementation
------------------------------------------------------------
revno: 2052.1.168.2.1
revision-id: mbp at sourcefrog.net-20070114085612-q90lx2g0firzu7z9
parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-14 19:56:12 +1100
message:
Start adding space for tags stored in the repository
------------------------------------------------------------
revno: 2052.1.256
revision-id: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
parent: pqm at pqm.ubuntu.com-20070301033137-9b87fdf211dc2e15
parent: bialix at ukr.net-20070228183916-p1eorz33v4zxy27m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 06:53:57 +0000
message:
(bialix) win32: suppress IOError with errno=22 (Invalid argument)
when pipe is broken
------------------------------------------------------------
revno: 2052.1.252.2.1
revision-id: bialix at ukr.net-20070228183916-p1eorz33v4zxy27m
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: small.fixes
timestamp: Wed 2007-02-28 20:39:16 +0200
message:
Suppress IOError with errno=22 (Invalid argument) on win32 when pipe is broken
------------------------------------------------------------
revno: 2052.1.255
revision-id: pqm at pqm.ubuntu.com-20070301033137-9b87fdf211dc2e15
parent: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:31:37 +0000
message:
Fix #85305 by issuing an exception instead of a traceback.
------------------------------------------------------------
revno: 2052.1.242.3.3
revision-id: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
parent: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-02-28 22:08:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.242.3.2
revision-id: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
parent: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2007-02-28 16:40:44 -0500
message:
Remove trailing whitespace
------------------------------------------------------------
revno: 2052.1.242.3.1
revision-id: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.85305
timestamp: Sat 2007-02-17 21:31:03 +0100
message:
Fix #85305 by issuing an exception instead of a traceback.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__): Check https support.
* bzrlib/tests/test_http.py:
(TestWithTransport_pycurl): Moved higher for reuse.
(TestHttpTransportUrls): Separated from TestHttpUrls to be applied
to both implementations (pycurl and urllib).
(TestHttpUrls_urllib, TestHttpUrls_pycurl):
------------------------------------------------------------
revno: 2052.1.254
revision-id: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:19:00 +0000
message:
fix pull --overwrite, especially with bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.23
revision-id: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
parent: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-02-28 21:53:37 -0500
message:
Update test case per review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.22
revision-id: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
parent: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-02-28 16:32:55 -0500
message:
Fix pull --overwrite for bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21
revision-id: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-15 19:18:18 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.253
revision-id: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 21:10:48 +0000
message:
(James Westby) Allow passing a template message to commit.
------------------------------------------------------------
revno: 2052.1.252.1.1
revision-id: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-28 09:19:23 -0600
message:
[merge] James Westby allow passing a default message to commit
Also clean up NEWS a bit to reduce conflicts and conform to rST.
------------------------------------------------------------
revno: 2052.1.206.3.4
revision-id: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
parent: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-26 21:48:05 +0000
message:
Make the handling of the msgfile more sane.
* Close it in a finally block for more safety.
* Open it at the start and just write to it instead of building up the
message.
* Don't close the fileno from mkstemp, just convert it to a filehandle
straight away.
------------------------------------------------------------
revno: 2052.1.206.3.3
revision-id: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
parent: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-05 23:58:21 +0000
message:
Refactor again from John and Alexander's comments.
------------------------------------------------------------
revno: 2052.1.206.3.2
revision-id: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
parent: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sun 2007-02-04 21:58:50 +0000
message:
Allow an empty start message.
Following comments from Robert the start_message is now allowed to be empty.
The tests are also split out more.
------------------------------------------------------------
revno: 2052.1.206.3.1
revision-id: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sat 2007-02-03 13:58:27 +0000
message:
Add a way to specify a template commit message.
Add start_message to the edit_commit_message function. This adds the text
above the separator so that it will not be removed after the user has edited.
Allows a template commit message to be specified. It however does nothing to
make it easy to actually hook in and set that.
------------------------------------------------------------
revno: 2052.1.252
revision-id: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 06:56:54 +0000
message:
(biaklix) bzr init works with non-ascii location (#85599)
------------------------------------------------------------
revno: 2052.1.242.2.2
revision-id: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
parent: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Wed 2007-02-28 00:12:07 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.242.2.1
revision-id: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Sat 2007-02-17 09:11:47 +0200
message:
Bugfix #85599: ``bzr init`` works with unicode argument LOCATION
------------------------------------------------------------
revno: 2052.1.251
revision-id: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 22:08:46 +0000
message:
Capitalize rocks output
------------------------------------------------------------
revno: 2052.1.175.4.1
revision-id: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.78026
timestamp: Wed 2007-01-10 03:32:40 +0100
message:
Fix #78026.
------------------------------------------------------------
revno: 2052.1.250
revision-id: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: bialix at ukr.net-20070227065737-yoon57v79cgycto6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 21:01:31 +0000
message:
(bialix) Searching CA bundle for PyCurl in env variable, and on win32
along the path
------------------------------------------------------------
revno: 2052.1.246.5.3
revision-id: bialix at ukr.net-20070227065737-yoon57v79cgycto6
parent: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Tue 2007-02-27 08:57:37 +0200
message:
added comment about excluding cwd from PATH
------------------------------------------------------------
revno: 2052.1.246.5.2
revision-id: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
parent: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 22:28:08 +0200
message:
Don't look in cwd for CA bundle (note from John)
------------------------------------------------------------
revno: 2052.1.246.5.1
revision-id: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 12:02:58 +0200
message:
Bugfix #82086: Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE), and on win32 along the PATH
------------------------------------------------------------
revno: 2052.1.249
revision-id: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 04:07:24 +0000
message:
(andrew,r=mbp,r=john) bzr:// defaults to port 4155
------------------------------------------------------------
revno: 2052.1.246.4.3
revision-id: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
parent: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 13:20:50 +1100
message:
Use a BZR_DEFAULT_PORT constant instead of bare 4155.
------------------------------------------------------------
revno: 2052.1.246.4.2
revision-id: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
parent: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 11:42:47 +1100
message:
Add NEWS entry.
------------------------------------------------------------
revno: 2052.1.246.4.1
revision-id: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Mon 2007-02-26 20:20:26 +1100
message:
Give bzr:// a default port of 4155.
------------------------------------------------------------
revno: 2052.1.248
revision-id: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 20:16:22 +0000
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2052.1.246.2.1
revision-id: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-02-26 12:33:28 -0600
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2052.1.246.3.1
revision-id: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: jml at canonical.com
branch nick: bzr.plugin-path
timestamp: Fri 2007-02-23 17:06:54 +1100
message:
Make set_plugins_path search user-specified directories (BZR_PLUGIN_PATH
or get_default_plugin_path()) before searching in site-wide directories
(dirname(bzrlib.plugins.__file__)).
------------------------------------------------------------
revno: 2052.1.247
revision-id: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 08:52:24 +0000
message:
(mbp,r=aaron) tests for merge_modified
------------------------------------------------------------
revno: 2052.1.246.1.1
revision-id: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-02-26 15:40:16 +1100
message:
Add test for merge_modified
------------------------------------------------------------
revno: 2052.1.246
revision-id: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-22 14:45:05 +0000
message:
(John Arbash Meinel, r=robert) Update apis to expect UTF-8 file ids instead of Unicode
------------------------------------------------------------
revno: 2052.1.242.1.11
revision-id: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
parent: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Thu 2007-02-22 08:28:19 -0600
message:
Update NEWS to indicate file-ids are also utf-8 strings
------------------------------------------------------------
revno: 2052.1.242.1.10
revision-id: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
parent: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 18:22:24 -0600
message:
Switch all apis over to utf8 file ids. All tests pass
------------------------------------------------------------
revno: 2052.1.242.1.9
revision-id: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
parent: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:25:37 -0600
message:
Minor performance improvement, use None as signal rather than ROOT_ID
for xml5 inventories. Discover small bug in serialized text because of this.
------------------------------------------------------------
revno: 2052.1.242.1.8
revision-id: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
parent: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:12:26 -0600
message:
Fix one doc test in Inventory which expected a plain str
------------------------------------------------------------
revno: 2052.1.242.1.7
revision-id: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
parent: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:03:08 -0600
message:
Add tests for parent ids in test_test_trees
------------------------------------------------------------
revno: 2052.1.242.1.6
revision-id: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
parent: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:54:17 -0600
message:
Include parent_id checks in the xml serializer tests.
------------------------------------------------------------
revno: 2052.1.242.1.5
revision-id: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
parent: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:48:37 -0600
message:
Fix Inventory.iter_entries_by_dir to return Unicode paths,
update xml5 serializer tests to ensure that we get unicode paths and file ids
and utf8 revision ids.
------------------------------------------------------------
revno: 2052.1.242.1.4
revision-id: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
parent: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:17:22 -0600
message:
Add safe_file_id as a helper in osutils.
------------------------------------------------------------
revno: 2052.1.242.1.3
revision-id: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
parent: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:12:55 -0600
message:
Make sure the inventory enrtries returned are properly formed.
------------------------------------------------------------
revno: 2052.1.242.1.2
revision-id: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
parent: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 12:55:58 -0600
message:
Track down and add tests that all tree.commit() can handle
non-ascii revision ids, as well as that file_ids_affected_by can handle
non-ascii revision ids. Also track down pending-merges needing to
write byte streams rather than unicode.
------------------------------------------------------------
revno: 2052.1.242.1.1
revision-id: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 11:25:06 -0600
message:
Track down some non-ascii deficiencies in commit logic.
------------------------------------------------------------
revno: 2052.1.245
revision-id: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-21 20:08:18 +0000
message:
(mbp,r=robert,trivial) make status blackbox tests pass on wide terminals
------------------------------------------------------------
revno: 2052.1.244.1.1
revision-id: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-02-21 18:59:17 +1100
message:
Make tests for truncation of status output more robust on wide terminals.
(Relates to bug #56011)
------------------------------------------------------------
revno: 2052.1.244
revision-id: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-20 09:10:37 +0000
message:
(mbp,r=alexander) flush log before exiting
------------------------------------------------------------
revno: 2052.1.243.1.1
revision-id: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: osexit
timestamp: Tue 2007-02-20 18:16:27 +1100
message:
Flush trace file before doing os._exit.
------------------------------------------------------------
revno: 2052.1.243
revision-id: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-18 18:50:39 +0000
message:
(Matthias Rahlf, Alexander Belchenko) human readable error message
for 'bzr add .bzr/'
------------------------------------------------------------
revno: 2052.1.227.5.1
revision-id: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: add.dot.bzr
timestamp: Fri 2007-02-16 00:24:48 +0200
message:
Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).
Also slightly reworked test.
------------------------------------------------------------
revno: 2052.1.227.6.1
revision-id: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Matthias Rahlf <rahlf at fs.tum.de>
branch nick: bzr.dev.fastpath
timestamp: Tue 2007-02-13 04:16:37 +0100
message:
FastPath objects can now be printed nicely
------------------------------------------------------------
revno: 2052.1.242
revision-id: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-17 02:58:22 +0000
message:
(John Arbash Meinel) Clean up most internals to use utf-8 revision ids instead of Unicode.
------------------------------------------------------------
revno: 2052.1.197.5.20
revision-id: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
parent: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:36:32 -0600
message:
Add NEWS entry about utf8 revision ids.
------------------------------------------------------------
revno: 2052.1.197.5.19
revision-id: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
parent: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:33:45 -0600
message:
Track through the new Branch6 code, and make sure revision ids are utf8
------------------------------------------------------------
revno: 2052.1.197.5.18
revision-id: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
parent: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:02:41 -0600
message:
Add tests for iter_reverse_revision_history
------------------------------------------------------------
revno: 2052.1.197.5.17
revision-id: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
parent: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 19:42:57 -0600
message:
[merge] bzr.dev 2293 and resolve conflicts, but still broken
------------------------------------------------------------
revno: 2052.1.197.5.16
revision-id: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 14:33:57 -0600
message:
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()
------------------------------------------------------------
revno: 2052.1.197.5.15
revision-id: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 07:38:16 -0600
message:
remove get_cached_utf8 checks which were slowing things down.
------------------------------------------------------------
revno: 2052.1.197.5.14
revision-id: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
parent: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 11:02:18 -0600
message:
Add some tests that generate_ids.get_revision_id() generates ascii revision ids
------------------------------------------------------------
revno: 2052.1.197.5.13
revision-id: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
parent: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 10:54:29 -0600
message:
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
------------------------------------------------------------
revno: 2052.1.197.5.12
revision-id: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
parent: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 20:48:43 -0600
message:
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
Get tests to pass again.
------------------------------------------------------------
revno: 2052.1.197.5.11
revision-id: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
parent: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:39:24 -0600
message:
Audit Branch to ensure utf8 revision ids.
Requires a small update to lockable_files to allow us to directly
write byte strings, without needing to wrap in a StringIO
------------------------------------------------------------
revno: 2052.1.197.5.10
revision-id: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
parent: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:15:53 -0600
message:
Make sure xml5 can handle unicode or utf8 strings
------------------------------------------------------------
revno: 2052.1.197.5.9
revision-id: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
parent: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 12:11:44 -0600
message:
Update WorkingTree to use safe_revision_id when appropriate
------------------------------------------------------------
revno: 2052.1.197.5.8
revision-id: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
parent: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:50:18 -0600
message:
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
------------------------------------------------------------
revno: 2052.1.197.5.7
revision-id: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
parent: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:24:23 -0600
message:
Make sure WorkingTree revision_ids are also returned as utf8 strings
------------------------------------------------------------
revno: 2052.1.197.5.6
revision-id: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
parent: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:16:26 -0600
message:
Make sure Branch.revision_history() also works in utf-8 revision ids.
------------------------------------------------------------
revno: 2052.1.197.5.5
revision-id: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
parent: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:15:56 -0600
message:
better comment for why we are decoding
------------------------------------------------------------
revno: 2052.1.197.5.4
revision-id: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
parent: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:48:31 -0600
message:
When reading XML, always return utf-8 revision ids.
------------------------------------------------------------
revno: 2052.1.197.5.3
revision-id: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
parent: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:41:00 -0600
message:
Add get_cached_ascii for dealing with how cElementTree handles ascii strings
------------------------------------------------------------
revno: 2052.1.197.5.2
revision-id: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
parent: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 17:10:37 -0600
message:
Add a get_cached_utf8, which will ensure it is really utf8, and cache the strings
------------------------------------------------------------
revno: 2052.1.197.5.1
revision-id: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 15:52:53 -0600
message:
Leave revision-ids in utf-8 when reading.
------------------------------------------------------------
revno: 2052.1.241
revision-id: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-16 06:48:35 +0000
message:
(mbp,r=john,r=aaron) use os._exit from bzr script to quit faster and avoid thread kibble
------------------------------------------------------------
revno: 2052.1.236.1.3
revision-id: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
parent: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-02-16 17:06:14 +1100
message:
update copyright
------------------------------------------------------------
revno: 2052.1.236.1.2
revision-id: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
parent: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 21:09:53 +1100
message:
not necessary to explicitly flush stderr (spiv)
------------------------------------------------------------
revno: 2052.1.236.1.1
revision-id: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 17:15:43 +1100
message:
os._exit rather than sys.exit at top level
somewhat faster through avoiding shutdown
and avoids bg threads whining about modules going away
------------------------------------------------------------
revno: 2052.1.240
revision-id: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 18:14:16 +0000
message:
(John Arbash Meinel) make 'bzr remove-tree' a non-hidden command.
------------------------------------------------------------
revno: 2052.1.238.1.1
revision-id: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-02-15 12:01:21 -0600
message:
Promote 'remove-tree' to a public command.
------------------------------------------------------------
revno: 2052.1.239
revision-id: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 17:54:17 +0000
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.20
revision-id: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-15 11:00:31 -0500
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 2052.1.238
revision-id: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 15:11:31 +0000
message:
Provide new branch6 format
------------------------------------------------------------
revno: 2052.1.178.3.55
revision-id: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
parent: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Thu 2007-02-15 09:08:23 -0500
message:
Updates from review
------------------------------------------------------------
revno: 2052.1.178.3.54
revision-id: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
parent: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 15:28:01 -0500
message:
Move reverse history iteration to repository
------------------------------------------------------------
revno: 2052.1.178.3.53
revision-id: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
parent: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 14:34:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.178.3.52
revision-id: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
parent: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 14:20:49 -0500
message:
Remove metaweave test
------------------------------------------------------------
revno: 2052.1.178.3.51
revision-id: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
parent: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 13:22:19 -0500
message:
Store revno for Branch6, set_last_revision -> set_last_revision_info
------------------------------------------------------------
revno: 2052.1.178.3.50
revision-id: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
parent: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 13:16:33 -0500
message:
Fix broken error
------------------------------------------------------------
revno: 2052.1.178.3.49
revision-id: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
parent: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 10:09:06 -0500
message:
Fix cache updating
------------------------------------------------------------
revno: 2052.1.178.3.48
revision-id: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
parent: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 09:57:43 -0500
message:
Update blackbox test to handle new error message
------------------------------------------------------------
revno: 2052.1.178.3.47
revision-id: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
parent: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
parent: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 09:11:57 -0500
message:
Merge speedups
------------------------------------------------------------
revno: 2052.1.178.3.45.1.1
revision-id: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-02-14 08:01:43 -0500
message:
Get log as fast branch5
------------------------------------------------------------
revno: 2052.1.178.3.46
revision-id: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:34:57 -0500
message:
tweak config docs
------------------------------------------------------------
revno: 2052.1.178.3.45
revision-id: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
parent: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:29:10 -0500
message:
Change error message (mpool)
------------------------------------------------------------
revno: 2052.1.178.3.44
revision-id: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
parent: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:25:26 -0500
message:
Change asserts to specific errors for left-hand history violations
------------------------------------------------------------
revno: 2052.1.178.3.43
revision-id: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
parent: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 16:49:22 -0500
message:
Update docs
------------------------------------------------------------
revno: 2052.1.178.3.42
revision-id: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
parent: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 14:22:47 -0500
message:
add --append-revisions-only option to init
------------------------------------------------------------
revno: 2052.1.178.3.41
revision-id: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
parent: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 13:58:39 -0500
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.178.3.40
revision-id: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
parent: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 18:01:49 -0500
message:
Rename strict_revision_history to append_revisions_only
------------------------------------------------------------
revno: 2052.1.178.3.39
revision-id: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
parent: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 14:20:05 -0500
message:
Improve history violation message
------------------------------------------------------------
revno: 2052.1.178.3.38
revision-id: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
parent: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:41:48 -0500
message:
Update docs per Martin's suggestion
------------------------------------------------------------
revno: 2052.1.178.3.37
revision-id: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
parent: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:41:04 -0500
message:
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
------------------------------------------------------------
revno: 2052.1.178.3.36
revision-id: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
parent: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:09:25 -0500
message:
Refactor getting/setting locations with config
------------------------------------------------------------
revno: 2052.1.178.3.35
revision-id: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
parent: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:08:11 -0500
message:
Add documentation for synchonize_history
------------------------------------------------------------
revno: 2052.1.178.3.34
revision-id: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
parent: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:47:18 -0500
message:
cleanup
------------------------------------------------------------
revno: 2052.1.178.3.33
revision-id: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
parent: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:40:48 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.178.3.32
revision-id: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
parent: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:19:25 -0500
message:
Implement strict history policy
------------------------------------------------------------
revno: 2052.1.178.3.31
revision-id: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
parent: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 14:26:40 -0500
message:
Implement re-binding previously-bound branches
------------------------------------------------------------
revno: 2052.1.178.3.30
revision-id: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
parent: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 12:48:58 -0500
message:
Fix whitespace issues
------------------------------------------------------------
revno: 2052.1.178.3.29
revision-id: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
parent: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 17:59:51 -0500
message:
Implement conversion to branch 6
------------------------------------------------------------
revno: 2052.1.178.3.28
revision-id: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
parent: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 16:10:03 -0500
message:
Restore default formats
------------------------------------------------------------
revno: 2052.1.178.3.27
revision-id: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
parent: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:49:11 -0500
message:
Skip arbitrary revision-history test for Branch6
------------------------------------------------------------
revno: 2052.1.178.3.26
revision-id: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
parent: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:35:15 -0500
message:
Switch testament tests to knit2
------------------------------------------------------------
revno: 2052.1.178.3.25
revision-id: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
parent: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:32:25 -0500
message:
Use knit1 for experimental-branch6 repo
------------------------------------------------------------
revno: 2052.1.178.3.24
revision-id: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
parent: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:21:40 -0500
message:
Remove format-on-open code
------------------------------------------------------------
revno: 2052.1.178.3.23
revision-id: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
parent: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:05:02 -0500
message:
Make checkouts imitate parent format
------------------------------------------------------------
revno: 2052.1.178.3.22
revision-id: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
parent: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 14:38:38 -0500
message:
Make test suite use format registry default, not BzrDir default
------------------------------------------------------------
revno: 2052.1.178.3.21
revision-id: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
parent: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 22:02:24 -0500
message:
Set up format on BzrDir construction
------------------------------------------------------------
revno: 2052.1.178.3.20
revision-id: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
parent: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 21:28:19 -0500
message:
Add hooking for set_revision_history
------------------------------------------------------------
revno: 2052.1.178.3.19
revision-id: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
parent: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:37:19 -0500
message:
Fix testament tests
------------------------------------------------------------
revno: 2052.1.178.3.18
revision-id: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
parent: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:16:56 -0500
message:
Handle history sync as a special operation
------------------------------------------------------------
revno: 2052.1.178.3.17
revision-id: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
parent: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:15:10 -0500
message:
Set default serializer to 0.9
------------------------------------------------------------
revno: 2052.1.178.3.16
revision-id: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
parent: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Thu 2007-02-08 11:12:38 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.178.3.15
revision-id: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
parent: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-01-25 00:47:38 -0500
message:
assertDirectoriesEqual detects missing source, tests handle Branch6
------------------------------------------------------------
revno: 2052.1.178.3.14
revision-id: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
parent: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-01-17 21:16:44 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.178.3.13
revision-id: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
parent: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-01-17 20:58:39 -0500
message:
Fix most info tests (but some depend on odd cloning behavior)
------------------------------------------------------------
revno: 2052.1.178.3.12
revision-id: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
parent: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-01-17 15:02:45 -0500
message:
Clean up trailing whitespace
------------------------------------------------------------
revno: 2052.1.178.3.11
revision-id: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
parent: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:58:45 -0500
message:
Fix line endings
------------------------------------------------------------
revno: 2052.1.178.3.10
revision-id: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
parent: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:16:15 -0500
message:
Genericised test_fetch to handle branch 6 retrieval patterns
------------------------------------------------------------
revno: 2052.1.178.3.9
revision-id: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
parent: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:10:52 -0500
message:
Fix most fetch tests
------------------------------------------------------------
revno: 2052.1.178.3.8
revision-id: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
parent: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 09:26:41 -0500
message:
Abstract mechanism from policy getting/setting parents
------------------------------------------------------------
revno: 2052.1.178.3.7
revision-id: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
parent: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 09:05:41 -0500
message:
Fix binding return values
------------------------------------------------------------
revno: 2052.1.178.3.6
revision-id: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
parent: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Tue 2007-01-16 08:12:54 -0500
message:
work in progress bind stuff
------------------------------------------------------------
revno: 2052.1.178.3.5
revision-id: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
parent: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Tue 2007-01-16 07:59:40 -0500
message:
implement set_last revision and clone
------------------------------------------------------------
revno: 2052.1.178.3.4
revision-id: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
parent: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sat 2007-01-13 00:47:24 -0500
message:
Follow get_parent API more closely
------------------------------------------------------------
revno: 2052.1.178.3.3
revision-id: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
parent: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 16:39:24 -0500
message:
Add more config testing
------------------------------------------------------------
revno: 2052.1.178.3.2
revision-id: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
parent: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 14:49:57 -0500
message:
Get all branch tests passing
------------------------------------------------------------
revno: 2052.1.178.3.1
revision-id: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 13:18:41 -0500
message:
Get branch6 creation working
------------------------------------------------------------
revno: 2052.1.237
revision-id: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 12:40:16 +0000
message:
(bialix) custom reimplementation of abspath in Python for Windows
98 (#84278)
------------------------------------------------------------
revno: 2052.1.227.4.4
revision-id: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
parent: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 13:00:51 +0200
message:
merge bzr.dev; NEWS entry
------------------------------------------------------------
revno: 2052.1.227.4.3
revision-id: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:27:53 +0200
message:
win98_abspath: support for running in POSIX environment: cwd path has not drive letter
so we need to be careful about result of _win98_abspath('/path')
------------------------------------------------------------
revno: 2052.1.227.4.2
revision-id: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
parent: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:11:12 +0200
message:
Don't do normpath after abspath, because this function is called inside abspath
------------------------------------------------------------
revno: 2052.1.227.4.1
revision-id: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:09:00 +0200
message:
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
------------------------------------------------------------
revno: 2052.1.236
revision-id: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 02:37:51 +0000
message:
Generate iter_changes output from TreeTransform, use in merge, revert, etc.
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.13
revision-id: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
parent: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:57:40 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.12
revision-id: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:40:53 -0500
message:
Changes from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.11
revision-id: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
parent: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 12:09:47 -0500
message:
Get tests passing
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.10
revision-id: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
parent: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 11:26:22 -0500
message:
Add change reporting to pull
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.9
revision-id: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
parent: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:56:49 -0500
message:
Apply change reporting to merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.8
revision-id: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
parent: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:37:10 -0500
message:
Clarify what conflicts may not be present
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.7
revision-id: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
parent: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:28:12 -0500
message:
Stop modified flag bleeding into later changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.6
revision-id: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
parent: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:05:23 -0500
message:
Emit change listings before conflict warnings
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.5
revision-id: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
parent: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:02:23 -0500
message:
cleanup
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.4
revision-id: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
parent: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 09:10:35 -0500
message:
Sort output of Transform.iter_changes by path
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.3
revision-id: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
parent: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:42:45 -0500
message:
Use tree transform to emit upcoming change list
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.2
revision-id: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
parent: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:18:50 -0500
message:
Get kind change detection working for iter_changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.1
revision-id: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 15:07:37 -0500
message:
Initial work on converting TreeTransform to iter_changes format
------------------------------------------------------------
revno: 2052.1.235
revision-id: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 00:04:18 +0000
message:
(John Arbash Meinel, r=robert) Avoid an extra inventory deserialization during commit.
------------------------------------------------------------
revno: 2052.1.231.2.1
revision-id: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: avoid_extra_deserialization
timestamp: Tue 2007-02-13 16:33:16 -0600
message:
Avoid deserializing an inventory we have already parsed.
------------------------------------------------------------
revno: 2052.1.234
revision-id: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 09:51:20 +0000
message:
(mbp) add -d option to push, pull, merge (r=aaron)
------------------------------------------------------------
revno: 2052.1.227.3.1
revision-id: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: dashd
timestamp: Tue 2007-02-13 20:21:08 +1100
message:
Add a -d option to push, pull, merge (ported from tags branch)
------------------------------------------------------------
revno: 2052.1.233
revision-id: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 07:40:46 +0000
message:
(mbp,aaron) Change register_metadir to take fully-qualified repository class name.
------------------------------------------------------------
revno: 2052.1.189.1.21
revision-id: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-14 18:10:27 +1100
message:
Change register_metadir to take fully-qualified repository class name.
(Review suggestion from Aaron.)
------------------------------------------------------------
revno: 2052.1.232
revision-id: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
parent: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 18:02:51 +0000
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
------------------------------------------------------------
revno: 2052.1.231.1.1
revision-id: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-02-13 10:12:27 -0600
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
------------------------------------------------------------
revno: 2052.1.231
revision-id: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
parent: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 11:48:14 +0000
message:
(mbp) split repository formats into repofmt (r=john)
------------------------------------------------------------
revno: 2052.1.189.1.20
revision-id: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
parent: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 18:28:10 +1100
message:
update tests for new locations of weave repos
------------------------------------------------------------
revno: 2052.1.189.1.19
revision-id: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
parent: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 16:22:39 +1100
message:
(merge) trunk
------------------------------------------------------------
revno: 2052.1.189.1.18
revision-id: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
parent: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 12:47:25 +1100
message:
Restore use of deprecating delegator for old formats in bzrlib.repository.
------------------------------------------------------------
revno: 2052.1.189.1.17
revision-id: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
parent: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 18:14:48 +1100
message:
Restore old InterWeave tests
------------------------------------------------------------
revno: 2052.1.189.1.16
revision-id: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
parent: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:58:50 +1100
message:
Just import repository formats into repository.py, rather than using special delegate
------------------------------------------------------------
revno: 2052.1.189.1.15
revision-id: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
parent: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:35:46 +1100
message:
doc
------------------------------------------------------------
revno: 2052.1.189.1.14
revision-id: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
parent: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:12:14 +1100
message:
Add deprecated forwarders for old formats from repository.py
------------------------------------------------------------
revno: 2052.1.189.1.13
revision-id: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
parent: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 16:09:55 +1100
message:
Re-register InterWeaveRepo, fix test integration, add test for it
------------------------------------------------------------
revno: 2052.1.189.1.12
revision-id: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
parent: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 15:21:28 +1100
message:
Restore InterWeaveRepo
------------------------------------------------------------
revno: 2052.1.189.1.11
revision-id: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
parent: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 23:41:45 +1100
message:
Get rid of RepositoryFormat*_instance objects. Instead the format
registry can hold either format objects or factories that create them, and
its get() method calls that if needed.
------------------------------------------------------------
revno: 2052.1.189.1.10
revision-id: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
parent: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 23:09:41 +1100
message:
Remove more references to weaves from the repository.py file
------------------------------------------------------------
revno: 2052.1.189.1.9
revision-id: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
parent: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:25:59 +1100
message:
Clean up some imports
------------------------------------------------------------
revno: 2052.1.189.1.8
revision-id: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
parent: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:22:47 +1100
message:
Set the repository's serializer in the places it's needed, not in the base class
------------------------------------------------------------
revno: 2052.1.189.1.7
revision-id: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
parent: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:15:49 +1100
message:
rename method
------------------------------------------------------------
revno: 2052.1.189.1.6
revision-id: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
parent: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:11:31 +1100
message:
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
lazily load from the registry.
InterRepo._matching_repo_format is now a method not a class field so that
it can load repositories when we need them.
------------------------------------------------------------
revno: 2052.1.189.1.5
revision-id: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
parent: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Tue 2007-02-06 19:16:13 +1100
message:
Move KnitFormat2 into repofmt
------------------------------------------------------------
revno: 2052.1.189.1.4
revision-id: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
parent: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Tue 2007-02-06 17:27:24 +1100
message:
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
Change help for --format to just say 'see help formats'
RepositoryFormat.register_metadir gains an optional parameter for the
module name containing the repository format, and lazily loads from there.
Disable test_interrepository_get_returns_correct_optimiser, because it
seems too brittle.
Remove InterWeaveRepo, these should now just be upgraded.
------------------------------------------------------------
revno: 2052.1.230
revision-id: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
parent: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
parent: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 10:06:58 +0000
message:
(mbp,trivial) fix option display in shell-complete
------------------------------------------------------------
revno: 2052.1.227.2.1
revision-id: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: trivial
timestamp: Tue 2007-02-13 12:40:53 +1100
message:
(trivial) fix short_name() call in shellcomplete
(thanks to Matthias Ralf) #84826
------------------------------------------------------------
revno: 2052.1.229
revision-id: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
parent: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
parent: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 07:46:08 +0000
message:
(John Arbash Meinel) Fix pushing branches within the same repository by using a read lock on the source.
------------------------------------------------------------
revno: 2052.1.227.1.3
revision-id: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
parent: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:58:48 -0600
message:
Switch the test to being a branch_implementation test.
------------------------------------------------------------
revno: 2052.1.227.1.2
revision-id: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
parent: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:42:39 -0600
message:
Actually make the test a blackbox test.
------------------------------------------------------------
revno: 2052.1.227.1.1
revision-id: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:36:18 -0600
message:
Branch.push() only needs a read lock.
By avoiding a write lock, we avoid deadlock when pushing within
a single repository.
------------------------------------------------------------
revno: 2052.1.228
revision-id: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 04:04:13 +0000
message:
bzr log works in local treeless branches (#84247)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.19
revision-id: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
parent: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-02-12 10:57:20 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.18
revision-id: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
parent: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-09 13:23:21 -0500
message:
Log works in local treeless branches (#84247)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.17
revision-id: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-09 13:03:08 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.227
revision-id: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
parent: abentley at panoramicfeedback.com-20070209185525-r2vlzgnopveimb9r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-09 19:53:30 +0000
message:
Fix proxy authentication on urllib (Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.226.1.1
revision-id: abentley at panoramicfeedback.com-20070209185525-r2vlzgnopveimb9r
parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
parent: v.ladeuil+lp at free.fr-20070208170120-tfz2fd2fuv6dz5xg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2007-02-09 13:55:25 -0500
message:
Merge vincent's proxy auth fix
------------------------------------------------------------
revno: 2052.1.221.2.2
revision-id: v.ladeuil+lp at free.fr-20070208170120-tfz2fd2fuv6dz5xg
parent: v.ladeuil+lp at free.fr-20070208123313-22fcfuoj7g2j0x0o
committer: v.ladeuil+lp at free.fr
branch nick: bzr.83954
timestamp: Thu 2007-02-08 18:01:20 +0100
message:
Really fix bug #83954, with tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.set_proxy): Handle the empty password case. Fix the
header building which was broken by the way.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox): Add tests for http proxy authorization
header building.
------------------------------------------------------------
revno: 2052.1.221.2.1
revision-id: v.ladeuil+lp at free.fr-20070208123313-22fcfuoj7g2j0x0o
parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
committer: v.ladeuil+lp at free.fr
branch nick: bzr.83954
timestamp: Thu 2007-02-08 13:33:13 +0100
message:
Fix bug #83954.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.set_proxy): Fix untested typo. (Bug #83594).
* bzrlib/tests/test_http.py:
(TestProxyHttpServer): Add a FIXME to test proxy authorization
schemes once they become available in the test framework (already
in progress in another branch).
------------------------------------------------------------
revno: 2052.1.226
revision-id: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
parent: pqm at pqm.ubuntu.com-20070208230603-37e3c5049e8996f6
parent: john at arbash-meinel.com-20070208234024-w1s6kqucpdckj42i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-09 01:17:02 +0000
message:
(John Arbash Meinel) restrict GPGStrategy.sign() to 8-bit strings
------------------------------------------------------------
revno: 2052.1.221.1.2
revision-id: john at arbash-meinel.com-20070208234024-w1s6kqucpdckj42i
parent: john at arbash-meinel.com-20070208162805-dcqiqrwjh9a5lo7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gpg-8-bit-only
timestamp: Thu 2007-02-08 17:40:24 -0600
message:
Cleanup docstring for Aaron Bentley
------------------------------------------------------------
revno: 2052.1.221.1.1
revision-id: john at arbash-meinel.com-20070208162805-dcqiqrwjh9a5lo7n
parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gpg-8-bit-only
timestamp: Thu 2007-02-08 10:28:05 -0600
message:
``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
you pass a Unicode string rather than an 8-bit string. It doesn't
make sense to sign a Unicode string, and it turns out that some
versions of python will write out the raw Unicode bytes rather than
encoding automatically. So fail and make callers do the right thing.
------------------------------------------------------------
revno: 2052.1.225
revision-id: pqm at pqm.ubuntu.com-20070208230603-37e3c5049e8996f6
parent: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
parent: john at arbash-meinel.com-20070208215704-87s4qnsjfqi4x83w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 23:06:03 +0000
message:
(John Arbash Meinel) NEWS update (trivial)
------------------------------------------------------------
revno: 2052.1.195.2.3
revision-id: john at arbash-meinel.com-20070208215704-87s4qnsjfqi4x83w
parent: john at arbash-meinel.com-20070201154301-j901oexquy5ue4uj
parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
parent: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_no_pb
timestamp: Thu 2007-02-08 15:57:04 -0600
message:
[merge] bzr.dev 2276
------------------------------------------------------------
revno: 2052.1.195.2.2
revision-id: john at arbash-meinel.com-20070201154301-j901oexquy5ue4uj
parent: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_no_pb
timestamp: Thu 2007-02-01 09:43:01 -0600
message:
NEWS for minor speed improvement.
------------------------------------------------------------
revno: 2052.1.224
revision-id: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
parent: pqm at pqm.ubuntu.com-20070208101205-c9191b6c45c53f23
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 16:10:08 +0000
message:
Hide unknowns and inventory
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16
revision-id: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
parent: abentley at panoramicfeedback.com-20070208145838-flz9kmce6rwekxkg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-08 10:00:47 -0500
message:
update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.15
revision-id: abentley at panoramicfeedback.com-20070208145838-flz9kmce6rwekxkg
parent: abentley at panoramicfeedback.com-20070208145819-xqfhqmznhd6hh4ld
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-08 09:58:38 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.14
revision-id: abentley at panoramicfeedback.com-20070208145819-xqfhqmznhd6hh4ld
parent: abentley at panoramicfeedback.com-20070208143922-wy03itqs6qzqa3iq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-08 09:58:19 -0500
message:
Add some blank lines
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.13
revision-id: abentley at panoramicfeedback.com-20070208143922-wy03itqs6qzqa3iq
parent: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-08 09:39:22 -0500
message:
Hide 'unknowns', document alterntatives to hidden commands
------------------------------------------------------------
revno: 2052.1.223
revision-id: pqm at pqm.ubuntu.com-20070208101205-c9191b6c45c53f23
parent: pqm at pqm.ubuntu.com-20070208070647-fa39bee48393a769
parent: mbp at sourcefrog.net-20070208083326-a5kfavayeuks9ctb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 10:12:05 +0000
message:
(mbp) add lp: urls to plugin (r=john)
------------------------------------------------------------
revno: 2052.1.193.8.7
revision-id: mbp at sourcefrog.net-20070208083326-a5kfavayeuks9ctb
parent: mbp at sourcefrog.net-20070126044410-x7dnlcdjbitbb3c2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Thu 2007-02-08 19:33:26 +1100
message:
small review cleanups
------------------------------------------------------------
revno: 2052.1.193.8.6
revision-id: mbp at sourcefrog.net-20070126044410-x7dnlcdjbitbb3c2
parent: mbp at sourcefrog.net-20070126031150-80cjzqt6e3f64b2m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 15:44:10 +1100
message:
Documentation under 'help launchpad'
------------------------------------------------------------
revno: 2052.1.193.8.5
revision-id: mbp at sourcefrog.net-20070126031150-80cjzqt6e3f64b2m
parent: mbp at sourcefrog.net-20070126030508-s5im2cxv57xqk7pu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 14:11:50 +1100
message:
Add short-form lp:PRODUCT url form
------------------------------------------------------------
revno: 2052.1.193.8.4
revision-id: mbp at sourcefrog.net-20070126030508-s5im2cxv57xqk7pu
parent: mbp at sourcefrog.net-20070126012338-4de0rkq7p5diyv47
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 14:05:08 +1100
message:
lp:/// indirection works
------------------------------------------------------------
revno: 2052.1.193.8.3
revision-id: mbp at sourcefrog.net-20070126012338-4de0rkq7p5diyv47
parent: mbp at sourcefrog.net-20070126005547-fjzgd5vyw5tw38bd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 12:23:38 +1100
message:
Start adding indirection transport
------------------------------------------------------------
revno: 2052.1.193.8.2
revision-id: mbp at sourcefrog.net-20070126005547-fjzgd5vyw5tw38bd
parent: mbp at sourcefrog.net-20070126002801-uffztaglri8w29jl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 11:55:47 +1100
message:
doc
------------------------------------------------------------
revno: 2052.1.193.8.1
revision-id: mbp at sourcefrog.net-20070126002801-uffztaglri8w29jl
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 11:28:01 +1100
message:
Start adding tests for launchpad indirection
------------------------------------------------------------
revno: 2052.1.222
revision-id: pqm at pqm.ubuntu.com-20070208070647-fa39bee48393a769
parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
parent: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 07:06:47 +0000
message:
(robertc) 4 new branch hooks: post_push, post_pull, post_commit, post_uncommit, and fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
------------------------------------------------------------
revno: 2052.1.194.1.4
revision-id: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
parent: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hooks
timestamp: Wed 2007-02-07 10:53:30 +1100
message:
Merge HEAD.
------------------------------------------------------------
revno: 2052.1.194.1.3
revision-id: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
parent: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hooks
timestamp: Tue 2007-02-06 13:33:42 +1100
message:
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
complement the set_rh hook by allowing different actions, and awareness of
the prior state of the branch, for operations where this matters.
Fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
Add branch implementation tests for uncommit and commit.
(Robert Collins)
------------------------------------------------------------
revno: 2052.1.194.1.2
revision-id: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
parent: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hooks
timestamp: Tue 2007-02-06 04:52:21 +1100
message:
Update from HEAD.
------------------------------------------------------------
revno: 2052.1.194.1.1
revision-id: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hooks
timestamp: Wed 2007-01-31 10:13:33 +1100
message:
Merge splitting of branch.pull.
------------------------------------------------------------
revno: 2052.1.221
revision-id: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
parent: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
parent: john at arbash-meinel.com-20070207225138-tvv9jlug3ky1arbd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 03:10:33 +0000
message:
(James Westby, Aaron Bentley) Improve documentation for checkouts
------------------------------------------------------------
revno: 2052.1.218.1.2
revision-id: john at arbash-meinel.com-20070207225138-tvv9jlug3ky1arbd
parent: john at arbash-meinel.com-20070207223107-vv8o1g6bimqlvtv3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-07 16:51:38 -0600
message:
Tweak the help text for bind/unbind according to Robert's suggestions.
------------------------------------------------------------
revno: 2052.1.218.1.1
revision-id: john at arbash-meinel.com-20070207223107-vv8o1g6bimqlvtv3
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
parent: jw+debian at jameswestby.net-20070203093033-57ebkvaucudqrf1i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-07 16:31:07 -0600
message:
[merge] James Westby, Aaron Bentley 'bzr help checkouts'
------------------------------------------------------------
revno: 2052.1.193.7.2
revision-id: jw+debian at jameswestby.net-20070203093033-57ebkvaucudqrf1i
parent: jw+debian at jameswestby.net-20070202001610-rgff0g0w3my07ymj
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.helpcheckout
timestamp: Sat 2007-02-03 09:30:33 +0000
message:
Update the checkouts help topic with the comments from Aaron.
Add a NEWS entry for the change.
------------------------------------------------------------
revno: 2052.1.193.7.1
revision-id: jw+debian at jameswestby.net-20070202001610-rgff0g0w3my07ymj
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.helpcheckout
timestamp: Fri 2007-02-02 00:16:10 +0000
message:
Add a help topic describing checkouts and how they work.
It's meant to be an overview of what they are and what they might be useful
for, as well as a pointer to the commands that you need to manipulate them.
------------------------------------------------------------
revno: 2052.1.220
revision-id: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
parent: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
parent: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 23:06:59 +0000
message:
Use a Registry for merge-type options
------------------------------------------------------------
revno: 2052.1.169.4.17
revision-id: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
parent: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-02-07 11:10:56 -0500
message:
PEP8-ness
------------------------------------------------------------
revno: 2052.1.169.4.16
revision-id: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
parent: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-02-07 11:05:09 -0500
message:
Add tests for get_merge_type_registry
------------------------------------------------------------
revno: 2052.1.169.4.15
revision-id: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
parent: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-02-07 10:38:35 -0500
message:
Use RegistryOption for merge type
------------------------------------------------------------
revno: 2052.1.219
revision-id: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
parent: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 22:55:51 +0000
message:
(John Arbash Meinel) allow 'bzr push' to resume an interrupted push, and push into an existing directory (#30576, #45504)
------------------------------------------------------------
revno: 2052.1.175.3.5
revision-id: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
parent: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Wed 2007-02-07 13:33:40 -0600
message:
Update NEWS for fixing bugs #30576, #45504
------------------------------------------------------------
revno: 2052.1.175.3.4
revision-id: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
parent: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Wed 2007-02-07 13:31:55 -0600
message:
Switch back to --use-existing-dir
------------------------------------------------------------
revno: 2052.1.175.3.3
revision-id: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
parent: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Wed 2007-02-07 13:24:10 -0600
message:
[merge] bzr.dev 2270
------------------------------------------------------------
revno: 2052.1.175.3.2
revision-id: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
parent: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Wed 2007-02-07 13:09:54 -0600
message:
Fix error message as suggested by Martin.
------------------------------------------------------------
revno: 2052.1.175.3.1
revision-id: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Tue 2007-01-09 13:54:08 -0600
message:
Allow push to create Branch when necessary, and add --use-existing
------------------------------------------------------------
revno: 2052.1.218
revision-id: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
parent: pqm at pqm.ubuntu.com-20070207141218-c474ad3d5cf88311
parent: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 14:23:50 +0000
message:
Fix NEWS
------------------------------------------------------------
revno: 2052.1.169.4.14
revision-id: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
parent: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-02-07 09:03:01 -0500
message:
update
------------------------------------------------------------
revno: 2052.1.217
revision-id: pqm at pqm.ubuntu.com-20070207141218-c474ad3d5cf88311
parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
parent: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 14:12:18 +0000
message:
Turn log format into registry option, clean up registry options
------------------------------------------------------------
revno: 2052.1.169.4.13
revision-id: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
parent: aaron.bentley at utoronto.ca-20070207034037-sx1twhf86tvmfl5p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-02-07 08:59:03 -0500
message:
Add title to log format option section
------------------------------------------------------------
revno: 2052.1.169.4.12
revision-id: aaron.bentley at utoronto.ca-20070207034037-sx1twhf86tvmfl5p
parent: aaron.bentley at utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: registryoption
timestamp: Tue 2007-02-06 22:40:37 -0500
message:
Add option grouping to RegistryOption and clean up format options
------------------------------------------------------------
revno: 2052.1.169.4.11
revision-id: aaron.bentley at utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
parent: abentley at panoramicfeedback.com-20070117194323-xe0mbw9tlkl65enx
parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: registryoption
timestamp: Tue 2007-02-06 22:09:58 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.169.4.10
revision-id: abentley at panoramicfeedback.com-20070117194323-xe0mbw9tlkl65enx
parent: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-01-17 14:43:23 -0500
message:
Implement log options using RegistryOption
------------------------------------------------------------
revno: 2052.1.216
revision-id: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
parent: pqm at pqm.ubuntu.com-20070206193545-d5eac67ff047ce5c
parent: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-06 20:54:42 +0000
message:
Commit supports kind changes
------------------------------------------------------------
revno: 1959.4.6
revision-id: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
parent: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: typechange
timestamp: Tue 2007-02-06 10:32:30 -0500
message:
Ensure merge works across kind changes
------------------------------------------------------------
revno: 1959.4.5
revision-id: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
parent: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: typechange
timestamp: Tue 2007-02-06 09:58:04 -0500
message:
add NEWS entry
------------------------------------------------------------
revno: 1959.4.4
revision-id: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
parent: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: typechange
timestamp: Tue 2007-02-06 09:54:06 -0500
message:
Trim trailing whitespace
------------------------------------------------------------
revno: 1959.4.3
revision-id: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
parent: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
parent: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: typechange
timestamp: Tue 2007-02-06 09:52:16 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1959.4.2
revision-id: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
parent: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: typechange
timestamp: Thu 2006-09-28 09:48:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1959.4.1
revision-id: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: typechange
timestamp: Sat 2006-08-26 16:33:16 -0400
message:
Correctly handle all file kind changes
------------------------------------------------------------
revno: 2052.1.215
revision-id: pqm at pqm.ubuntu.com-20070206193545-d5eac67ff047ce5c
parent: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
parent: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-06 19:35:45 +0000
message:
Change status --short output to use ChangeReporter
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.12
revision-id: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
parent: abentley at panoramicfeedback.com-20070206160926-36crsd8hhr6724o8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-02-06 12:12:12 -0500
message:
Handle simultaneous creation+rename
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.11
revision-id: abentley at panoramicfeedback.com-20070206160926-36crsd8hhr6724o8
parent: abentley at panoramicfeedback.com-20070206155925-952ik6mflb0oz652
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-02-06 11:09:26 -0500
message:
Handle case where file-id only is added
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.10
revision-id: abentley at panoramicfeedback.com-20070206155925-952ik6mflb0oz652
parent: abentley at panoramicfeedback.com-20070206140232-gquogvtlahelx4ha
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-02-06 10:59:25 -0500
message:
Add help text
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.9
revision-id: abentley at panoramicfeedback.com-20070206140232-gquogvtlahelx4ha
parent: abentley at panoramicfeedback.com-20070205153447-fx4eq36mk9q4idue
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-02-06 09:02:32 -0500
message:
Add test cases for status with kind change
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.8
revision-id: abentley at panoramicfeedback.com-20070205153447-fx4eq36mk9q4idue
parent: abentley at panoramicfeedback.com-20070205152754-n4y80twdvl69eguj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-02-05 10:34:47 -0500
message:
Make ChangeReporter interface nicer
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.7
revision-id: abentley at panoramicfeedback.com-20070205152754-n4y80twdvl69eguj
parent: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-02-05 10:27:54 -0500
message:
Use new-style output for status
------------------------------------------------------------
revno: 2052.1.214
revision-id: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
parent: pqm at pqm.ubuntu.com-20070205073805-fe53a1d3e1184c95
parent: mbp at sourcefrog.net-20070205111322-cbd3yty86inw76ro
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-05 11:55:36 +0000
message:
(mbp) make TestSFTPInit.test_init_existing_branch less fragile with working directory name (trivial)
------------------------------------------------------------
revno: 2052.1.212.1.1
revision-id: mbp at sourcefrog.net-20070205111322-cbd3yty86inw76ro
parent: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-02-05 22:13:22 +1100
message:
make TestSFTPInit.test_init_existing_branch less fragile (jamesw)
------------------------------------------------------------
revno: 2052.1.213
revision-id: pqm at pqm.ubuntu.com-20070205073805-fe53a1d3e1184c95
parent: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
parent: bialix at ukr.net-20070205061738-t0pt6euik97cespt
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-05 07:38:05 +0000
message:
(bialix) Fix recursive upwalk for win32 UNC path (r=robert)
------------------------------------------------------------
revno: 2052.1.193.6.3
revision-id: bialix at ukr.net-20070205061738-t0pt6euik97cespt
parent: bialix at ukr.net-20070205051913-2yipyjathfr6638z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc.path
timestamp: Mon 2007-02-05 08:17:38 +0200
message:
EmulatedWin32LocalTransport should provide their own 'clone' method
------------------------------------------------------------
revno: 2052.1.193.6.2
revision-id: bialix at ukr.net-20070205051913-2yipyjathfr6638z
parent: bialix at ukr.net-20070128214332-wgvrj0xkb31ltfbc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc.path
timestamp: Mon 2007-02-05 07:19:13 +0200
message:
Fix name of emulated Win32LocalTransport as Robert suggested.
------------------------------------------------------------
revno: 2052.1.193.6.1
revision-id: bialix at ukr.net-20070128214332-wgvrj0xkb31ltfbc
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc.path
timestamp: Sun 2007-01-28 23:43:32 +0200
message:
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
------------------------------------------------------------
revno: 2052.1.212
revision-id: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
parent: pqm at pqm.ubuntu.com-20070204143007-ee1d0712bf5bccdf
parent: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 15:21:37 +0000
message:
Support kind changes in tree deltas
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.6
revision-id: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
parent: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-02 10:29:38 -0500
message:
Support kind changes in tree deltas
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.5
revision-id: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-02 08:52:02 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.211
revision-id: pqm at pqm.ubuntu.com-20070204143007-ee1d0712bf5bccdf
parent: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
parent: larstiq at larstiq.dyndns.org-20070204141152-h21zd23n0igf59ja
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 14:30:07 +0000
message:
(John Arbash Meinel) Don't create a progress bar for simple knit reading.
------------------------------------------------------------
revno: 2052.1.210.1.1
revision-id: larstiq at larstiq.dyndns.org-20070204141152-h21zd23n0igf59ja
parent: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
parent: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Sun 2007-02-04 15:11:52 +0100
message:
(John Arbash Meinel) Don't create a progress bar for simple knit reading.
------------------------------------------------------------
revno: 2052.1.195.2.1
revision-id: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_no_pb
timestamp: Wed 2007-01-31 12:58:10 -0600
message:
Don't create pb for simple knit reading.
------------------------------------------------------------
revno: 2052.1.210
revision-id: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
parent: larstiq at larstiq.dyndns.org-20070204124955-w2l163jtnw28i46n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 13:50:42 +0000
message:
Merge `bzr rm unversioned` fix. (Marius Kruger)
------------------------------------------------------------
revno: 2052.1.206.2.1
revision-id: larstiq at larstiq.dyndns.org-20070204124955-w2l163jtnw28i46n
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
parent: marius.kruger at enerweb.co.za-20070130155642-jrjusc3yj2rvqobi
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Sun 2007-02-04 13:49:55 +0100
message:
Merge `bzr rm unversioned` fix. (Marius Kruger)
------------------------------------------------------------
revno: 2052.1.193.5.1
revision-id: marius.kruger at enerweb.co.za-20070130155642-jrjusc3yj2rvqobi
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.rm_error_to_note
timestamp: Tue 2007-01-30 17:56:42 +0200
message:
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.
------------------------------------------------------------
revno: 2052.1.209
revision-id: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 12:47:41 +0000
message:
(robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
------------------------------------------------------------
revno: 2052.1.208.1.1
revision-id: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sun 2007-02-04 23:35:51 +1100
message:
(robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
------------------------------------------------------------
revno: 2052.1.206.1.2
revision-id: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
parent: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss.api.changes
timestamp: Sat 2007-02-03 21:56:04 +1100
message:
New version of gather_stats which gathers aggregate data too.
------------------------------------------------------------
revno: 2052.1.206.1.1
revision-id: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss.api.changes
timestamp: Sat 2007-02-03 21:02:11 +1100
message:
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
------------------------------------------------------------
revno: 2052.1.208
revision-id: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
parent: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-03 19:53:58 +0000
message:
(bialix) win32-related selftest fixes (r=john)
------------------------------------------------------------
revno: 2052.1.188.1.3
revision-id: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
parent: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sat 2007-02-03 09:36:05 +0200
message:
win32: skip tests that try to use funky chars in fileid in Weave-based repositories
------------------------------------------------------------
revno: 2052.1.188.1.2
revision-id: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
parent: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sun 2007-01-28 20:19:32 +0200
message:
test_contents_merge2: skip this test on win32
------------------------------------------------------------
revno: 2052.1.188.1.1
revision-id: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sun 2007-01-28 20:15:53 +0200
message:
test_external_diff_binary: run external diff with --binary flag
------------------------------------------------------------
revno: 2052.1.207
revision-id: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
parent: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-03 16:20:12 +0000
message:
(bialix) Support for Windows 98
------------------------------------------------------------
revno: 2052.1.193.4.11
revision-id: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
parent: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Sat 2007-02-03 17:02:06 +0200
message:
Small fixes after John's review; added NEWS entry
------------------------------------------------------------
revno: 2052.1.193.4.10
revision-id: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
parent: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Fri 2007-02-02 11:14:30 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.193.4.9
revision-id: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
parent: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Thu 2007-02-01 15:32:16 +0200
message:
Inno Setup script: using {cmd} macro instead of env varibale substitution (%COMSPEC%)
------------------------------------------------------------
revno: 2052.1.193.4.8
revision-id: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
parent: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-01-31 13:58:36 +0200
message:
bzr_postinstall.py: on win98 path added to autoexec.bat should have 8.3 form
------------------------------------------------------------
revno: 2052.1.193.4.7
revision-id: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
parent: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-01-31 01:05:35 +0200
message:
standalone installer: win98 support
------------------------------------------------------------
revno: 2052.1.193.4.6
revision-id: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
parent: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 17:18:52 +0200
message:
osutils.py: terminal_width() now use win32utils.get_console_size()
------------------------------------------------------------
revno: 2052.1.193.4.5
revision-id: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
parent: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:45:50 +0200
message:
bzr-win32-bdist-postinstall.py: good win98 support
------------------------------------------------------------
revno: 2052.1.193.4.4
revision-id: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
parent: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:13:18 +0200
message:
setup.py: fix plain 'python setup.py install' for win98
------------------------------------------------------------
revno: 2052.1.193.4.3
revision-id: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
parent: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:04:20 +0200
message:
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
------------------------------------------------------------
revno: 2052.1.193.4.2
revision-id: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
parent: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 12:51:38 +0200
message:
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log
It's also change default location of .bzr.log on Windows 2000/XP as well:
now it in user's My Documents folder, so it's much better
for users without administarator priveleges.
Also workaround win32-specific issue with file.tell().
------------------------------------------------------------
revno: 2052.1.193.4.1
revision-id: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 12:50:14 +0200
message:
win32utils: Windows-specific functions that use Win32 API via ctypes
------------------------------------------------------------
revno: 2052.1.206
revision-id: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 20:49:50 +0000
message:
(robertc) Merge support for import bzrlib.plugins.NAME.
------------------------------------------------------------
revno: 2052.1.205.1.1
revision-id: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2007-02-03 07:30:28 +1100
message:
(robertc) Merge support for import bzrlib.plugins.NAME.
------------------------------------------------------------
revno: 2052.1.204.2.3
revision-id: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
parent: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-import
timestamp: Sat 2007-02-03 07:27:53 +1100
message:
Review feedback.
------------------------------------------------------------
revno: 2052.1.204.2.2
revision-id: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
parent: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-hook
timestamp: Sat 2007-02-03 03:17:55 +1100
message:
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
yet been loaded by load_plugins(). This allows plugins to depend on each
other for code reuse without requiring users to perform file-renaming
gymnastics. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.204.2.1
revision-id: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-hook
timestamp: Fri 2007-02-02 21:48:06 +1100
message:
Cleanup commented out cruft in plugin tests.
------------------------------------------------------------
revno: 2052.1.205
revision-id: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 10:16:52 +0000
message:
(robertc) Merge new Branch.last_revision_info method.
------------------------------------------------------------
revno: 2052.1.204.1.1
revision-id: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2007-02-02 20:17:23 +1100
message:
(robertc) Merge new Branch.last_revision_info method.
------------------------------------------------------------
revno: 2052.1.197.4.2
revision-id: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
parent: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: tip.info
timestamp: Thu 2007-02-01 15:47:47 +0100
message:
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
(Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 2052.1.197.4.1
revision-id: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: tip.info
timestamp: Thu 2007-02-01 14:33:45 +0100
message:
New Branch.last_revision_info method, this is being done to allow
optimization of requests for both the number of revisions and the last
revision of a branch with smartservers and potentially future branch
formats. (Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 2052.1.204
revision-id: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 06:10:04 +0000
message:
remove default repository format, deprecate get_format_type
------------------------------------------------------------
revno: 2052.1.203.1.1
revision-id: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Thu 2007-02-01 23:32:56 -0500
message:
Merge my own bundle
------------------------------------------------------------
revno: 2052.1.152.4.13.1.5
revision-id: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
parent: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Fri 2007-01-26 17:15:58 -0500
message:
Remove RepositoryFormat.set_default_format, deprecate get_format_type
------------------------------------------------------------
revno: 2052.1.152.4.13.1.4
revision-id: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
parent: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Fri 2007-01-26 16:56:16 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.152.4.13.1.3
revision-id: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2007-01-17 17:14:20 -0500
message:
zap old repository default handling
------------------------------------------------------------
revno: 2052.1.203
revision-id: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
parent: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 23:59:51 +0000
message:
(John Arbash Meinel) Fix bug #82158: 'bzr annotate' should use dotted revnos from the Branch
------------------------------------------------------------
revno: 2052.1.193.3.3
revision-id: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
parent: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Thu 2007-02-01 15:29:19 -0600
message:
[merge] bzr.dev 2252
------------------------------------------------------------
revno: 2052.1.193.3.2
revision-id: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
parent: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Thu 2007-02-01 10:33:00 -0600
message:
Cleanup according to Wouter's suggestions.
------------------------------------------------------------
revno: 2052.1.193.3.1
revision-id: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Mon 2007-01-29 15:11:28 -0600
message:
bzr annotate should use Branch's dotted revnos.
Not the dotted revnos from the last modification of the file.
------------------------------------------------------------
revno: 2052.1.202
revision-id: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
parent: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
parent: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 23:48:08 +0000
message:
Display changes made by revert
------------------------------------------------------------
revno: 2052.1.173.1.6
revision-id: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
parent: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Thu 2007-02-01 15:36:13 -0500
message:
Update blackbox test
------------------------------------------------------------
revno: 2052.1.173.1.5
revision-id: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
parent: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Thu 2007-02-01 09:04:15 -0500
message:
Clean up whitespace changes
------------------------------------------------------------
revno: 2052.1.173.1.4
revision-id: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
parent: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:12:19 -0500
message:
PEP8 cleanup
------------------------------------------------------------
revno: 2052.1.173.1.3
revision-id: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
parent: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:09:31 -0500
message:
change method names to assertFoo
------------------------------------------------------------
revno: 2052.1.173.1.2
revision-id: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
parent: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:05:06 -0500
message:
Ensure that changes are detected correctly
------------------------------------------------------------
revno: 2052.1.173.1.1
revision-id: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 09:08:01 -0500
message:
Added revert change display, with tests
------------------------------------------------------------
revno: 2052.1.201
revision-id: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
parent: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 21:36:34 +0000
message:
(John Arbash Meinel) suggest using 'bzr pull' if merging into a branch with no commits.
------------------------------------------------------------
revno: 2052.1.197.3.1
revision-id: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-commits-errors
timestamp: Thu 2007-02-01 09:40:07 -0600
message:
Mention using 'bzr pull' if there are no commits in current branch
------------------------------------------------------------
revno: 2052.1.200
revision-id: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
parent: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
parent: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 20:36:41 +0000
message:
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
------------------------------------------------------------
revno: 2052.1.197.2.1
revision-id: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-02-01 08:49:53 -0600
message:
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
------------------------------------------------------------
revno: 2052.1.199
revision-id: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
parent: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 20:24:03 +0000
message:
Treat Permission Denied as a lock failure, not lock contention
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.4
revision-id: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
parent: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-01 09:59:04 -0500
message:
Update to skip on win32
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.3
revision-id: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-01-31 13:49:12 -0500
message:
Lock attempts don't treat permission problems as lock contention
------------------------------------------------------------
revno: 2052.1.198
revision-id: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 17:53:51 +0000
message:
(robertc) Split branch pushing out of branch pulling.
------------------------------------------------------------
revno: 2052.1.197.1.1
revision-id: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2007-02-02 04:18:42 +1100
message:
(robertc) Split branch pushing out of branch pulling.
------------------------------------------------------------
revno: 2052.1.193.2.3
revision-id: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
parent: robertc at robertcollins.net-20070130210611-6ogb9vztebubsqyx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: split-branch-pull
timestamp: Wed 2007-01-31 08:11:05 +1100
message:
Add a NEWS entry.
------------------------------------------------------------
revno: 2052.1.193.2.2
revision-id: robertc at robertcollins.net-20070130210611-6ogb9vztebubsqyx
parent: robertc at robertcollins.net-20070130205825-cagx4gvf17ioe2i5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: split-branch-pull
timestamp: Wed 2007-01-31 08:06:11 +1100
message:
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical.
------------------------------------------------------------
revno: 2052.1.193.2.1
revision-id: robertc at robertcollins.net-20070130205825-cagx4gvf17ioe2i5
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: split-branch-pull
timestamp: Wed 2007-01-31 07:58:25 +1100
message:
Split branch pushing out of branch pulling.
------------------------------------------------------------
revno: 2052.1.197
revision-id: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
parent: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 18:40:47 +0000
message:
(John Arbash Meinel) switch from looping over f.write() to f.writelines()
------------------------------------------------------------
revno: 2052.1.195.1.2
revision-id: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-01-31 11:48:55 -0600
message:
Switch from for line in foo: f.write(line) to f.writelines(foo)
------------------------------------------------------------
revno: 2052.1.196
revision-id: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 16:57:25 +0000
message:
fix --Derror => -Derror (trivial)
------------------------------------------------------------
revno: 2052.1.195.1.1
revision-id: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-01-31 10:33:48 -0600
message:
fix --Derror => -Derror (trivial)
------------------------------------------------------------
revno: 2052.1.195
revision-id: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 14:04:56 +0000
message:
Handle merge with dangling inventory entries
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.2
revision-id: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
parent: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-01-30 22:51:36 -0500
message:
Handle merge with dangling inventory entries
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.1
revision-id: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-01-30 21:04:21 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.194
revision-id: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
parent: robertc at robertcollins.net-20070130115230-2052dzn5xo9h6o07
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-30 21:12:30 +0000
message:
(robertc) Add Branch hooks faciity, allowing clean creation and management of hooks around branch API calls.
------------------------------------------------------------
revno: 2052.1.193.1.3
revision-id: robertc at robertcollins.net-20070130115230-2052dzn5xo9h6o07
parent: robertc at robertcollins.net-20070130104104-wsikhrgretspg86m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hook
timestamp: Tue 2007-01-30 22:52:30 +1100
message:
Add install_hook to the BranchHooks class as the official means for installing a hook.
------------------------------------------------------------
revno: 2052.1.193.1.2
revision-id: robertc at robertcollins.net-20070130104104-wsikhrgretspg86m
parent: robertc at robertcollins.net-20070129165849-409f5714fa7ebe48
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hook
timestamp: Tue 2007-01-30 21:41:04 +1100
message:
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
------------------------------------------------------------
revno: 2052.1.193.1.1
revision-id: robertc at robertcollins.net-20070129165849-409f5714fa7ebe48
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hook
timestamp: Tue 2007-01-30 03:58:49 +1100
message:
New Branch hooks facility, with one initial hook 'set_rh' which triggers
whenever the revision history is set. This allows triggering on e.g.
push, pull, commit, and so on. Developed for use with the branchrss
plugin. See bzrlib/tests/branch_implementations/test_hooks for more
details. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.193
revision-id: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
parent: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
parent: john at arbash-meinel.com-20070125155429-x53892xqx4r17l8h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-25 19:46:26 +0000
message:
(John Arbash Meinel) (r=Martin) Improve the read/write_lock decorators to create custom functions for better profiling and documentation.
------------------------------------------------------------
revno: 2052.1.178.2.6
revision-id: john at arbash-meinel.com-20070125155429-x53892xqx4r17l8h
parent: john at arbash-meinel.com-20070124204020-szyxbjpn9mzbsks7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Thu 2007-01-25 09:54:29 -0600
message:
Clean up the documentation and imports for decorators (per Martin's suggestions)
------------------------------------------------------------
revno: 2052.1.178.2.5
revision-id: john at arbash-meinel.com-20070124204020-szyxbjpn9mzbsks7
parent: john at arbash-meinel.com-20070124175950-jsf09jr7wq3u1neb
parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Wed 2007-01-24 14:40:20 -0600
message:
[merge] bzr.dev 2242
------------------------------------------------------------
revno: 2052.1.178.2.4
revision-id: john at arbash-meinel.com-20070124175950-jsf09jr7wq3u1neb
parent: john at arbash-meinel.com-20070124173401-dstdatq52iz8fi1m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Wed 2007-01-24 11:59:50 -0600
message:
Add tests that decorators generate useful wrappers.
------------------------------------------------------------
revno: 2052.1.178.2.3
revision-id: john at arbash-meinel.com-20070124173401-dstdatq52iz8fi1m
parent: john at arbash-meinel.com-20070112002700-uvutedw5kko38zsp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Wed 2007-01-24 11:34:01 -0600
message:
Add the ability to have fast decorators as well as pretty ones, and have 'bzr' select the right one at startup.
------------------------------------------------------------
revno: 2052.1.178.2.2
revision-id: john at arbash-meinel.com-20070112002700-uvutedw5kko38zsp
parent: john at arbash-meinel.com-20070111224224-kj9t3nmsmpphnp2e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Thu 2007-01-11 18:27:00 -0600
message:
Change decorators to define the same parameters as the wrapped func.
This should make it easier to use help(bzrlib.Branch.foo) since you see the
real parameters, rather than *args, **kwargs.
------------------------------------------------------------
revno: 2052.1.178.2.1
revision-id: john at arbash-meinel.com-20070111224224-kj9t3nmsmpphnp2e
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: decorators
timestamp: Thu 2007-01-11 16:42:24 -0600
message:
Change the read_lock and write_lock decorators to use custom names
------------------------------------------------------------
revno: 2052.1.192
revision-id: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
parent: pqm at pqm.ubuntu.com-20070124225848-73ee49f6aeb7ea18
parent: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-25 05:18:17 +0000
message:
(mbp) Change RepositoryFormat to use a registry (r=john)
------------------------------------------------------------
revno: 2052.1.189.1.3
revision-id: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
parent: mbp at sourcefrog.net-20070124112017-mp52x60whw4llr43
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Thu 2007-01-25 11:35:22 +1100
message:
Remove Registry.itervalues (comment from john)
------------------------------------------------------------
revno: 2052.1.189.1.2
revision-id: mbp at sourcefrog.net-20070124112017-mp52x60whw4llr43
parent: mbp at sourcefrog.net-20070124071209-yqiths20n6wxqaqr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-01-24 22:20:17 +1100
message:
change to using external Repository format registry
------------------------------------------------------------
revno: 2052.1.189.1.1
revision-id: mbp at sourcefrog.net-20070124071209-yqiths20n6wxqaqr
parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-01-24 18:12:09 +1100
message:
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
------------------------------------------------------------
revno: 2052.1.191
revision-id: pqm at pqm.ubuntu.com-20070124225848-73ee49f6aeb7ea18
parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
parent: bialix at ukr.net-20070124194226-rl1rlatr3jc5cvhh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-24 22:58:48 +0000
message:
merge from bzr.0.14 branch
------------------------------------------------------------
revno: 2052.1.190.1.1
revision-id: bialix at ukr.net-20070124194226-rl1rlatr3jc5cvhh
parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
parent: pqm at pqm.ubuntu.com-20070118233247-d98daa44090c3cc9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr.dev.plus.0.14
timestamp: Wed 2007-01-24 21:42:26 +0200
message:
merge latest fixes from bzr.0.14
------------------------------------------------------------
revno: 2052.1.182.2.5
revision-id: pqm at pqm.ubuntu.com-20070118233247-d98daa44090c3cc9
parent: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
parent: larstiq at larstiq.dyndns.org-20070118232016-7xx7u7w3tile8m6x
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.14
timestamp: Thu 2007-01-18 23:32:47 +0000
message:
(James Westby) Handle bzr residing in a non-workingtree nested in a repository (#77306)
------------------------------------------------------------
revno: 2052.1.182.2.4.1.1
revision-id: larstiq at larstiq.dyndns.org-20070118232016-7xx7u7w3tile8m6x
parent: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Fri 2007-01-19 00:20:16 +0100
message:
(James Westby) Handle bzr residing in a non-workingtree nested in a repository (#77306)
------------------------------------------------------------
revno: 2052.1.182.2.4
revision-id: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
parent: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
parent: larstiq at larstiq.dyndns.org-20070118202912-g3fi76wqbxr582q2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.14
timestamp: Thu 2007-01-18 22:17:22 +0000
message:
(Aaron Bentley) Document global options
------------------------------------------------------------
revno: 2052.1.182.2.3.1.1
revision-id: larstiq at larstiq.dyndns.org-20070118202912-g3fi76wqbxr582q2
parent: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
parent: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Thu 2007-01-18 21:29:12 +0100
message:
(Aaron Bentley) Document global options
------------------------------------------------------------
revno: 2052.1.182.2.3
revision-id: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
parent: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
parent: larstiq at larstiq.dyndns.org-20070118183721-78uzxifyyyoqxja9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.14
timestamp: Thu 2007-01-18 19:05:07 +0000
message:
(Wouter van Heyst) Update mailing list address.
------------------------------------------------------------
revno: 2052.1.182.2.2.1.2
revision-id: larstiq at larstiq.dyndns.org-20070118183721-78uzxifyyyoqxja9
parent: larstiq at larstiq.dyndns.org-20070118182201-g9fuw9pr294wejas
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Thu 2007-01-18 19:37:21 +0100
message:
(Alexander Belchenko) add windows installer check for python2.5
------------------------------------------------------------
revno: 2052.1.182.2.2.1.1
revision-id: larstiq at larstiq.dyndns.org-20070118182201-g9fuw9pr294wejas
parent: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Thu 2007-01-18 19:22:01 +0100
message:
Update the mailing list address.
------------------------------------------------------------
revno: 2052.1.182.2.2
revision-id: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
parent: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
parent: larstiq at larstiq.dyndns.org-20070118162615-gq7v7gpkhhprg6ah
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.14
timestamp: Thu 2007-01-18 17:18:06 +0000
message:
(John Arbash Meinel) Fix selftest for installed bzr (#80330)
------------------------------------------------------------
revno: 2052.1.182.2.1.1.1
revision-id: larstiq at larstiq.dyndns.org-20070118162615-gq7v7gpkhhprg6ah
parent: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
parent: juju at arbash-meinel.com-20070118144908-872rgajafdmzjpm7
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Thu 2007-01-18 17:26:15 +0100
message:
(John Arbash Meinel) Fix selftest for installed bzr (#80330)
------------------------------------------------------------
revno: 2052.1.177.1.2
revision-id: juju at arbash-meinel.com-20070118144908-872rgajafdmzjpm7
parent: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
committer: جاون عرباش ماينل <juju at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-01-18 08:49:08 -0600
message:
Allow tests to skip after installation, since certain packages will not be available.
------------------------------------------------------------
revno: 2052.1.182.2.1
revision-id: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
parent: larstiq at larstiq.dyndns.org-20070116152827-m5as55u075hv4z5m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.14
timestamp: Tue 2007-01-16 15:46:06 +0000
message:
(Wouter van Heyst) Release 0.14rc1
------------------------------------------------------------
revno: 2052.1.182.3.1
revision-id: larstiq at larstiq.dyndns.org-20070116152827-m5as55u075hv4z5m
parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.0.14
timestamp: Tue 2007-01-16 16:28:27 +0100
message:
Release 0.14rc1
------------------------------------------------------------
revno: 2052.1.190
revision-id: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
parent: bialix at ukr.net-20070124130332-ane2eqz3eqrtm9u1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-24 17:06:02 +0000
message:
(bialix) 'bzr missing' show remembered location unescaped,and show
file URL as filepath not a URL.
------------------------------------------------------------
revno: 2052.1.141.4.3
revision-id: bialix at ukr.net-20070124130332-ane2eqz3eqrtm9u1
parent: bialix at ukr.net-20070124104508-mwiux3wozhk8939k
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: miss.last-file-location
timestamp: Wed 2007-01-24 15:03:32 +0200
message:
Use new API for testing
------------------------------------------------------------
revno: 2052.1.141.4.2
revision-id: bialix at ukr.net-20070124104508-mwiux3wozhk8939k
parent: bialix at ukr.net-20061218122151-mzm4bgx34y0qetpx
parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: miss.last-file-location
timestamp: Wed 2007-01-24 12:45:08 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.141.4.1
revision-id: bialix at ukr.net-20061218122151-mzm4bgx34y0qetpx
parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: miss.last-file-location
timestamp: Mon 2006-12-18 14:21:51 +0200
message:
'bzr missing' without specifying location show remembered location unescaped
and show file URL as filepath not a URL.
------------------------------------------------------------
revno: 2052.1.189
revision-id: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
parent: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-01-20 02:01:04 +0000
message:
mv can also work on just inventory entry (Eichenberg, Kruger)
------------------------------------------------------------
revno: 2052.1.168.1.14
revision-id: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
parent: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-01-19 20:44:46 -0500
message:
Cleanup formatting and error handling
------------------------------------------------------------
revno: 2052.1.168.1.13
revision-id: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
parent: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 21:42:19 +0200
message:
Remove assertNone
------------------------------------------------------------
revno: 2052.1.168.1.12
revision-id: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
parent: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 21:23:53 +0200
message:
* Fix errors.py import order
* Atemt to handle exceptions better in WorkingTree._move
------------------------------------------------------------
revno: 2052.1.168.1.11
revision-id: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
parent: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 11:47:38 +0200
message:
* bzrlib/errors.py
Changed "FilesExist" to more specific "RenameFailedFilesExist"
------------------------------------------------------------
revno: 2052.1.168.1.10
revision-id: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
parent: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-18 06:11:51 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.168.1.9
revision-id: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
parent: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move2
timestamp: Thu 2007-01-11 20:02:03 +0200
message:
Remove all trailing white space this bundle would have
added. Fix wrong Bazaar version reference.
------------------------------------------------------------
revno: 2052.1.168.1.8
revision-id: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
parent: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move2
timestamp: Thu 2007-01-11 19:35:32 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.168.1.7
revision-id: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
parent: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 18:55:31 +0200
message:
update NEWS
------------------------------------------------------------
revno: 2052.1.168.1.6
revision-id: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
parent: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 14:44:17 +0200
message:
* change error message telling user about --after option sightly
* change long line to rather use temp variable
* change expected version this will be introduced to 0.15
* remove comma again
* remove comment which we don't understand
------------------------------------------------------------
revno: 2052.1.168.1.5
revision-id: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
parent: amanic at gmail.com-20070111061415-waq22luaja5czdry
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 08:20:48 +0200
message:
* bzrlib/tests/blackbox/test_mv.py
- add utility methods and use them where appropriate:
assertInWorkingTree, assertNotInWorkingTree and assertMoved
- fix each doc string to have a one-liner and a longer description
- remove commits
- update tests to follow the use case being tested more closely.
------------------------------------------------------------
revno: 2052.1.168.1.4
revision-id: amanic at gmail.com-20070111061415-waq22luaja5czdry
parent: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 08:14:15 +0200
message:
* bzrlib/tests/__init__
- add utility assert methods: assertNone and assertNotNone
- failUnlessExists and failIfExists give beter messages when failing
------------------------------------------------------------
revno: 2052.1.168.1.3
revision-id: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
parent: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-04 05:39:37 +0200
message:
* errors.py
- fix copy paste err.
- make DirectoryNotEmpty constructor parameters optional.
------------------------------------------------------------
revno: 2052.1.168.1.2
revision-id: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
parent: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Wed 2007-01-03 08:22:31 +0200
message:
Undo accidental changes: some files were made executable.
------------------------------------------------------------
revno: 2052.1.168.1.1
revision-id: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
parent: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Wed 2007-01-03 08:14:43 +0200
message:
merge enhancedmv3.patch with bzr.dev
------------------------------------------------------------
revno: 2052.1.154.1.10
revision-id: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
parent: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 20:40:22 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.154.1.9
revision-id: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
parent: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 20:22:50 +0200
message:
* Change move/rename errors yet again
- added new exception classes BzrMoveFailedError and BzrRenameFailedError
- convert the move/rename methods to raise these new exceptions,
and pass more specefic exceptions as extra.
------------------------------------------------------------
revno: 2052.1.154.1.8
revision-id: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
parent: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 18:49:38 +0200
message:
Converted move/rename error messages to show source => target.
------------------------------------------------------------
revno: 2052.1.154.1.7
revision-id: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
parent: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 08:04:04 +0200
message:
* errors
- change comments to doc-strings
- Make FilesExist handle plurals properly for 1 or more files
- change contextInfo to context_info
* test_mv
- apply error message suggestions
* workingtree
- remov old style error imports
- fix some long lines
------------------------------------------------------------
revno: 2052.1.154.1.6
revision-id: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
parent: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
parent: pqm at pqm.ubuntu.com-20061221163807-07adb2b67c60b6e6
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 21:15:35 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.154.1.5
revision-id: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
parent: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 21:14:35 +0200
message:
* errors
- Add AlreadyVersionedError
- Fix type
- Add 'extra' capability to PathsDoNotExist.
* update test_mv
* workingtre
- Convert more BzrErrors to mores specialised ones.
------------------------------------------------------------
revno: 2052.1.154.1.4
revision-id: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
parent: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 20:07:52 +0200
message:
Improved WorkingTree.move excptions. (as requested)
------------------------------------------------------------
revno: 2052.1.154.1.3
revision-id: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
parent: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 19:13:44 +0200
message:
* workingtree
- Removed redundant setter method.
- Improved capitalization, and punctuation (as requested).
------------------------------------------------------------
revno: 2052.1.154.1.2
revision-id: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
parent: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 18:36:59 +0200
message:
* Made whitespace and puntuation improvements, as requested.
* Improved NotVersionedError in order to show context
* Updated test_mv to pass again after changes
* Use proper exception when move destination is invalid.
------------------------------------------------------------
revno: 2052.1.154.1.1
revision-id: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
parent: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 07:11:49 +0200
message:
merge initial enhancedmv.patch
------------------------------------------------------------
revno: 2052.1.71.3.10
revision-id: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
parent: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:53:56 +0100
message:
merged main development branch
------------------------------------------------------------
revno: 2052.1.71.3.9
revision-id: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
parent: scameronde at googlemail.com-20061113084654-f6b185863d289320
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:47:37 +0100
message:
added tests for deprecated API workingtree.move
------------------------------------------------------------
revno: 2052.1.71.3.8
revision-id: scameronde at googlemail.com-20061113084654-f6b185863d289320
parent: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:46:54 +0100
message:
new parameter to_dir must be a named parameter
------------------------------------------------------------
revno: 2052.1.71.3.7
revision-id: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
parent: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:47:10 +0100
message:
split tests so that each new method contains one test only
------------------------------------------------------------
revno: 2052.1.71.3.6
revision-id: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
parent: scameronde at googlemail.com-20061108154558-21af1c09054ba825
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:46:17 +0100
message:
unified error messages
------------------------------------------------------------
revno: 2052.1.71.3.5
revision-id: scameronde at googlemail.com-20061108154558-21af1c09054ba825
parent: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:45:58 +0100
message:
specifying named parameters
------------------------------------------------------------
revno: 2052.1.71.3.4
revision-id: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
parent: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 17:28:12 +0100
message:
a few new blackbox test for mv
------------------------------------------------------------
revno: 2052.1.71.3.3
revision-id: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
parent: scameronde at googlemail.com-20061107150900-80887acd23f7b691
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 17:27:03 +0100
message:
fixed wrong formatting of error text
------------------------------------------------------------
revno: 2052.1.71.3.2
revision-id: scameronde at googlemail.com-20061107150900-80887acd23f7b691
parent: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 16:09:00 +0100
message:
fixed the most obvious bugs
------------------------------------------------------------
revno: 2052.1.71.3.1
revision-id: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 15:46:52 +0100
message:
the mv command is now able to move files that have already been moved on the file system
------------------------------------------------------------
revno: 2052.1.188
revision-id: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
parent: pqm at pqm.ubuntu.com-20070117172114-dc75493dad46088c
parent: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 18:41:07 +0000
message:
Add RegistryOption, use for directory format
------------------------------------------------------------
revno: 2052.1.169.4.9
revision-id: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
parent: abentley at panoramicfeedback.com-20070117161350-z0poe4762mzt2mlb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-01-17 11:32:40 -0500
message:
Zap trailing whitespace
------------------------------------------------------------
revno: 2052.1.169.4.8
revision-id: abentley at panoramicfeedback.com-20070117161350-z0poe4762mzt2mlb
parent: abentley at panoramicfeedback.com-20070109151918-cs36mdp2wrjnn3ax
parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Wed 2007-01-17 11:13:50 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.169.4.7
revision-id: abentley at panoramicfeedback.com-20070109151918-cs36mdp2wrjnn3ax
parent: abentley at panoramicfeedback.com-20070109151248-nmc1xu326dp8g3u4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Tue 2007-01-09 10:19:18 -0500
message:
Add suggestion to HACKING
------------------------------------------------------------
revno: 2052.1.169.4.6
revision-id: abentley at panoramicfeedback.com-20070109151248-nmc1xu326dp8g3u4
parent: abentley at panoramicfeedback.com-20070105231534-t9q8x3c9es2atc00
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Tue 2007-01-09 10:12:48 -0500
message:
Improve text and naming
------------------------------------------------------------
revno: 2052.1.169.4.5
revision-id: abentley at panoramicfeedback.com-20070105231534-t9q8x3c9es2atc00
parent: abentley at panoramicfeedback.com-20070105225002-cy0t8kpee9gg6svx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Fri 2007-01-05 18:15:34 -0500
message:
Switch to RegistryOption for upgrade and init-repository
------------------------------------------------------------
revno: 2052.1.169.4.4
revision-id: abentley at panoramicfeedback.com-20070105225002-cy0t8kpee9gg6svx
parent: abentley at panoramicfeedback.com-20070105221746-wgea5m9nebj16rmo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Fri 2007-01-05 17:50:02 -0500
message:
Fix iter_switches behavior when value_switches is true
------------------------------------------------------------
revno: 2052.1.169.4.3
revision-id: abentley at panoramicfeedback.com-20070105221746-wgea5m9nebj16rmo
parent: abentley at panoramicfeedback.com-20070105215821-nur051ztenymnrrr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Fri 2007-01-05 17:17:46 -0500
message:
Add docstrings
------------------------------------------------------------
revno: 2052.1.169.4.2
revision-id: abentley at panoramicfeedback.com-20070105215821-nur051ztenymnrrr
parent: abentley at panoramicfeedback.com-20070105212429-t77373aek2v2nuvh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Fri 2007-01-05 16:58:21 -0500
message:
Implement RegistryOption on init
------------------------------------------------------------
revno: 2052.1.169.4.1
revision-id: abentley at panoramicfeedback.com-20070105212429-t77373aek2v2nuvh
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: registryoption
timestamp: Fri 2007-01-05 16:24:29 -0500
message:
Get registry options working
------------------------------------------------------------
revno: 2052.1.187
revision-id: pqm at pqm.ubuntu.com-20070117172114-dc75493dad46088c
parent: pqm at pqm.ubuntu.com-20070117162220-c8e98cc6eec6ed27
parent: abentley at panoramicfeedback.com-20070117154008-rhepzwccochg3mmh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 17:21:14 +0000
message:
Ensure reserved ids are never stored
------------------------------------------------------------
revno: 2052.1.177.2.5
revision-id: abentley at panoramicfeedback.com-20070117154008-rhepzwccochg3mmh
parent: abentley at panoramicfeedback.com-20070117153921-6pp9ssa2r8n5izoo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: reserved-ids
timestamp: Wed 2007-01-17 10:40:08 -0500
message:
Move NEWS to appropriate section
------------------------------------------------------------
revno: 2052.1.177.2.4
revision-id: abentley at panoramicfeedback.com-20070117153921-6pp9ssa2r8n5izoo
parent: abentley at panoramicfeedback.com-20070117153708-4jni0ycaitv7xgra
parent: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: reserved-ids
timestamp: Wed 2007-01-17 10:39:21 -0500
message:
Merge bzr.ab, to avoid conflicts submitting
------------------------------------------------------------
revno: 2052.1.177.2.3
revision-id: abentley at panoramicfeedback.com-20070117153708-4jni0ycaitv7xgra
parent: abentley at panoramicfeedback.com-20070111175909-40z7nyaogn9rs6gr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: reserved-ids
timestamp: Wed 2007-01-17 10:37:08 -0500
message:
change reserved_id to is_reserved_id, add check_not_reserved for DRY
------------------------------------------------------------
revno: 2052.1.177.2.2
revision-id: abentley at panoramicfeedback.com-20070111175909-40z7nyaogn9rs6gr
parent: abentley at panoramicfeedback.com-20070111172025-8rnvvm3jqx7h5uvv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: reserved-ids
timestamp: Thu 2007-01-11 12:59:09 -0500
message:
Update docs
------------------------------------------------------------
revno: 2052.1.177.2.1
revision-id: abentley at panoramicfeedback.com-20070111172025-8rnvvm3jqx7h5uvv
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: reserved-ids
timestamp: Thu 2007-01-11 12:20:25 -0500
message:
Reject reserved ids in versiondfile, tree, branch and repository
------------------------------------------------------------
revno: 2052.1.186
revision-id: pqm at pqm.ubuntu.com-20070117162220-c8e98cc6eec6ed27
parent: pqm at pqm.ubuntu.com-20070117161135-075d32222962c3eb
parent: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 16:22:20 +0000
message:
Document global options
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.35
revision-id: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
parent: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
parent: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-01-17 09:48:46 -0500
message:
Merge the ls changes, so I don't get conflicts submitting this
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.34
revision-id: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
parent: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-01-17 09:46:47 -0500
message:
Fix NEWS and whitespace
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.33
revision-id: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
parent: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-01-17 09:44:03 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.32
revision-id: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-01-15 10:06:38 -0500
message:
Add global option help
------------------------------------------------------------
revno: 2052.1.185
revision-id: pqm at pqm.ubuntu.com-20070117161135-075d32222962c3eb
parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
parent: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 16:11:35 +0000
message:
ls supports treeless branches and remote branches
------------------------------------------------------------
revno: 2052.1.163.3.8
revision-id: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
parent: abentley at panoramicfeedback.com-20070117143649-8fb6gmn8l2kksdh5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Wed 2007-01-17 09:38:54 -0500
message:
Add NEWS entry
------------------------------------------------------------
revno: 2052.1.163.3.7
revision-id: abentley at panoramicfeedback.com-20070117143649-8fb6gmn8l2kksdh5
parent: abentley at panoramicfeedback.com-20070117143315-q6fy80tdcvd99ijc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Wed 2007-01-17 09:36:49 -0500
message:
Remove (new) trailing whitespace
------------------------------------------------------------
revno: 2052.1.163.3.6
revision-id: abentley at panoramicfeedback.com-20070117143315-q6fy80tdcvd99ijc
parent: abentley at panoramicfeedback.com-20070111142618-4vxwo22j91mxexoh
parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Wed 2007-01-17 09:33:15 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.163.3.5
revision-id: abentley at panoramicfeedback.com-20070111142618-4vxwo22j91mxexoh
parent: abentley at panoramicfeedback.com-20070109204105-ajiaop3tb5y1z65d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Thu 2007-01-11 09:26:18 -0500
message:
Add support for remote ls
------------------------------------------------------------
revno: 2052.1.163.3.4
revision-id: abentley at panoramicfeedback.com-20070109204105-ajiaop3tb5y1z65d
parent: abentley at panoramicfeedback.com-20070102201507-zej9hrf5cxxjkypj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Tue 2007-01-09 15:41:05 -0500
message:
rewrap some text
------------------------------------------------------------
revno: 2052.1.163.3.3
revision-id: abentley at panoramicfeedback.com-20070102201507-zej9hrf5cxxjkypj
parent: abentley at panoramicfeedback.com-20070102183359-kco0xv9p9u13i70l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Tue 2007-01-02 15:15:07 -0500
message:
Get ls working on branches
------------------------------------------------------------
revno: 2052.1.163.3.2
revision-id: abentley at panoramicfeedback.com-20070102183359-kco0xv9p9u13i70l
parent: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Tue 2007-01-02 13:33:59 -0500
message:
Add open_containing_tree_or_branch
------------------------------------------------------------
revno: 2052.1.184
revision-id: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
parent: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
parent: mbp at sourcefrog.net-20070117014923-bo3n6d6y2c30ybmw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 02:04:32 +0000
message:
(mbp) add selftest --first flag (r=aaron)
------------------------------------------------------------
revno: 2052.1.161.2.3
revision-id: mbp at sourcefrog.net-20070117014923-bo3n6d6y2c30ybmw
parent: mbp at sourcefrog.net-20070117014702-yjki61vdjsv3vztw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test_first
timestamp: Wed 2007-01-17 12:49:23 +1100
message:
news
------------------------------------------------------------
revno: 2052.1.161.2.2
revision-id: mbp at sourcefrog.net-20070117014702-yjki61vdjsv3vztw
parent: mbp at sourcefrog.net-20070114065627-7p3bfihkti28j5fr
parent: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test_first
timestamp: Wed 2007-01-17 12:47:02 +1100
message:
merge dev
------------------------------------------------------------
revno: 2052.1.161.2.1
revision-id: mbp at sourcefrog.net-20070114065627-7p3bfihkti28j5fr
parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test_first
timestamp: Sun 2007-01-14 17:56:27 +1100
message:
Add selftest --first flag
------------------------------------------------------------
revno: 2052.1.183
revision-id: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
parent: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-16 17:07:21 +0000
message:
(Wouter van Heyst) 0.14rc1 has branch, bump bzr.dev version to 0.15
------------------------------------------------------------
revno: 2052.1.182.1.1
revision-id: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-16 16:56:53 +0100
message:
0.14rc1 has branch, bump bzr.dev version to 0.15
------------------------------------------------------------
revno: 2052.1.182
revision-id: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
parent: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
parent: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-01-15 03:31:34 +0000
message:
Python 2.5 fixes for win32 installer
------------------------------------------------------------
revno: 2052.1.179.1.1
revision-id: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: setup.fixes
timestamp: Sat 2007-01-13 22:00:38 +0200
message:
Python 2.5 fixes for win32 installer
------------------------------------------------------------
revno: 2052.1.181
revision-id: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
parent: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-01-14 05:33:11 +0000
message:
(mbp) update global copyright to 2007 (trivial)
------------------------------------------------------------
revno: 2052.1.180.1.1
revision-id: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
committer: mbp at sourcefrog.net
branch nick: trivial
timestamp: Sun 2007-01-14 16:21:15 +1100
message:
update global copyright to 2007
------------------------------------------------------------
revno: 2052.1.180
revision-id: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-01-13 20:36:27 +0000
message:
Optimize iter_changes with specific file_ids
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31
revision-id: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
parent: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-01-11 10:57:49 -0500
message:
Handle to_paths correctly when parent of file is not in specified_ids
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.30
revision-id: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
parent: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-01-11 10:17:56 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.29
revision-id: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-12-22 12:11:36 -0500
message:
Optimize Tree._iter_changes with specific file_ids
------------------------------------------------------------
revno: 2052.1.179
revision-id: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
parent: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-01-13 17:43:13 +0000
message:
Restore (deprecated) access to SHORT_OPTIONS for compatibility.
------------------------------------------------------------
revno: 2052.1.178.1.1
revision-id: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
parent: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: short-options
timestamp: Sat 2007-01-13 18:15:50 +0100
message:
Merge work on SHORT_OPTIONS by Martin.
------------------------------------------------------------
revno: 2052.1.175.1.5
revision-id: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
parent: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
committer: mbp at sourcefrog.net
branch nick: options
timestamp: Fri 2007-01-12 14:58:07 +1100
message:
doc cleanup
------------------------------------------------------------
revno: 2052.1.175.1.4
revision-id: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
parent: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
committer: mbp at sourcefrog.net
branch nick: options
timestamp: Fri 2007-01-12 14:52:12 +1100
message:
add test that legacy SHORT_OPTIONS really works, and set_short_name
------------------------------------------------------------
revno: 2052.1.175.1.3
revision-id: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
parent: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
committer: mbp at sourcefrog.net
branch nick: options
timestamp: Fri 2007-01-12 14:40:25 +1100
message:
Restore access to SHORT_OPTIONS for compatibility
------------------------------------------------------------
revno: 2052.1.175.1.2
revision-id: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
committer: mbp at sourcefrog.net
branch nick: options
timestamp: Thu 2007-01-11 19:08:21 +1100
message:
Add a simple DeprecatedDict class
------------------------------------------------------------
revno: 2052.1.178
revision-id: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
parent: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-11 16:12:29 +0000
message:
(Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
------------------------------------------------------------
revno: 2052.1.177.1.1
revision-id: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
parent: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-01-11 09:57:41 -0600
message:
(Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
------------------------------------------------------------
revno: 2052.1.175.2.2
revision-id: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
parent: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
committer: v.ladeuil+lp at free.fr
branch nick: bzr.memory.tests
timestamp: Thu 2007-01-11 09:45:51 +0100
message:
Cleanup.
* bzrlib/tests/test_selftest.py:
(TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format):
Inline previous calls to fail[Unless|If]ExistsOnDisk and clearly
explain their aim.
* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
TestCaseWithMemoryTransport.failIfExistsOnDisk): Deleted. They
were more confusing than helpful.
------------------------------------------------------------
revno: 2052.1.175.2.1
revision-id: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.memory.tests
timestamp: Wed 2007-01-10 17:11:34 +0100
message:
Small fixes to test suite in the hope that it will facilitate the
adoption of TestCaseWithMemoryTransport.
* bzrlib/tests/test_selftest.py:
(TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format)):
Ensures that MemoryTransport is not leaking.
* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
TestCaseWithMemoryTransport.failIfExistsOnDisk): Renamed from
failUnlessExists and failIfExists which should remain targeted at
testing that a file do not exists in the context of the transport
specific test.
(TestCaseInTempDir.failUnlessExists,
TestCaseInTempDir.failIfExists): Lazily maintain compatibility
with existing tests: assumes that we work in the current directory
*on disk*.
------------------------------------------------------------
revno: 2052.1.177
revision-id: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
parent: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-11 01:43:09 +0000
message:
restore Option.short_name() to being callable (mbp, r=john, r=alexander)
------------------------------------------------------------
revno: 2052.1.175.1.1
revision-id: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: mbp at sourcefrog.net
branch nick: options
timestamp: Wed 2007-01-10 18:28:57 +1100
message:
Back out previous incompatible change: Option.short_name is now again
a method that returns the short name, if any.
------------------------------------------------------------
revno: 2052.1.176
revision-id: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
parent: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-10 23:10:47 +0000
message:
(bialix) Fit output of 'bzr help' to 25 lines DOS console
------------------------------------------------------------
revno: 2052.1.172.1.1
revision-id: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: small.fixes
timestamp: Wed 2007-01-10 08:01:49 +0200
message:
Fit output of 'bzr help' to 25 lines DOS console
------------------------------------------------------------
revno: 2052.1.175
revision-id: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-09 14:28:32 +0000
message:
Tweak set_default_format
------------------------------------------------------------
revno: 2052.1.152.4.13.1.2
revision-id: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
parent: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Tue 2007-01-09 09:08:26 -0500
message:
Tweak set_default_format
------------------------------------------------------------
revno: 2052.1.152.4.13.1.1
revision-id: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Tue 2007-01-09 09:06:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.174
revision-id: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
parent: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-09 12:34:44 +0000
message:
Deprecate format type set_default methods
------------------------------------------------------------
revno: 2052.1.152.4.14
revision-id: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Tue 2007-01-09 01:57:43 -0500
message:
lastest -> latest
------------------------------------------------------------
revno: 2052.1.152.4.13
revision-id: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
parent: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Fri 2007-01-05 12:12:03 -0500
message:
Update all test cases to avoid set_default_format
------------------------------------------------------------
revno: 2052.1.152.4.12
revision-id: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
parent: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Fri 2007-01-05 02:08:40 -0500
message:
Deprecate bzrdir.BzrDirFormat.set_default_format
------------------------------------------------------------
revno: 2052.1.152.4.11
revision-id: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
parent: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Fri 2007-01-05 01:32:57 -0500
message:
deprecate Repository.set_default_format, update upgrade tests
------------------------------------------------------------
revno: 2052.1.173
revision-id: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
parent: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-01-05 02:40:18 +0000
message:
(bialix) Before actually using encoding need to check that Python
has corresponding codec
------------------------------------------------------------
revno: 2052.1.140.1.10
revision-id: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
parent: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Fri 2007-01-05 01:36:44 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.140.1.9
revision-id: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
parent: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Thu 2007-01-04 23:35:43 +0200
message:
final fix suggested by John Meinel
------------------------------------------------------------
revno: 2052.1.140.1.8
revision-id: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
parent: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2007-01-02 23:20:39 +0200
message:
Rework tests after John's review
------------------------------------------------------------
revno: 2052.1.140.1.7
revision-id: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
parent: bialix at ukr.net-20070102143236-68tf5imq1kybper4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2007-01-02 18:04:11 +0200
message:
get_user_encoding: if locale.Error raised we need to set user_encoding to 'ascii' as warning says
------------------------------------------------------------
revno: 2052.1.140.1.6
revision-id: bialix at ukr.net-20070102143236-68tf5imq1kybper4
parent: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2007-01-02 16:32:36 +0200
message:
Fixes after Aaron's review
------------------------------------------------------------
revno: 2052.1.140.1.5
revision-id: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
parent: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2006-12-26 17:35:59 +0200
message:
NEWS
------------------------------------------------------------
revno: 2052.1.140.1.4
revision-id: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
parent: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2006-12-26 17:33:59 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.140.1.3
revision-id: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
parent: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2006-12-26 17:29:50 +0200
message:
Tests for osutils.get_user_encoding
------------------------------------------------------------
revno: 2052.1.140.1.2
revision-id: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
parent: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Tue 2006-12-26 08:35:03 +0200
message:
Tests for osutils.get_terminal_encoding()
------------------------------------------------------------
revno: 2052.1.140.1.1
revision-id: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: check-encoding
timestamp: Mon 2006-12-18 10:06:13 +0200
message:
Before actually using encoding need to check that Python has corresponding codec
------------------------------------------------------------
revno: 2052.1.172
revision-id: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
parent: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
parent: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-04 22:01:07 +0000
message:
(bialix) fix typo in manpage generators (bugfix #76603)
------------------------------------------------------------
revno: 2052.1.169.3.1
revision-id: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bugfix.76603
timestamp: Thu 2007-01-04 03:33:38 +0200
message:
Bugfix #76603: fix typo in bzr manpage text
------------------------------------------------------------
revno: 2052.1.171
revision-id: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
parent: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
parent: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-04 21:50:41 +0000
message:
Make most LockErrors internal
------------------------------------------------------------
revno: 2052.1.169.2.2
revision-id: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
parent: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: internalerror
timestamp: Thu 2007-01-04 15:59:46 -0500
message:
PEP8-correctness
------------------------------------------------------------
revno: 2052.1.169.2.1
revision-id: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: internalerror
timestamp: Thu 2007-01-04 15:23:28 -0500
message:
Make most lock errors internal
------------------------------------------------------------
revno: 2052.1.170
revision-id: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
parent: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-04 21:39:03 +0000
message:
(James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
------------------------------------------------------------
revno: 2052.1.169.1.1
revision-id: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
parent: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-01-04 14:06:16 -0600
message:
(James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
------------------------------------------------------------
revno: 2052.1.163.6.3
revision-id: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
parent: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Thu 2007-01-04 19:45:55 +0900
message:
narrow the range that the local_time_offset() test uses
------------------------------------------------------------
revno: 2052.1.163.6.2
revision-id: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
parent: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Tue 2007-01-02 17:40:32 +0900
message:
add some simple tests for local_time_offset()
------------------------------------------------------------
revno: 2052.1.163.6.1
revision-id: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Tue 2007-01-02 06:36:31 +0900
message:
Don't rely on time.timezone and time.altzone in local_time_offset(),
since they may not be accurate or applicable to the given timestamp (see
bug 77588).
Instead, use the datetime module to find the difference between the
local time representation and UTC time representation of the timestamp.
------------------------------------------------------------
revno: 2052.1.169
revision-id: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
parent: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-03 07:39:47 +0000
message:
(bialix) Fix generation of rstx man page
------------------------------------------------------------
revno: 2052.1.163.5.1
revision-id: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr_man.rstx
timestamp: Tue 2007-01-02 14:40:19 +0200
message:
Fix generation of rstx man page (problem with short names of options) and provide simple tests for future.
------------------------------------------------------------
revno: 2052.1.168
revision-id: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
parent: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
parent: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-03 02:24:32 +0000
message:
Register bzrdir formats ina FormatRegistry
------------------------------------------------------------
revno: 2052.1.152.4.10
revision-id: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
parent: aaron.bentley at utoronto.ca-20070103020952-tu2cap8tn7cbnq0f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Tue 2007-01-02 21:11:16 -0500
message:
Capitalize 'D' in 'directory formats'
------------------------------------------------------------
revno: 2052.1.152.4.9
revision-id: aaron.bentley at utoronto.ca-20070103020952-tu2cap8tn7cbnq0f
parent: aaron.bentley at utoronto.ca-20070103020633-0mrbo28n4m1t6zs7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Tue 2007-01-02 21:09:52 -0500
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.152.4.8
revision-id: aaron.bentley at utoronto.ca-20070103020633-0mrbo28n4m1t6zs7
parent: aaron.bentley at utoronto.ca-20061221043442-x3mv0kxnsu7c2z5j
parent: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Tue 2007-01-02 21:06:33 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.152.4.7
revision-id: aaron.bentley at utoronto.ca-20061221043442-x3mv0kxnsu7c2z5j
parent: aaron.bentley at utoronto.ca-20061221035631-07w2sshdphu5e2nj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Wed 2006-12-20 23:34:42 -0500
message:
restore register_lazy, remove register_factory, other updates
------------------------------------------------------------
revno: 2052.1.152.4.6
revision-id: aaron.bentley at utoronto.ca-20061221035631-07w2sshdphu5e2nj
parent: abentley at panoramicfeedback.com-20061220175027-xidxkp8obvtst7f1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-registry
timestamp: Wed 2006-12-20 22:56:31 -0500
message:
Fix default to work with RepositoryFormat.set_default_format
------------------------------------------------------------
revno: 2052.1.152.4.5
revision-id: abentley at panoramicfeedback.com-20061220175027-xidxkp8obvtst7f1
parent: abentley at panoramicfeedback.com-20061220174936-wqbl93ph73bc9lxg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2006-12-20 12:50:27 -0500
message:
Punctuation
------------------------------------------------------------
revno: 2052.1.152.4.4
revision-id: abentley at panoramicfeedback.com-20061220174936-wqbl93ph73bc9lxg
parent: abentley at panoramicfeedback.com-20061220170314-0a33ljwxcivnkfwi
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2006-12-20 12:49:36 -0500
message:
Use BzrDirFormatInfo to distinguish native and deprecated formats
------------------------------------------------------------
revno: 2052.1.152.4.3
revision-id: abentley at panoramicfeedback.com-20061220170314-0a33ljwxcivnkfwi
parent: abentley at panoramicfeedback.com-20061220165754-28utjxr508beexkc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2006-12-20 12:03:14 -0500
message:
Reimplement get_format_type in terms of FormatRegistry
------------------------------------------------------------
revno: 2052.1.152.4.2
revision-id: abentley at panoramicfeedback.com-20061220165754-28utjxr508beexkc
parent: abentley at panoramicfeedback.com-20061220163858-zwom59l3xvcqu2yd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2006-12-20 11:57:54 -0500
message:
Tweak topic appearance
------------------------------------------------------------
revno: 2052.1.152.4.1
revision-id: abentley at panoramicfeedback.com-20061220163858-zwom59l3xvcqu2yd
parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2006-12-20 11:38:58 -0500
message:
Add 'formats' help topic
------------------------------------------------------------
revno: 2052.1.167
revision-id: pqm at pqm.ubuntu.com-20070103015524-b3c9e901a96b16a2
parent: pqm at pqm.ubuntu.com-20070102225630-e2bbb87a8d1151bf
parent: bialix at ukr.net-20070103002345-7guxku60a0vwsoya
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-03 01:55:24 +0000
message:
(bialix) Bugfix #68124: Allow import plugins from zip archives
------------------------------------------------------------
revno: 2052.1.163.4.3
revision-id: bialix at ukr.net-20070103002345-7guxku60a0vwsoya
parent: bialix at ukr.net-20070103002224-610ykoqgttlin7bh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.from.zips
timestamp: Wed 2007-01-03 02:23:45 +0200
message:
Don't use os.path.split and os.path.splitext directly, only from osutils.
Because only '/' is used as separator of pathname components inside zip archives,
bzrlib.plugin.load_from_zips() uses custom split algorithm for handling filenames
to import from zip.
------------------------------------------------------------
revno: 2052.1.163.4.2
revision-id: bialix at ukr.net-20070103002224-610ykoqgttlin7bh
parent: bialix at ukr.net-20061229075317-uizaktke7o25g1z4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.from.zips
timestamp: Wed 2007-01-03 02:22:24 +0200
message:
split and splitext now the part of osutils
------------------------------------------------------------
revno: 2052.1.163.4.1
revision-id: bialix at ukr.net-20061229075317-uizaktke7o25g1z4
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.from.zips
timestamp: Fri 2006-12-29 09:53:17 +0200
message:
Bugfix #68124: Allow plugins import from zip archives.
------------------------------------------------------------
revno: 2052.1.166
revision-id: pqm at pqm.ubuntu.com-20070102225630-e2bbb87a8d1151bf
parent: pqm at pqm.ubuntu.com-20070102201016-ce62560cd118fd90
parent: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-02 22:56:30 +0000
message:
Allow ls to take a PATH
------------------------------------------------------------
revno: 2052.1.163.3.1
revision-id: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: ls
timestamp: Tue 2007-01-02 10:58:27 -0500
message:
Allow ls to take a PATH
------------------------------------------------------------
revno: 2052.1.165
revision-id: pqm at pqm.ubuntu.com-20070102201016-ce62560cd118fd90
parent: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
parent: john at arbash-meinel.com-20070102195305-rj3azf8s5jhe2d5c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-02 20:10:16 +0000
message:
(James Henstridge) update doc/configuration.txt with info about config variable policies.
------------------------------------------------------------
revno: 2052.1.164.1.1
revision-id: john at arbash-meinel.com-20070102195305-rj3azf8s5jhe2d5c
parent: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
parent: james at jamesh.id.au-20070102071627-w5w976vfetuejhck
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-01-02 13:53:05 -0600
message:
(James Henstridge) update doc/configuration.txt with info about config variable policies.
------------------------------------------------------------
revno: 2052.1.68.6.14
revision-id: james at jamesh.id.au-20070102071627-w5w976vfetuejhck
parent: james at jamesh.id.au-20070101091325-lndi83gpd6tb1ak4
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2007-01-02 16:16:27 +0900
message:
Fix RST syntax as suggested by j-a-meinel
------------------------------------------------------------
revno: 2052.1.68.6.13
revision-id: james at jamesh.id.au-20070101091325-lndi83gpd6tb1ak4
parent: james at jamesh.id.au-20070101073912-elq1bllgxfuh3cbj
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Mon 2007-01-01 18:13:25 +0900
message:
update doc/configuration.txt with information about policies
------------------------------------------------------------
revno: 2052.1.68.6.12
revision-id: james at jamesh.id.au-20070101073912-elq1bllgxfuh3cbj
parent: james at jamesh.id.au-20061207154536-dlb8iffz100euegp
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Mon 2007-01-01 16:39:12 +0900
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.164
revision-id: pqm at pqm.ubuntu.com-20070102193519-9ebdc059abfd7993
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
parent: john at arbash-meinel.com-20070102191824-bsvgwgzypzfms6jq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-01-02 19:35:19 +0000
message:
(Vincent Ladeuil) Fix proxy issues with earlier python versions.
------------------------------------------------------------
revno: 2052.1.163.1.2
revision-id: john at arbash-meinel.com-20070102191824-bsvgwgzypzfms6jq
parent: john at arbash-meinel.com-20070102174712-c5rcvxyej2ylzfyf
parent: robey at lag.net-20061227005009-pne1tyoju0gvqlqs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-01-02 13:18:24 -0600
message:
(Robey Pointer) raise PathNotChild if the sftp transport is given a non-sftp url
------------------------------------------------------------
revno: 2052.1.163.2.1
revision-id: robey at lag.net-20061227005009-pne1tyoju0gvqlqs
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.quickfix
timestamp: Tue 2006-12-26 19:50:09 -0500
message:
raise PathNotChild if the sftp transport is given a non-sftp url
------------------------------------------------------------
revno: 2052.1.163.1.1
revision-id: john at arbash-meinel.com-20070102174712-c5rcvxyej2ylzfyf
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
parent: v.ladeuil+lp at free.fr-20061222095452-fmuqmnmokmsxeiqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-01-02 11:47:12 -0600
message:
(Vincent Ladeuil) Fix proxy issues with earlier python versions.
------------------------------------------------------------
revno: 2052.1.161.1.1
revision-id: v.ladeuil+lp at free.fr-20061222095452-fmuqmnmokmsxeiqu
parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.translate.path
timestamp: Fri 2006-12-22 10:54:52 +0100
message:
Workaround SimpleHTTPRequestHandler.translate_path limitation in
python 2.4.1
* bzrlib/tests/HTTPTestUtil.py:
(FakeProxyRequestHandler.do_GET): Work around a limitation of
SimpleHTTPRequestHandler.translate_path in python 2.4.1 (fixed in
2.4.3).
------------------------------------------------------------
revno: 2052.1.163
revision-id: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
parent: pqm at pqm.ubuntu.com-20061222171155-51bfebf386004ed0
parent: bialix at ukr.net-20061222085830-k57n03cw3613dlhq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-22 18:07:19 +0000
message:
(bialix) several small fixes to selftest
------------------------------------------------------------
revno: 2052.1.152.3.4
revision-id: bialix at ukr.net-20061222085830-k57n03cw3613dlhq
parent: bialix at ukr.net-20061222085228-fe80nuencvxluh6v
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Fri 2006-12-22 10:58:30 +0200
message:
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
if some test try to print unicode characters.
Actually tests never should try to print unicode, even formatting
unicode strings with '%s'. But if this happens selftest should not
blow-up with UnicodeEncodeError traceback.
------------------------------------------------------------
revno: 2052.1.152.3.3
revision-id: bialix at ukr.net-20061222085228-fe80nuencvxluh6v
parent: bialix at ukr.net-20061221151519-rl8q1d5bt7973oqp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Fri 2006-12-22 10:52:28 +0200
message:
Don't formats unicode strings in test error messages with '%s': it's unsafe
------------------------------------------------------------
revno: 2052.1.152.3.2
revision-id: bialix at ukr.net-20061221151519-rl8q1d5bt7973oqp
parent: bialix at ukr.net-20061221150241-sr5iue77tiod600e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Thu 2006-12-21 17:15:19 +0200
message:
cherrypicking: test_plugin_help_shows_plugin: fix cleanup after test
------------------------------------------------------------
revno: 2052.1.152.3.1
revision-id: bialix at ukr.net-20061221150241-sr5iue77tiod600e
parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: regression
timestamp: Thu 2006-12-21 17:02:41 +0200
message:
fix win32 selftest regression introduced by bzr.dev.revno2198
------------------------------------------------------------
revno: 2052.1.162
revision-id: pqm at pqm.ubuntu.com-20061222171155-51bfebf386004ed0
parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-22 17:11:55 +0000
message:
ls now takes --show-ids
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.28
revision-id: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
parent: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-21 16:20:08 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.27
revision-id: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
parent: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-21 16:11:45 -0500
message:
Implement show-ids for all output formats
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.26
revision-id: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
parent: abentley at panoramicfeedback.com-20061220221844-95io021dwz80623b
parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-21 15:20:52 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.161
revision-id: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
parent: mbp at sourcefrog.net-20061221060017-jwvxno0t642hhmxk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-22 01:37:06 +0000
message:
(mbp) remove redundant tree delta from info (r=wouter,john)
------------------------------------------------------------
revno: 2052.1.156.3.1
revision-id: mbp at sourcefrog.net-20061221060017-jwvxno0t642hhmxk
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: extra_delta
timestamp: Thu 2006-12-21 17:00:17 +1100
message:
remove unnecessary tree delta in info calculation
------------------------------------------------------------
revno: 2052.1.160
revision-id: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
parent: pqm at pqm.ubuntu.com-20061221180157-d1bc7971e9d0e6af
parent: john at arbash-meinel.com-20061221200734-3kqiep3996uxtwsc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 20:43:34 +0000
message:
(Dmitry Vasiliev) Optimizations for KnitIndex, and tests to go with it.
------------------------------------------------------------
revno: 2052.1.144.2.5
revision-id: john at arbash-meinel.com-20061221200734-3kqiep3996uxtwsc
parent: john at arbash-meinel.com-20061221193225-4djk002no76i1ef9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_optim
timestamp: Thu 2006-12-21 14:07:34 -0600
message:
Add an exception class when the knit index storage method is unknown, and properly test for it
------------------------------------------------------------
revno: 2052.1.144.2.4
revision-id: john at arbash-meinel.com-20061221193225-4djk002no76i1ef9
parent: john at arbash-meinel.com-20061221192958-tn1pyl6dg2b44379
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_optim
timestamp: Thu 2006-12-21 13:32:25 -0600
message:
NEWS
------------------------------------------------------------
revno: 2052.1.144.2.3
revision-id: john at arbash-meinel.com-20061221192958-tn1pyl6dg2b44379
parent: john at arbash-meinel.com-20061221192845-fmv60t3k5t0xxks4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_optim
timestamp: Thu 2006-12-21 13:29:58 -0600
message:
Update tests and code to pass after merging bzr.dev
------------------------------------------------------------
revno: 2052.1.144.2.2
revision-id: john at arbash-meinel.com-20061221192845-fmv60t3k5t0xxks4
parent: john at arbash-meinel.com-20061218214910-a8u9ec7l2wm4rh2c
parent: pqm at pqm.ubuntu.com-20061221180157-d1bc7971e9d0e6af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_optim
timestamp: Thu 2006-12-21 13:28:45 -0600
message:
[merge] bzr.dev 2211
------------------------------------------------------------
revno: 2052.1.144.2.1
revision-id: john at arbash-meinel.com-20061218214910-a8u9ec7l2wm4rh2c
parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
parent: dima at hlabs.spb.ru-20061201104442-57108aafbad6498c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_optim
timestamp: Mon 2006-12-18 15:49:10 -0600
message:
Merge Dmitry's optimizations and minimize the actual diff.
------------------------------------------------------------
revno: 2052.1.106.3.1
revision-id: dima at hlabs.spb.ru-20061201104442-57108aafbad6498c
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: knitindex.fixes
timestamp: Fri 2006-12-01 13:44:42 +0300
message:
KnitIndex tests/fixes/optimizations
- Added _KnitIndex tests.
- Fixed bug with undecoded version ids.
- Extracted the knit index file parsing code from __init__() into _load_data()
method.
- Converted loops into list comprehensions where appropriate.
- Localized attributes for faster access inside loops where appropriate.
- Added forgotten import.
- Removed trailing whitespaces.
------------------------------------------------------------
revno: 2052.1.159
revision-id: pqm at pqm.ubuntu.com-20061221180157-d1bc7971e9d0e6af
parent: pqm at pqm.ubuntu.com-20061221163807-07adb2b67c60b6e6
parent: john at arbash-meinel.com-20061221164145-eux9pt6uvmu3869w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 18:01:57 +0000
message:
(Vincent Ladeuil) Small cleanups of Transports
------------------------------------------------------------
revno: 2052.1.156.1.2
revision-id: john at arbash-meinel.com-20061221164145-eux9pt6uvmu3869w
parent: john at arbash-meinel.com-20061221160153-u3d7lkekuqpr6lxl
parent: v.ladeuil+lp at free.fr-20061221133729-65lrhoo213mto1qu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-21 10:41:45 -0600
message:
(Vincent Ladeuil) Small cleanups of Transports
------------------------------------------------------------
revno: 2052.1.156.2.1
revision-id: v.ladeuil+lp at free.fr-20061221133729-65lrhoo213mto1qu
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: v.ladeuil+lp at free.fr
branch nick: bzr.trivial.fixes
timestamp: Thu 2006-12-21 14:37:29 +0100
message:
Trivial small fixes.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): super __init__ *use* the
from_transport parameter.
* bzrlib/transport/chroot.py:
(ChrootTransportDecorator.get): Delete the duplicated definition.
------------------------------------------------------------
revno: 2052.1.158
revision-id: pqm at pqm.ubuntu.com-20061221163807-07adb2b67c60b6e6
parent: pqm at pqm.ubuntu.com-20061221145008-aa469cd5f3412a90
parent: john at arbash-meinel.com-20061221160153-u3d7lkekuqpr6lxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 16:38:07 +0000
message:
(John Arbash Meinel) Make KnitError and internal error (trivial)
------------------------------------------------------------
revno: 2052.1.156.1.1
revision-id: john at arbash-meinel.com-20061221160153-u3d7lkekuqpr6lxl
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-21 10:01:53 -0600
message:
Making KnitError and children internal errors.
------------------------------------------------------------
revno: 2052.1.157
revision-id: pqm at pqm.ubuntu.com-20061221145008-aa469cd5f3412a90
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
parent: john at arbash-meinel.com-20061218192111-3fc13nmt21u3f1wm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 14:50:08 +0000
message:
(John Arbash Meinel) more optimizations for fileids_altered
------------------------------------------------------------
revno: 2052.1.111.1.2.1.6
revision-id: john at arbash-meinel.com-20061218192111-3fc13nmt21u3f1wm
parent: john at arbash-meinel.com-20061218181916-cxkbhjnd41dvuvw2
parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Mon 2006-12-18 13:21:11 -0600
message:
[merge] bzr.dev 2196
------------------------------------------------------------
revno: 2052.1.111.1.2.1.5
revision-id: john at arbash-meinel.com-20061218181916-cxkbhjnd41dvuvw2
parent: john at arbash-meinel.com-20061206224316-0j32fgqf133flch5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Mon 2006-12-18 12:19:16 -0600
message:
Inline the cache lookup, and explain why
------------------------------------------------------------
revno: 2052.1.111.1.2.1.4
revision-id: john at arbash-meinel.com-20061206224316-0j32fgqf133flch5
parent: john at arbash-meinel.com-20061206221605-o82yccwnwl332tut
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 16:43:16 -0600
message:
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
------------------------------------------------------------
revno: 2052.1.156
revision-id: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
parent: pqm at pqm.ubuntu.com-20061221041314-2991e63a023efcf1
parent: abentley at panoramicfeedback.com-20061220221844-95io021dwz80623b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 04:38:20 +0000
message:
unhide ls, support --kind flag
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.25
revision-id: abentley at panoramicfeedback.com-20061220221844-95io021dwz80623b
parent: abentley at panoramicfeedback.com-20061220221412-2ufj4imcwdbxrkri
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-12-20 17:18:44 -0500
message:
Remove unneeded import
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.24
revision-id: abentley at panoramicfeedback.com-20061220221412-2ufj4imcwdbxrkri
parent: abentley at panoramicfeedback.com-20061219142746-bi5z44auxhzlx7t9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-12-20 17:14:12 -0500
message:
Unhide ls, add kind flag
------------------------------------------------------------
revno: 2052.1.155
revision-id: pqm at pqm.ubuntu.com-20061221041314-2991e63a023efcf1
parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
parent: mbp at sourcefrog.net-20061221035943-2qazd36lrxms0bug
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-21 04:13:14 +0000
message:
(mbp) initial cleanups of cmd_diff (r=john)
------------------------------------------------------------
revno: 2052.1.145.2.2
revision-id: mbp at sourcefrog.net-20061221035943-2qazd36lrxms0bug
parent: mbp at sourcefrog.net-20061220105812-7uob91i2tl5qfksd
parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: diff-refactoring
timestamp: Thu 2006-12-21 14:59:43 +1100
message:
merge bzr.dev, reconcile with option changes
------------------------------------------------------------
revno: 2052.1.145.2.1
revision-id: mbp at sourcefrog.net-20061220105812-7uob91i2tl5qfksd
parent: pqm at pqm.ubuntu.com-20061219065855-deb1b86e0b392f15
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 56299-dash-c
timestamp: Wed 2006-12-20 21:58:12 +1100
message:
Refactor cmd_diff
------------------------------------------------------------
revno: 2052.1.154
revision-id: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
parent: pqm at pqm.ubuntu.com-20061220184110-c906a438989e0513
parent: larstiq at larstiq.dyndns.org-20061220183123-qpvjpnhvo63yjhho
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 18:52:55 +0000
message:
(Wouter van Heyst) Mention the revisionspec topic in the revision option help (#31633).
------------------------------------------------------------
revno: 2052.1.152.2.1
revision-id: larstiq at larstiq.dyndns.org-20061220183123-qpvjpnhvo63yjhho
parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
parent: larstiq at larstiq.dyndns.org-20061219221741-7vuv0ol3u8ta2nfq
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Wed 2006-12-20 19:31:23 +0100
message:
Fix merge conflicts.
------------------------------------------------------------
revno: 2052.1.149.2.1
revision-id: larstiq at larstiq.dyndns.org-20061219221741-7vuv0ol3u8ta2nfq
parent: pqm at pqm.ubuntu.com-20061219153737-16a75155bc1b8c0d
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: revision.help
timestamp: Tue 2006-12-19 23:17:41 +0100
message:
Make mention of the revisionspec topic in the revision option help (#31633).
------------------------------------------------------------
revno: 2052.1.153
revision-id: pqm at pqm.ubuntu.com-20061220184110-c906a438989e0513
parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
parent: john at arbash-meinel.com-20061220165518-32ly6wupiitpuupr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 18:41:10 +0000
message:
(John Arbash Meinel) Fix 'bzr missing --verbose' to print the correct changes
------------------------------------------------------------
revno: 2052.1.152.1.1
revision-id: john at arbash-meinel.com-20061220165518-32ly6wupiitpuupr
parent: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-missing-v
timestamp: Wed 2006-12-20 10:55:18 -0600
message:
'bzr missing -v' was showing adds as deletes.
------------------------------------------------------------
revno: 2052.1.152
revision-id: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
parent: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
parent: bialix at ukr.net-20061220095052-8v7nfgc6x9yjzpbh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 11:04:44 +0000
message:
(bialix) Bugfix #55276: on win32 cat, bundle and diff commands provide
binary output without mangling line-endings
------------------------------------------------------------
revno: 2052.1.126.4.6
revision-id: bialix at ukr.net-20061220095052-8v7nfgc6x9yjzpbh
parent: bialix at ukr.net-20061219173738-4pd3h25j5ozjmf5e
parent: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Wed 2006-12-20 11:50:52 +0200
message:
merge bzr.dev; fix NEWS
------------------------------------------------------------
revno: 2052.1.126.4.5
revision-id: bialix at ukr.net-20061219173738-4pd3h25j5ozjmf5e
parent: bialix at ukr.net-20061219084503-m4szifvnbo8nq0qm
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Tue 2006-12-19 19:37:38 +0200
message:
Spell-checking (thanks to Aaron)
------------------------------------------------------------
revno: 2052.1.126.4.4
revision-id: bialix at ukr.net-20061219084503-m4szifvnbo8nq0qm
parent: bialix at ukr.net-20061219082636-xbb55np3wnamva8t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Tue 2006-12-19 10:45:03 +0200
message:
encoding_type = 'exact' force sys.stdout to be binary stream on win32
(get rid of binary_stdout attribute)
------------------------------------------------------------
revno: 2052.1.126.4.3
revision-id: bialix at ukr.net-20061219082636-xbb55np3wnamva8t
parent: bialix at ukr.net-20061213081949-ec6sqdiwr3uh8ly4
parent: pqm at pqm.ubuntu.com-20061219074019-bbed16c7ec3baf17
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Tue 2006-12-19 10:26:36 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.126.4.2
revision-id: bialix at ukr.net-20061213081949-ec6sqdiwr3uh8ly4
parent: bialix at ukr.net-20061213081554-hglev5j0rzv0xhon
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Wed 2006-12-13 10:19:49 +0200
message:
Bugfix #55276: on win32 cat, bundle and diff commands provide binary output without mangling line-endings
------------------------------------------------------------
revno: 2052.1.126.4.1
revision-id: bialix at ukr.net-20061213081554-hglev5j0rzv0xhon
parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.binary-stdout
timestamp: Wed 2006-12-13 10:15:54 +0200
message:
Provide tests to illustrate bug #55276 on win32.
Change blackbox tests for cat and bundle commands
to use run_bzr_subprocess and therefore grab
real output (windows mangle line-endings LF -> CRLF).
Also provide new blackbox tests for diff command.
To check that tests failed you need to run on win32:
python bzr selftest blackbox.test_cat
python bzr selftest blackbox.test_bundle
python bzr selftest blackbox.test_diff
------------------------------------------------------------
revno: 2052.1.151
revision-id: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
parent: pqm at pqm.ubuntu.com-20061219234911-ef24c2a4ae550a02
parent: mbp at sourcefrog.net-20061219061628-h03p5g7lsme1rx5w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 08:41:18 +0000
message:
(mbp) remove global registration of short options (r=john)
------------------------------------------------------------
revno: 2052.1.141.3.3
revision-id: mbp at sourcefrog.net-20061219061628-h03p5g7lsme1rx5w
parent: mbp at sourcefrog.net-20061219054750-ky6x2s0lzvikfnl8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: short-options
timestamp: Tue 2006-12-19 17:16:28 +1100
message:
Fix up other short options
------------------------------------------------------------
revno: 2052.1.141.3.2
revision-id: mbp at sourcefrog.net-20061219054750-ky6x2s0lzvikfnl8
parent: mbp at sourcefrog.net-20061219054700-eh989yuwhr6p2xxi
parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: short-options
timestamp: Tue 2006-12-19 16:47:50 +1100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.141.3.1
revision-id: mbp at sourcefrog.net-20061219054700-eh989yuwhr6p2xxi
parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
parent: mbp at sourcefrog.net-20061215083650-14cbsfiijfq3kdf9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: short-options
timestamp: Tue 2006-12-19 16:47:00 +1100
message:
Finish removal of global short-option table
------------------------------------------------------------
revno: 2052.1.138.2.1
revision-id: mbp at sourcefrog.net-20061215083650-14cbsfiijfq3kdf9
parent: pqm at pqm.ubuntu.com-20061215053913-76fa903ef526647a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 56299-dash-c
timestamp: Fri 2006-12-15 19:36:50 +1100
message:
remove global registration of short options
------------------------------------------------------------
revno: 2052.1.150
revision-id: pqm at pqm.ubuntu.com-20061219234911-ef24c2a4ae550a02
parent: pqm at pqm.ubuntu.com-20061219153737-16a75155bc1b8c0d
parent: john at arbash-meinel.com-20061219233317-9yizwfy0afs1dvpy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 23:49:11 +0000
message:
(John Arbash Meinel) Make 'bzr status' work properly in readonly directories (bug #76299)
------------------------------------------------------------
revno: 2052.1.149.1.2
revision-id: john at arbash-meinel.com-20061219233317-9yizwfy0afs1dvpy
parent: john at arbash-meinel.com-20061219170642-wkqlrka2qlkr75ao
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_in_non_writable
timestamp: Tue 2006-12-19 17:33:17 -0600
message:
Update from Aaron
------------------------------------------------------------
revno: 2052.1.149.1.1
revision-id: john at arbash-meinel.com-20061219170642-wkqlrka2qlkr75ao
parent: pqm at pqm.ubuntu.com-20061219153737-16a75155bc1b8c0d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_in_non_writable
timestamp: Tue 2006-12-19 11:06:42 -0600
message:
Fix bug #76299 by ignoring write errors during readonly hashcache write.
------------------------------------------------------------
revno: 2052.1.149
revision-id: pqm at pqm.ubuntu.com-20061219153737-16a75155bc1b8c0d
parent: pqm at pqm.ubuntu.com-20061219152658-bb9a7fc4dab5cdb1
parent: abentley at panoramicfeedback.com-20061219142746-bi5z44auxhzlx7t9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 15:37:37 +0000
message:
Avoid using path functions for URLs in info (#76229)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.23
revision-id: abentley at panoramicfeedback.com-20061219142746-bi5z44auxhzlx7t9
parent: abentley at panoramicfeedback.com-20061218150951-g91xzuh889gb2mvx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-12-19 09:27:46 -0500
message:
Use rstrip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.22
revision-id: abentley at panoramicfeedback.com-20061218150951-g91xzuh889gb2mvx
parent: aaron.bentley at utoronto.ca-20061217194036-2x3z6tavblhqn522
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-12-18 10:09:51 -0500
message:
Use urlutils for info. Fixes bug #76229
------------------------------------------------------------
revno: 2052.1.148
revision-id: pqm at pqm.ubuntu.com-20061219152658-bb9a7fc4dab5cdb1
parent: pqm at pqm.ubuntu.com-20061219081515-bf5fdee82b453ceb
parent: john at arbash-meinel.com-20061219141931-jhjpdy5hzgnr2b44
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 15:26:58 +0000
message:
(Jan Hudec) Add a '--pull' option to 'merge' to switch to pull when possible.
------------------------------------------------------------
revno: 2052.1.147.1.2
revision-id: john at arbash-meinel.com-20061219141931-jhjpdy5hzgnr2b44
parent: john at arbash-meinel.com-20061219141526-8rtwgx4iav2xvak5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-12-19 08:19:31 -0600
message:
Update documentation as per Martin's suggestion.
------------------------------------------------------------
revno: 2052.1.147.1.1
revision-id: john at arbash-meinel.com-20061219141526-8rtwgx4iav2xvak5
parent: pqm at pqm.ubuntu.com-20061219081515-bf5fdee82b453ceb
parent: bulb at ucw.cz-20061125203839-9nuhv32z63hb8811
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-12-19 08:15:26 -0600
message:
[merge] Jan Hudec's merge --pull patch
------------------------------------------------------------
revno: 2052.1.97.2.1
revision-id: bulb at ucw.cz-20061125203839-9nuhv32z63hb8811
parent: pqm at pqm.ubuntu.com-20061123070038-57f13b951191257e
committer: Jan Hudec <bulb at ucw.cz>
branch nick: bzr.pointless-merges
timestamp: Sat 2006-11-25 21:38:39 +0100
message:
Option --pull for merge command.
Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.
Simple test for this option is included.
------------------------------------------------------------
revno: 2052.1.147
revision-id: pqm at pqm.ubuntu.com-20061219081515-bf5fdee82b453ceb
parent: pqm at pqm.ubuntu.com-20061219074019-bbed16c7ec3baf17
parent: mbp at sourcefrog.net-20061219072650-eco5je8rzy71dvp9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 08:15:15 +0000
message:
(mbp) Use line buffering to write .perf_history (trivial)
------------------------------------------------------------
revno: 2052.1.145.1.1
revision-id: mbp at sourcefrog.net-20061219072650-eco5je8rzy71dvp9
parent: pqm at pqm.ubuntu.com-20061219065855-deb1b86e0b392f15
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmark-formatting
timestamp: Tue 2006-12-19 18:26:50 +1100
message:
Use line buffering to write .perf_history
------------------------------------------------------------
revno: 2052.1.146
revision-id: pqm at pqm.ubuntu.com-20061219074019-bbed16c7ec3baf17
parent: pqm at pqm.ubuntu.com-20061219065855-deb1b86e0b392f15
parent: bialix at ukr.net-20061218114121-0vqi3or3er7e87li
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 07:40:19 +0000
message:
(bialix) selftest internals: by default build tree for test with
binary line-endings
------------------------------------------------------------
revno: 2052.1.141.2.1
revision-id: bialix at ukr.net-20061218114121-0vqi3or3er7e87li
parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Mon 2006-12-18 13:41:21 +0200
message:
selftest: build tree for test with binary line-endings by default
------------------------------------------------------------
revno: 2052.1.145
revision-id: pqm at pqm.ubuntu.com-20061219065855-deb1b86e0b392f15
parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
parent: mbp at sourcefrog.net-20061219063932-1wr3wq6y7ks1cfvk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 06:58:55 +0000
message:
(mbp) fix line width and abbreviation in benchmark progress (trivial)
------------------------------------------------------------
revno: 2052.1.144.1.2
revision-id: mbp at sourcefrog.net-20061219063932-1wr3wq6y7ks1cfvk
parent: mbp at sourcefrog.net-20061219060200-fq7f663v8uuhaaip
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmark-formatting
timestamp: Tue 2006-12-19 17:39:32 +1100
message:
Loosen requirements for benchmark formatting in selftest
------------------------------------------------------------
revno: 2052.1.144.1.1
revision-id: mbp at sourcefrog.net-20061219060200-fq7f663v8uuhaaip
parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmark-formatting
timestamp: Tue 2006-12-19 17:02:00 +1100
message:
better formatting of benchmark output so it doesn't wrap
------------------------------------------------------------
revno: 2052.1.144
revision-id: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
parent: pqm at pqm.ubuntu.com-20061218173533-46a6cb3b1d08b8ab
parent: john at arbash-meinel.com-20061218155721-9xb84yhuww8dz1ri
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-12-18 18:42:17 +0000
message:
(John Arbash Meinel) tweak KnitContent to return unannotated data when we don't need it, saving 300ms during parsing of inventory.knit
------------------------------------------------------------
revno: 2052.1.111.1.9
revision-id: john at arbash-meinel.com-20061218155721-9xb84yhuww8dz1ri
parent: john at arbash-meinel.com-20061213183250-fhl3k8h5a8ek5sgn
parent: pqm at pqm.ubuntu.com-20061218095307-aee9a7a706a43650
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Mon 2006-12-18 09:57:21 -0600
message:
[merge] bzr.dev 2194
------------------------------------------------------------
revno: 2052.1.111.1.8
revision-id: john at arbash-meinel.com-20061213183250-fhl3k8h5a8ek5sgn
parent: john at arbash-meinel.com-20061213183125-kmew6fvofd9aywab
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Wed 2006-12-13 12:32:50 -0600
message:
Add NEWS entry
------------------------------------------------------------
revno: 2052.1.111.1.7
revision-id: john at arbash-meinel.com-20061213183125-kmew6fvofd9aywab
parent: john at arbash-meinel.com-20061213153628-kvjw7u1bmjdhvqmn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Wed 2006-12-13 12:31:25 -0600
message:
Switch the line iterator as suggested by Aaron Bentley
------------------------------------------------------------
revno: 2052.1.111.1.6
revision-id: john at arbash-meinel.com-20061213153628-kvjw7u1bmjdhvqmn
parent: john at arbash-meinel.com-20061212021213-wq6uydm0m7ongog7
parent: john at arbash-meinel.com-20061206221605-o82yccwnwl332tut
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Wed 2006-12-13 09:36:28 -0600
message:
[merge] fileids_altered approved by Aaron
------------------------------------------------------------
revno: 2052.1.111.1.2.1.3
revision-id: john at arbash-meinel.com-20061206221605-o82yccwnwl332tut
parent: john at arbash-meinel.com-20061206212902-foz80piqgtou1o5n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 16:16:05 -0600
message:
Change to local variables to save another 300ms
------------------------------------------------------------
revno: 2052.1.111.1.2.1.2
revision-id: john at arbash-meinel.com-20061206212902-foz80piqgtou1o5n
parent: john at arbash-meinel.com-20061206205657-7kh0kha5mnl9v9oa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 15:29:02 -0600
message:
Don't deal with annotations when we don't care about them. Saves another 300+ms
------------------------------------------------------------
revno: 2052.1.143
revision-id: pqm at pqm.ubuntu.com-20061218173533-46a6cb3b1d08b8ab
parent: pqm at pqm.ubuntu.com-20061218095307-aee9a7a706a43650
parent: john at arbash-meinel.com-20061218154215-e0vj23m4r1tn8wys
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-12-18 17:35:33 +0000
message:
(John Arbash Meinel) Implement bzr+http:// and update docs to indicate how to set it up.
------------------------------------------------------------
revno: 2052.1.138.1.7
revision-id: john at arbash-meinel.com-20061218154215-e0vj23m4r1tn8wys
parent: john at arbash-meinel.com-20061218153729-se570hwn14rpaqbw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Mon 2006-12-18 09:42:15 -0600
message:
Comment that https:// is a good way to have a writable URL next to a read-only http:// url.
------------------------------------------------------------
revno: 2052.1.138.1.6
revision-id: john at arbash-meinel.com-20061218153729-se570hwn14rpaqbw
parent: john at arbash-meinel.com-20061218153408-6ns3mva23x7p16x5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Mon 2006-12-18 09:37:29 -0600
message:
Correct the bzr+http:// information, since it wasn't in 0.12, but will be in 0.14
------------------------------------------------------------
revno: 2052.1.138.1.5
revision-id: john at arbash-meinel.com-20061218153408-6ns3mva23x7p16x5
parent: john at arbash-meinel.com-20061215235915-gmqkk3ljhxq3b9bh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Mon 2006-12-18 09:34:08 -0600
message:
Typo fix from Martin
------------------------------------------------------------
revno: 2052.1.138.1.4
revision-id: john at arbash-meinel.com-20061215235915-gmqkk3ljhxq3b9bh
parent: john at arbash-meinel.com-20061215233442-yrhj5armj08y4b65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Fri 2006-12-15 17:59:15 -0600
message:
Add ability to enable writeable bzr+http access.
------------------------------------------------------------
revno: 2052.1.138.1.3
revision-id: john at arbash-meinel.com-20061215233442-yrhj5armj08y4b65
parent: john at arbash-meinel.com-20061215232136-ruxfux379ix6vqw0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Fri 2006-12-15 17:34:42 -0600
message:
Implement bzr+http://
------------------------------------------------------------
revno: 2052.1.138.1.2
revision-id: john at arbash-meinel.com-20061215232136-ruxfux379ix6vqw0
parent: john at arbash-meinel.com-20061215222552-izvd99hjp33281ua
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Fri 2006-12-15 17:21:36 -0600
message:
Need the correct rewrite rule to get .bzr at the root of the exposed directory.
------------------------------------------------------------
revno: 2052.1.138.1.1
revision-id: john at arbash-meinel.com-20061215222552-izvd99hjp33281ua
parent: pqm at pqm.ubuntu.com-20061215053913-76fa903ef526647a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_http_fixes
timestamp: Fri 2006-12-15 16:25:52 -0600
message:
Update the documentation so the smart server actually works with mod python.
------------------------------------------------------------
revno: 2052.1.142
revision-id: pqm at pqm.ubuntu.com-20061218095307-aee9a7a706a43650
parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
parent: mbp at sourcefrog.net-20061218092603-prox89u0kgb0d70t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-12-18 09:53:07 +0000
message:
(mbp) fix false failure in test_clean_output (trivial)
------------------------------------------------------------
revno: 2052.1.141.1.1
revision-id: mbp at sourcefrog.net-20061218092603-prox89u0kgb0d70t
parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: clean_output
timestamp: Mon 2006-12-18 20:26:03 +1100
message:
test_clean_output: don't depend on directories being cleaned up in order.
On some systems files aren't listed in alphabetical order.
------------------------------------------------------------
revno: 2052.1.141
revision-id: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
parent: aaron.bentley at utoronto.ca-20061217194036-2x3z6tavblhqn522
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-12-17 19:55:27 +0000
message:
Add Tree.annotate_iter
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.21
revision-id: aaron.bentley at utoronto.ca-20061217194036-2x3z6tavblhqn522
parent: aaron.bentley at utoronto.ca-20061217191154-dpbv8dusbhapdhwb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-12-17 14:40:36 -0500
message:
Fix copyright statements
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.20
revision-id: aaron.bentley at utoronto.ca-20061217191154-dpbv8dusbhapdhwb
parent: aaron.bentley at utoronto.ca-20061217185705-tfkfwl1lara0ydzu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-12-17 14:11:54 -0500
message:
Remove unrelated assertion
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.19
revision-id: aaron.bentley at utoronto.ca-20061217185705-tfkfwl1lara0ydzu
parent: aaron.bentley at utoronto.ca-20061217174243-fv74f0aswfsa6tn9
parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-12-17 13:57:05 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.18
revision-id: aaron.bentley at utoronto.ca-20061217174243-fv74f0aswfsa6tn9
parent: abentley at panoramicfeedback.com-20061215221916-xcnnqab6tw3rt6yr
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-12-17 12:42:43 -0500
message:
Updates from review comments
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.17
revision-id: abentley at panoramicfeedback.com-20061215221916-xcnnqab6tw3rt6yr
parent: abentley at panoramicfeedback.com-20061215181634-pvdzlrgya7rszujv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-12-15 17:19:16 -0500
message:
Annotate for working trees across all parents
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.16
revision-id: abentley at panoramicfeedback.com-20061215181634-pvdzlrgya7rszujv
parent: abentley at panoramicfeedback.com-20061214214718-dydr28yhnrea88w8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-12-15 13:16:34 -0500
message:
Implement Tree.annotate_iter for RevisionTree and WorkingTree
------------------------------------------------------------
revno: 2052.1.140
revision-id: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
parent: pqm at pqm.ubuntu.com-20061215154202-8f239c218ab6fe7d
parent: bialix at ukr.net-20061214174644-byo0oj708p1s0t8z
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-12-16 09:36:35 +0000
message:
(bialix) Bugfix #71681: fix of python-based installer postinstall
script
------------------------------------------------------------
revno: 2052.1.132.1.1
revision-id: bialix at ukr.net-20061214174644-byo0oj708p1s0t8z
parent: pqm at pqm.ubuntu.com-20061213191534-c948e178bdeb5d36
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: setup.fixes
timestamp: Thu 2006-12-14 19:46:44 +0200
message:
Bugfix #71681: python-based installer postinstall script:
creating bzr.bat for Python installed at C:\Program Files\PythonXX\
Also remove custom title from python-based installer,
otherwise Add/Remove Programs dialog don't show bzr version.
------------------------------------------------------------
revno: 2052.1.139
revision-id: pqm at pqm.ubuntu.com-20061215154202-8f239c218ab6fe7d
parent: pqm at pqm.ubuntu.com-20061215053913-76fa903ef526647a
parent: john at arbash-meinel.com-20061215152343-me4dn3s2f92yd89o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-15 15:42:02 +0000
message:
(John Arbash Meinel) Fix annotate tests which fail in certain timezones
------------------------------------------------------------
revno: 2052.1.130.3.12
revision-id: john at arbash-meinel.com-20061215152343-me4dn3s2f92yd89o
parent: john at arbash-meinel.com-20061214210902-2o9ipm3xmvdecfh7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Fri 2006-12-15 09:23:43 -0600
message:
Force the timezone properly during tests which look at dates.
------------------------------------------------------------
revno: 2052.1.138
revision-id: pqm at pqm.ubuntu.com-20061215053913-76fa903ef526647a
parent: pqm at pqm.ubuntu.com-20061215030529-9b7ef7eeb5afa695
parent: mbp at sourcefrog.net-20061110055717-d0b21122c03c1301
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-15 05:39:13 +0000
message:
(mbp) restore logging of commandline params (trivial)
------------------------------------------------------------
revno: 2052.1.75.5.1
revision-id: mbp at sourcefrog.net-20061110055717-d0b21122c03c1301
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
committer: mbp at sourcefrog.net
branch nick: log-args
timestamp: Fri 2006-11-10 16:57:17 +1100
message:
record command-line arguments in .bzr.log, drop some mutter statements
------------------------------------------------------------
revno: 2052.1.137
revision-id: pqm at pqm.ubuntu.com-20061215030529-9b7ef7eeb5afa695
parent: pqm at pqm.ubuntu.com-20061214224748-f855091ba12be89b
parent: aaron.bentley at utoronto.ca-20061215024754-u067jln0jl714fpp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-15 03:05:29 +0000
message:
Windows tests cleanup. (Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.136.1.1
revision-id: aaron.bentley at utoronto.ca-20061215024754-u067jln0jl714fpp
parent: pqm at pqm.ubuntu.com-20061214224748-f855091ba12be89b
parent: v.ladeuil+lp at free.fr-20061213093135-vligo314xbpsqkwp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Thu 2006-12-14 21:47:54 -0500
message:
Windows tests cleanup. (Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.106.2.1
revision-id: v.ladeuil+lp at free.fr-20061213093135-vligo314xbpsqkwp
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
committer: v.ladeuil+lp at free.fr
branch nick: bzrw1.1
timestamp: Wed 2006-12-13 10:31:35 +0100
message:
Windows tests cleanup.
* bzrlib/tests/HTTPTestUtil.py:
(BadStatusRequestHandler.parse_request): Catch more exceptions.
* bzrlib/tests/test_http.py:
(RecordingServer._accept_read_and_reply): Catch socket.error in
case client close the socket early.
(TestPost, TestPost_urllib, TestPost_pycurl): Separate urllib and
pycurl tests so that we can test without pycurl installed.
* bzrlib/tests/blackbox/test_mv.py:
Import TestSkipped.
------------------------------------------------------------
revno: 2052.1.136
revision-id: pqm at pqm.ubuntu.com-20061214224748-f855091ba12be89b
parent: pqm at pqm.ubuntu.com-20061214223719-fb91713f52a90393
parent: abentley at panoramicfeedback.com-20061214215428-tp2fi33ff1om12pf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-14 22:47:48 +0000
message:
Describe smart server configuration with mod_python. (Andrew Bennetts)
------------------------------------------------------------
revno: 2052.1.133.1.1
revision-id: abentley at panoramicfeedback.com-20061214215428-tp2fi33ff1om12pf
parent: pqm at pqm.ubuntu.com-20061214182835-a7d577cca2b16908
parent: andrew.bennetts at canonical.com-20061213055711-qsi87138y5udo707
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-12-14 16:54:28 -0500
message:
Describe smart server configuration with mod_python. (Andrew Bennetts)
------------------------------------------------------------
revno: 2052.1.128.2.1
revision-id: andrew.bennetts at canonical.com-20061213055711-qsi87138y5udo707
parent: pqm at pqm.ubuntu.com-20061213004620-1b7fef7dd0db37f0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Wed 2006-12-13 16:57:11 +1100
message:
Describe smart server configuration with mod_python.
------------------------------------------------------------
revno: 2052.1.135
revision-id: pqm at pqm.ubuntu.com-20061214223719-fb91713f52a90393
parent: pqm at pqm.ubuntu.com-20061214222650-3fb161bed571e550
parent: abentley at panoramicfeedback.com-20061214214718-dydr28yhnrea88w8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-14 22:37:19 +0000
message:
add 'hidden-commands' help topic
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.15
revision-id: abentley at panoramicfeedback.com-20061214214718-dydr28yhnrea88w8
parent: abentley at panoramicfeedback.com-20061214214521-88qero0up00n73on
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-14 16:47:18 -0500
message:
Tweak NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.14
revision-id: abentley at panoramicfeedback.com-20061214214521-88qero0up00n73on
parent: abentley at panoramicfeedback.com-20061214201333-6fcxcg58t73kf1od
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-14 16:45:21 -0500
message:
Change topic to hidden-commands
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.13
revision-id: abentley at panoramicfeedback.com-20061214201333-6fcxcg58t73kf1od
parent: abentley at panoramicfeedback.com-20061214200611-ze380gjwfcay6dbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-14 15:13:33 -0500
message:
add "hidden" topic
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.12
revision-id: abentley at panoramicfeedback.com-20061214200611-ze380gjwfcay6dbl
parent: aaron.bentley at utoronto.ca-20061210191434-nwzkupu7gcgd581o
parent: pqm at pqm.ubuntu.com-20061214182835-a7d577cca2b16908
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-12-14 15:06:11 -0500
message:
merge from release
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.11
revision-id: aaron.bentley at utoronto.ca-20061210191434-nwzkupu7gcgd581o
parent: aaron.bentley at utoronto.ca-20061207040634-4j6dz1bpkqcue0tb
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-12-10 14:14:34 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.134
revision-id: pqm at pqm.ubuntu.com-20061214222650-3fb161bed571e550
parent: pqm at pqm.ubuntu.com-20061214182835-a7d577cca2b16908
parent: john at arbash-meinel.com-20061214210902-2o9ipm3xmvdecfh7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-14 22:26:50 +0000
message:
(John Arbash Meinel) Update 'bzr annotate' to show dotted revnos, or revision ids on request
------------------------------------------------------------
revno: 2052.1.130.3.11
revision-id: john at arbash-meinel.com-20061214210902-2o9ipm3xmvdecfh7
parent: john at arbash-meinel.com-20061214205734-r0nwo7vatjoial1k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Thu 2006-12-14 15:09:02 -0600
message:
Update news for --show-ids
------------------------------------------------------------
revno: 2052.1.130.3.10
revision-id: john at arbash-meinel.com-20061214205734-r0nwo7vatjoial1k
parent: john at arbash-meinel.com-20061214021523-u2h4ro3u70uasuq4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Thu 2006-12-14 14:57:34 -0600
message:
minor cleanup.
------------------------------------------------------------
revno: 2052.1.130.3.9
revision-id: john at arbash-meinel.com-20061214021523-u2h4ro3u70uasuq4
parent: john at arbash-meinel.com-20061213231635-oj9fug4280btkjuh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 20:15:23 -0600
message:
Faster annotate --show-ids. No need to pull the history or the revision info
------------------------------------------------------------
revno: 2052.1.130.3.8
revision-id: john at arbash-meinel.com-20061213231635-oj9fug4280btkjuh
parent: john at arbash-meinel.com-20061213225356-eapf9csgalv251ak
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 17:16:35 -0600
message:
Some cleanup to make annotate.py < 79 chars wide.
------------------------------------------------------------
revno: 2052.1.130.3.7
revision-id: john at arbash-meinel.com-20061213225356-eapf9csgalv251ak
parent: john at arbash-meinel.com-20061213223859-ttw5eue25pvrpqy6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 16:53:56 -0600
message:
Cleanup and add blackbox tests for annotate.
------------------------------------------------------------
revno: 2052.1.130.3.6
revision-id: john at arbash-meinel.com-20061213223859-ttw5eue25pvrpqy6
parent: john at arbash-meinel.com-20061213222901-ins26rufyghe0oj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 16:38:59 -0600
message:
Cleanup annotate blackbox tests
------------------------------------------------------------
revno: 2052.1.130.3.5
revision-id: john at arbash-meinel.com-20061213222901-ins26rufyghe0oj0
parent: john at arbash-meinel.com-20061213222327-qikhtcopbp1mf5hg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 16:29:01 -0600
message:
NEWS for fixing bug #75637
------------------------------------------------------------
revno: 2052.1.130.3.4
revision-id: john at arbash-meinel.com-20061213222327-qikhtcopbp1mf5hg
parent: john at arbash-meinel.com-20061213222308-e1cf1r9zhde76l8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 16:23:27 -0600
message:
add show-ids and test that nearby areas are collapsed without full
------------------------------------------------------------
revno: 2052.1.130.3.3
revision-id: john at arbash-meinel.com-20061213222308-e1cf1r9zhde76l8e
parent: john at arbash-meinel.com-20061213190453-s1723p4s3d8lor2v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 16:23:08 -0600
message:
Add tests for annotate with dotted revnos.
------------------------------------------------------------
revno: 2052.1.130.3.2
revision-id: john at arbash-meinel.com-20061213190453-s1723p4s3d8lor2v
parent: john at arbash-meinel.com-20061213185707-hnp484jevsalnnck
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 13:04:53 -0600
message:
Use shortened revnos unless --long is supplied
------------------------------------------------------------
revno: 2052.1.130.3.1
revision-id: john at arbash-meinel.com-20061213185707-hnp484jevsalnnck
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_show_ids
timestamp: Wed 2006-12-13 12:57:07 -0600
message:
Annotate now shows dotted revnos instead of plain revnos.
------------------------------------------------------------
revno: 2052.1.133
revision-id: pqm at pqm.ubuntu.com-20061214182835-a7d577cca2b16908
parent: pqm at pqm.ubuntu.com-20061213191534-c948e178bdeb5d36
parent: bialix at ukr.net-20061214165310-beo524ammrooqjet
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-14 18:28:35 +0000
message:
(bialix) 'bzr selftest --clean-output' remove tests temp directories
without running tests
------------------------------------------------------------
revno: 2052.1.120.4.5
revision-id: bialix at ukr.net-20061214165310-beo524ammrooqjet
parent: bialix at ukr.net-20061214150450-2su023tnlpsahkr4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.cleanup
timestamp: Thu 2006-12-14 18:53:10 +0200
message:
Small fix: output of os.listdir() should be sorted manually
------------------------------------------------------------
revno: 2052.1.120.4.4
revision-id: bialix at ukr.net-20061214150450-2su023tnlpsahkr4
parent: bialix at ukr.net-20061213161032-9u0fuuuebvk72j5w
parent: pqm at pqm.ubuntu.com-20061213191534-c948e178bdeb5d36
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.cleanup
timestamp: Thu 2006-12-14 17:04:50 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.120.4.3
revision-id: bialix at ukr.net-20061213161032-9u0fuuuebvk72j5w
parent: bialix at ukr.net-20061211103459-ty1bzl0p9ba66du3
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.cleanup
timestamp: Wed 2006-12-13 18:10:32 +0200
message:
Change name of option to '--clean-output' and provide tests
------------------------------------------------------------
revno: 2052.1.120.4.2
revision-id: bialix at ukr.net-20061211103459-ty1bzl0p9ba66du3
parent: bialix at ukr.net-20061211084910-o9cpgueegnzabjrv
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.cleanup
timestamp: Mon 2006-12-11 12:34:59 +0200
message:
Update NEWS and help for '--clean' option
------------------------------------------------------------
revno: 2052.1.120.4.1
revision-id: bialix at ukr.net-20061211084910-o9cpgueegnzabjrv
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.cleanup
timestamp: Mon 2006-12-11 10:49:10 +0200
message:
'bzr selftest --clean' allows easily clean temporary tests directories
------------------------------------------------------------
revno: 2052.1.132
revision-id: pqm at pqm.ubuntu.com-20061213191534-c948e178bdeb5d36
parent: pqm at pqm.ubuntu.com-20061213162352-0de9ae3d8d38f95d
parent: abentley at panoramicfeedback.com-20061213172118-pscayc7d4sbvo5uf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 19:15:34 +0000
message:
Make test HTTP server's range handling more spec-compliant (Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.131.1.1
revision-id: abentley at panoramicfeedback.com-20061213172118-pscayc7d4sbvo5uf
parent: pqm at pqm.ubuntu.com-20061213162352-0de9ae3d8d38f95d
parent: v.ladeuil+lp at free.fr-20061213162949-xd0gmdi5uj73l8ya
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-12-13 12:21:18 -0500
message:
Make test HTTP server's range handling more spec-compliant (Vincent Ladeuil)
------------------------------------------------------------
revno: 2052.1.130.2.2
revision-id: v.ladeuil+lp at free.fr-20061213162949-xd0gmdi5uj73l8ya
parent: v.ladeuil+lp at free.fr-20061213122742-ggox22rvx8auzcdo
committer: v.ladeuil+lp at free.fr
branch nick: bzr.73948
timestamp: Wed 2006-12-13 17:29:49 +0100
message:
Thanks again to Aaron, the http server RFC2616 compliance
continue to progress.
* bzrlib/tests/test_http.py:
(TestRanges, TestRanges_urllib, TestRanges_pycurl): New tests
classes for the Range header.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.parse_ranges): RFC2616 says that
'start > end' is a syntax error for a range specifier.
(TestingHTTPRequestHandler.do_GET.check_range): Update
self._satisfiable_ranges, satisfiable_ranges is a free variable.
------------------------------------------------------------
revno: 2052.1.130.2.1
revision-id: v.ladeuil+lp at free.fr-20061213122742-ggox22rvx8auzcdo
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.73948
timestamp: Wed 2006-12-13 13:27:42 +0100
message:
Aaron was right. Thanks to him, the http server RFC2616 compliance
progress.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.parse_ranges): Ignore Range header if
it is syntactically invalid.
(TestingHTTPRequestHandler.do_GET): Better explain why we return a
416 error if ranges are not satisfiable (semantically invalid).
------------------------------------------------------------
revno: 2052.1.131
revision-id: pqm at pqm.ubuntu.com-20061213162352-0de9ae3d8d38f95d
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
parent: abentley at panoramicfeedback.com-20061213150839-plz4yi4zi343vkzf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 16:23:52 +0000
message:
Respect proxy environment settings (Vincent Ladeuil, #74759)
------------------------------------------------------------
revno: 2052.1.130.1.1
revision-id: abentley at panoramicfeedback.com-20061213150839-plz4yi4zi343vkzf
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
parent: v.ladeuil+lp at free.fr-20061212140459-g808yc2gxsavjvx9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-12-13 10:08:39 -0500
message:
Respect proxy environment settings (Vincent Ladeuil, #74759)
------------------------------------------------------------
revno: 2052.1.115.3.7
revision-id: v.ladeuil+lp at free.fr-20061212140459-g808yc2gxsavjvx9
parent: v.ladeuil+lp at free.fr-20061212124955-1b8m2zk2tt54l869
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Tue 2006-12-12 15:04:59 +0100
message:
Typos corrected.
------------------------------------------------------------
revno: 2052.1.115.3.6
revision-id: v.ladeuil+lp at free.fr-20061212124955-1b8m2zk2tt54l869
parent: v.ladeuil+lp at free.fr-20061211132455-e8k81db8ktfwvrlz
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Tue 2006-12-12 13:49:55 +0100
message:
Take John's comments into account and add more tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.get_proxy_env_var): Default to all_proxy if specific
env var is not found.
* bzrlib/tests/test_http.py:
Redesign the tests to be able to test for uppercased envrinoment
variables and all_proxy.
(TestProxyHttpServer.setUp): Initialize some attributes shared by
all tests.
(TestProxyHttpServer_pycurl.setUp): Specialized no_proxy for
pycurl and skip some tests.
* bzrlib/tests/__init__.py:
(TestCase._cleanEnvironment): Includes all proxy related
variables.
* bzrlib/tests/HttpServer.py:
(HttpServer._get_remote_url): No need to check for server thread
initialization here, we do that in setUp now.
(HttpServer.setUp): Explicitely waits for server thread
initialization or weird timing-related bugs occur in the test
suite.
(HttpServer.setUp, HttpServer.tearDown): Leave environment
handling to bzr.tests.TestCase._cleanEnvironment.
------------------------------------------------------------
revno: 2052.1.115.3.5
revision-id: v.ladeuil+lp at free.fr-20061211132455-e8k81db8ktfwvrlz
parent: v.ladeuil+lp at free.fr-20061208164433-bwgtu6ltefmmpfzi
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Mon 2006-12-11 14:24:55 +0100
message:
Tests for proxies, covering #74759.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.proxy_bypass): Matches against the modified regexp,
not the original domain.
* bzrlib/tests/test_http.py:
(TestProxyHttpServer, TestProxyHttpServer_urllib,
TestProxyHttpServer_pycurl): New classes for proxy tests.
* bzrlib/tests/HttpServer.py:
(HttpServer._http_start): Give access to the port used by the
server socket.
(HttpServer.setUp, HttpServer.tearDown): Handles the 'no_proxy'
env var too.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithTwoWebservers): New class for tests needing two
related web servers.
(FakeProxyRequestHandler): New class to fake a proxy http server.
------------------------------------------------------------
revno: 2052.1.115.3.4
revision-id: v.ladeuil+lp at free.fr-20061208164433-bwgtu6ltefmmpfzi
parent: v.ladeuil+lp at free.fr-20061208101841-pqp1yn2viwkdem6y
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Fri 2006-12-08 17:44:33 +0100
message:
Better fix for #74759, but still not tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.proxy_bypass): New method to check if a given host is
proxied or not.
(ProxyHandler.set_proxy): Check no_proxy too.
------------------------------------------------------------
revno: 2052.1.115.3.3
revision-id: v.ladeuil+lp at free.fr-20061208101841-pqp1yn2viwkdem6y
parent: v.ladeuil+lp at free.fr-20061207171150-ga15euunhfrcpkw5
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Fri 2006-12-08 11:18:41 +0100
message:
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.__init__): Reworked to handle the no_proxy env
var. Note that the urllib2 implementation is buggy (it ignores the
no_proxy). This third patch still not fix this issue, it only
ignores no_proxy too ;)
(ProxyHandler.get_proxy): New accessor.
(ProxyHandler.set_proxy): Renamed from set_request_proxy.
------------------------------------------------------------
revno: 2052.1.115.3.2
revision-id: v.ladeuil+lp at free.fr-20061207171150-ga15euunhfrcpkw5
parent: v.ladeuil+lp at free.fr-20061207125916-iaobw8yr8t6p071z
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Thu 2006-12-07 18:11:50 +0100
message:
* bzrlib/transport/http/_urllib2_wrappers.py
(ProxyHandler.set_request_proxy): Fix base64 by Jonh's remark.
------------------------------------------------------------
revno: 2052.1.115.3.1
revision-id: v.ladeuil+lp at free.fr-20061207125916-iaobw8yr8t6p071z
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Thu 2006-12-07 13:59:16 +0100
message:
Fix bug #74759.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler): Properly set the proxy before trying to open the
connection if any proxy is set.
(Opener.__init__): Use our ProxyHandler.
------------------------------------------------------------
revno: 2052.1.130
revision-id: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
parent: pqm at pqm.ubuntu.com-20061213055227-6159e82aef3f15a6
parent: bialix at ukr.net-20061213080830-94aok8iov52k98zw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 09:36:30 +0000
message:
(bialix) Fix selftest report for failed tests and restore formatting
verbose output to fit in terminal width
------------------------------------------------------------
revno: 2052.1.126.3.2
revision-id: bialix at ukr.net-20061213080830-94aok8iov52k98zw
parent: bialix at ukr.net-20061212141359-ih3wfxzhf2epac41
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Wed 2006-12-13 10:08:30 +0200
message:
Small fix after John's review
------------------------------------------------------------
revno: 2052.1.126.3.1
revision-id: bialix at ukr.net-20061212141359-ih3wfxzhf2epac41
parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Tue 2006-12-12 16:13:59 +0200
message:
Fix selftest report for failed tests and restore formatting verbose output to fit in terminal width
------------------------------------------------------------
revno: 2052.1.129
revision-id: pqm at pqm.ubuntu.com-20061213055227-6159e82aef3f15a6
parent: pqm at pqm.ubuntu.com-20061213004620-1b7fef7dd0db37f0
parent: aaron.bentley at utoronto.ca-20061213050719-c7d4iis3sc240qrl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 05:52:27 +0000
message:
Handle short http reads better. (Ladeuil)
------------------------------------------------------------
revno: 2052.1.128.1.2
revision-id: aaron.bentley at utoronto.ca-20061213050719-c7d4iis3sc240qrl
parent: aaron.bentley at utoronto.ca-20061213044014-ovrud8mi4aii2x22
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Wed 2006-12-13 00:07:19 -0500
message:
Grammar fixes
------------------------------------------------------------
revno: 2052.1.128.1.1
revision-id: aaron.bentley at utoronto.ca-20061213044014-ovrud8mi4aii2x22
parent: pqm at pqm.ubuntu.com-20061213004620-1b7fef7dd0db37f0
parent: v.ladeuil+lp at free.fr-20061211081033-8pevgxemh4dtuwsk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Tue 2006-12-12 23:40:14 -0500
message:
Merge short read fixes
------------------------------------------------------------
revno: 2052.1.120.3.2
revision-id: v.ladeuil+lp at free.fr-20061211081033-8pevgxemh4dtuwsk
parent: v.ladeuil+lp at free.fr-20061208175742-ki7ztka2ozv3p2ki
committer: v.ladeuil+lp at free.fr
branch nick: bzr.73948
timestamp: Mon 2006-12-11 09:10:33 +0100
message:
Fix the missing import and typos in comments.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): Explain why we re-raise the
original exception.
------------------------------------------------------------
revno: 2052.1.120.3.1
revision-id: v.ladeuil+lp at free.fr-20061208175742-ki7ztka2ozv3p2ki
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
parent: v.ladeuil+lp at free.fr-20061201151429-l84e47xqynm1pfzm
committer: v.ladeuil+lp at free.fr
branch nick: bzr.73948
timestamp: Fri 2006-12-08 18:57:42 +0100
message:
Merge a recent bzr.dev (2172) and takes John's remarks into account.
------------------------------------------------------------
revno: 2000.3.10
revision-id: v.ladeuil+lp at free.fr-20061201151429-l84e47xqynm1pfzm
parent: v.ladeuil+lp at free.fr-20061201150629-zjd2an87u0r7nhhw
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Fri 2006-12-01 16:14:29 +0100
message:
Update NEWS.
------------------------------------------------------------
revno: 2000.3.9
revision-id: v.ladeuil+lp at free.fr-20061201150629-zjd2an87u0r7nhhw
parent: v.ladeuil+lp at free.fr-20061130174947-gsx0zu8d50jdy0j2
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Fri 2006-12-01 16:06:29 +0100
message:
The tests that would have help avoid bug #73948 and all that mess :)
* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.
* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.
* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).
------------------------------------------------------------
revno: 2052.1.128
revision-id: pqm at pqm.ubuntu.com-20061213004620-1b7fef7dd0db37f0
parent: pqm at pqm.ubuntu.com-20061212162959-cd3c77ebe8d57759
parent: jelmer at samba.org-20061212224001-3ljlrqvd0k3zc675
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 00:46:20 +0000
message:
Two small fixes
------------------------------------------------------------
revno: 2052.1.126.2.2
revision-id: jelmer at samba.org-20061212224001-3ljlrqvd0k3zc675
parent: jelmer at samba.org-20061212152642-7hm3wqelvrrel5hv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-12-12 23:40:01 +0100
message:
Make add_path() return inventory entry for root just like it does for other entries.
------------------------------------------------------------
revno: 2052.1.126.2.1
revision-id: jelmer at samba.org-20061212152642-7hm3wqelvrrel5hv
parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-12-12 16:26:42 +0100
message:
Fix exception arguments.
------------------------------------------------------------
revno: 2052.1.127
revision-id: pqm at pqm.ubuntu.com-20061212162959-cd3c77ebe8d57759
parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
parent: john at arbash-meinel.com-20061212150910-yxyy4ioaclh6z7m8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 16:29:59 +0000
message:
(Kent Gibson, Jan Hudec) Better glob pattern matcher (fixes bug #57637)
------------------------------------------------------------
revno: 2052.1.126.1.1
revision-id: john at arbash-meinel.com-20061212150910-yxyy4ioaclh6z7m8
parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
parent: warthog618 at gmail.com-20061208141116-0mrpch4psu1x82uo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-12-12 09:09:10 -0600
message:
(Kent Gibson, Jan Hudec) Better glob pattern matcher (fixes bug #57637)
------------------------------------------------------------
revno: 2052.1.83.2.8
revision-id: warthog618 at gmail.com-20061208141116-0mrpch4psu1x82uo
parent: warthog618 at gmail.com-20061208125911-wsnbxy7aydzjb47s
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Fri 2006-12-08 22:11:16 +0800
message:
Add helper method to simplify test_char_group cases.
------------------------------------------------------------
revno: 2052.1.83.2.7
revision-id: warthog618 at gmail.com-20061208125911-wsnbxy7aydzjb47s
parent: warthog618 at gmail.com-20061128180141-t8c0wcj2hh4gluxe
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Fri 2006-12-08 20:59:11 +0800
message:
Implement JAM's review suggestions.
------------------------------------------------------------
revno: 2052.1.83.2.6
revision-id: warthog618 at gmail.com-20061128180141-t8c0wcj2hh4gluxe
parent: warthog618 at gmail.com-20061128174231-b603629ca23ff1bc
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Wed 2006-11-29 02:01:41 +0800
message:
Removed unecessary import.
------------------------------------------------------------
revno: 2052.1.83.2.5
revision-id: warthog618 at gmail.com-20061128174231-b603629ca23ff1bc
parent: warthog618 at gmail.com-20061128172448-qxgw64v9p555asin
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Wed 2006-11-29 01:42:31 +0800
message:
Update ignore help to remove case-insensitive comment.
------------------------------------------------------------
revno: 2052.1.83.2.4
revision-id: warthog618 at gmail.com-20061128172448-qxgw64v9p555asin
parent: warthog618 at gmail.com-20061128171121-d67b3e57f5664c5f
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Wed 2006-11-29 01:24:48 +0800
message:
Reverted case-insensitive matches on case-insensitive platforms.
------------------------------------------------------------
revno: 2052.1.83.2.3
revision-id: warthog618 at gmail.com-20061128171121-d67b3e57f5664c5f
parent: warthog618 at gmail.com-20061128170136-b11d15f1de7992af
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Wed 2006-11-29 01:11:21 +0800
message:
Revert unnecessary change to test_mixed_is_ignored.
------------------------------------------------------------
revno: 2052.1.83.2.2
revision-id: warthog618 at gmail.com-20061128170136-b11d15f1de7992af
parent: warthog618 at gmail.com-20061113141356-kdfo22erpow15g4k
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Wed 2006-11-29 01:01:36 +0800
message:
Ignore pattern matcher (glob.py) patches:
- '*' now matches leading '.' as per fnmatch.
- Support '**' extension as per zsh.
- fixed case-insensitive match on case-insensitive platforms.
- Updated NEWS.
------------------------------------------------------------
revno: 2052.1.83.2.1
revision-id: warthog618 at gmail.com-20061113141356-kdfo22erpow15g4k
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp57637
timestamp: Mon 2006-11-13 22:13:56 +0800
message:
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
------------------------------------------------------------
revno: 2052.1.126
revision-id: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
parent: pqm at pqm.ubuntu.com-20061212022839-782ee5cf2ddd2647
parent: bialix at ukr.net-20061211075703-83j2my7fzzg806ur
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 12:34:32 +0000
message:
(bialix) Remove unnecessary duplication of tests in blackbox/test_diff.py
------------------------------------------------------------
revno: 2052.1.120.2.1
revision-id: bialix at ukr.net-20061211075703-83j2my7fzzg806ur
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Mon 2006-12-11 09:57:03 +0200
message:
Remove unnecessary duplication of tests in blackbox/test_diff.py
------------------------------------------------------------
revno: 2052.1.125
revision-id: pqm at pqm.ubuntu.com-20061212022839-782ee5cf2ddd2647
parent: pqm at pqm.ubuntu.com-20061212012340-551f901e5bf27fc9
parent: john at arbash-meinel.com-20061212021213-wq6uydm0m7ongog7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 02:28:39 +0000
message:
(John Arbash Meinel) Tune fileids_altered_by_revision_ids
------------------------------------------------------------
revno: 2052.1.111.1.5
revision-id: john at arbash-meinel.com-20061212021213-wq6uydm0m7ongog7
parent: john at arbash-meinel.com-20061207001500-c321azsrfj051wvh
parent: john at arbash-meinel.com-20061206205657-7kh0kha5mnl9v9oa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Mon 2006-12-11 20:12:13 -0600
message:
(John Arbash Meinel) Tune fileids_altered_by_revision_ids
------------------------------------------------------------
revno: 2052.1.111.1.2.1.1
revision-id: john at arbash-meinel.com-20061206205657-7kh0kha5mnl9v9oa
parent: john at arbash-meinel.com-20061206203055-sxf30mwnwdl0wbi9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 14:56:57 -0600
message:
Speed up the fileids_altered_by_revision_ids processing
------------------------------------------------------------
revno: 2052.1.124
revision-id: pqm at pqm.ubuntu.com-20061212012340-551f901e5bf27fc9
parent: pqm at pqm.ubuntu.com-20061212011216-bad8d10eb41c2f6c
parent: larstiq at larstiq.dyndns.org-20061212003955-b1cx95tv6xmc6efk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 01:23:40 +0000
message:
(Wouter van Heyst) ``bzr cat`` now works on remote urls (#73500).
------------------------------------------------------------
revno: 2052.1.106.1.2
revision-id: larstiq at larstiq.dyndns.org-20061212003955-b1cx95tv6xmc6efk
parent: larstiq at larstiq.dyndns.org-20061130225822-tagecep0mbdu9rmh
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: remote-cat-73500
timestamp: Tue 2006-12-12 01:39:55 +0100
message:
Actually check if cat returns the right content.
------------------------------------------------------------
revno: 2052.1.106.1.1
revision-id: larstiq at larstiq.dyndns.org-20061130225822-tagecep0mbdu9rmh
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: remote-cat-73500
timestamp: Thu 2006-11-30 23:58:22 +0100
message:
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
------------------------------------------------------------
revno: 2052.1.123
revision-id: pqm at pqm.ubuntu.com-20061212011216-bad8d10eb41c2f6c
parent: pqm at pqm.ubuntu.com-20061212003635-60d7dad38f39d19b
parent: aaron.bentley at utoronto.ca-20061212005936-mj9ck6tb0w559xxr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 01:12:16 +0000
message:
Aliases can contain quotes
------------------------------------------------------------
revno: 2052.1.120.1.3
revision-id: aaron.bentley at utoronto.ca-20061212005936-mj9ck6tb0w559xxr
parent: aaron.bentley at utoronto.ca-20061212000150-zu61bykx30bin2yw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Mon 2006-12-11 19:59:36 -0500
message:
Rename test_commands in the test suite
------------------------------------------------------------
revno: 2052.1.120.1.2
revision-id: aaron.bentley at utoronto.ca-20061212000150-zu61bykx30bin2yw
parent: aaron.bentley at utoronto.ca-20061212000015-ogni1d4lcfef673m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Mon 2006-12-11 19:01:50 -0500
message:
Add NEWS update
------------------------------------------------------------
revno: 2052.1.120.1.1
revision-id: aaron.bentley at utoronto.ca-20061212000015-ogni1d4lcfef673m
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
parent: amanic at gmail.com-20061130044655-7c7fd3c300853371
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Mon 2006-12-11 19:00:15 -0500
message:
Merge shell-like quote handling for aliases
------------------------------------------------------------
revno: 2052.1.103.2.4
revision-id: amanic at gmail.com-20061130044655-7c7fd3c300853371
parent: amanic at gmail.com-20061130044623-f0968c087cc9e7a8
parent: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.alias_quotes
timestamp: Thu 2006-11-30 06:46:55 +0200
message:
merge with bzr.dev
------------------------------------------------------------
revno: 2052.1.103.2.3
revision-id: amanic at gmail.com-20061130044623-f0968c087cc9e7a8
parent: amanic at gmail.com-20061129063210-aa51b52e1e83042d
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.alias_quotes
timestamp: Thu 2006-11-30 06:46:23 +0200
message:
* commands.py
- fixed spelling mistake: usefull -> useful
* test_commands.py
- Fixed import order to be alphabetical.
- Added whitespace as requested.
- Renamed __get_config to _get_config
------------------------------------------------------------
revno: 2052.1.103.2.2
revision-id: amanic at gmail.com-20061129063210-aa51b52e1e83042d
parent: amanic at gmail.com-20061129062442-d42de186c44e310d
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.alias_quotes
timestamp: Wed 2006-11-29 08:32:10 +0200
message:
Renamed test_command.py to test_commands.py
in order to stick to the hacking guidelines
and to avoid confusion.
------------------------------------------------------------
revno: 2052.1.103.2.1
revision-id: amanic at gmail.com-20061129062442-d42de186c44e310d
parent: pqm at pqm.ubuntu.com-20061128231925-6a90ea4334844dc4
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.alias_quotes
timestamp: Wed 2006-11-29 08:24:42 +0200
message:
* Get command aliases to respect quoted arguments.
* Removed some trailing white space from commands.py
* Added regression tests for commands.py get_alias
------------------------------------------------------------
revno: 2052.1.122
revision-id: pqm at pqm.ubuntu.com-20061212003635-60d7dad38f39d19b
parent: pqm at pqm.ubuntu.com-20061212002528-87297ad66899257e
parent: john at arbash-meinel.com-20061207231834-zm3x2s92dvwy4ny3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 00:36:35 +0000
message:
(John Arbash Meinel) Knit index objects should ignore empty index files.
------------------------------------------------------------
revno: 2052.1.119.1.1
revision-id: john at arbash-meinel.com-20061207231834-zm3x2s92dvwy4ny3
parent: pqm at pqm.ubuntu.com-20061207213919-1cc5d101c30fda65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit-ignore-empty-files
timestamp: Thu 2006-12-07 17:18:34 -0600
message:
Knit index files should ignore empty indexes rather than consider them corrupt.
------------------------------------------------------------
revno: 2052.1.121
revision-id: pqm at pqm.ubuntu.com-20061212002528-87297ad66899257e
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
parent: john at arbash-meinel.com-20061211192513-u9ivkqwkp8j3v2i5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-12 00:25:28 +0000
message:
(John Arbash Meinel) Switch the XML5 serializer to use millisecond timestamps
------------------------------------------------------------
revno: 2052.1.50.4.4
revision-id: john at arbash-meinel.com-20061211192513-u9ivkqwkp8j3v2i5
parent: john at arbash-meinel.com-20061115021112-is2gey9r6xf4off3
parent: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_ms
timestamp: Mon 2006-12-11 13:25:13 -0600
message:
[merge] bzr.dev 2172 and move NEWS to the correct location
------------------------------------------------------------
revno: 2052.1.50.4.3
revision-id: john at arbash-meinel.com-20061115021112-is2gey9r6xf4off3
parent: john at arbash-meinel.com-20061114222522-m8de95ixceqc92wz
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_ms
timestamp: Tue 2006-11-14 18:11:12 -0800
message:
[merge] bzr.dev 2135
------------------------------------------------------------
revno: 2052.1.50.4.2
revision-id: john at arbash-meinel.com-20061114222522-m8de95ixceqc92wz
parent: john at arbash-meinel.com-20061112150127-b30998fd8c62c805
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_ms
timestamp: Tue 2006-11-14 14:25:22 -0800
message:
NEWS
------------------------------------------------------------
revno: 2052.1.50.4.1
revision-id: john at arbash-meinel.com-20061112150127-b30998fd8c62c805
parent: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_ms
timestamp: Sun 2006-11-12 09:01:27 -0600
message:
Switch to using millisecond resolution in Revision XML
------------------------------------------------------------
revno: 2052.1.120
revision-id: pqm at pqm.ubuntu.com-20061208100138-33b6d8665ca29dad
parent: pqm at pqm.ubuntu.com-20061207213919-1cc5d101c30fda65
parent: bialix at ukr.net-20061207161736-qjnzey52f9uclj18
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-08 10:01:38 +0000
message:
(bialix) support for win32 UNC path (bug #57869)
------------------------------------------------------------
revno: 2052.1.110.2.8
revision-id: bialix at ukr.net-20061207161736-qjnzey52f9uclj18
parent: bialix at ukr.net-20061207161724-7n4o930k2xl7vt0m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Thu 2006-12-07 18:17:36 +0200
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.110.2.7
revision-id: bialix at ukr.net-20061207161724-7n4o930k2xl7vt0m
parent: bialix at ukr.net-20061207161623-2yw05sjrahm00bb8
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Thu 2006-12-07 18:17:24 +0200
message:
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
------------------------------------------------------------
revno: 2052.1.110.2.6
revision-id: bialix at ukr.net-20061207161623-2yw05sjrahm00bb8
parent: bialix at ukr.net-20061207123036-ueqfwwnzorrt7s81
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Thu 2006-12-07 18:16:23 +0200
message:
Change tests for win32 UNC path to new file://HOST/path scheme
------------------------------------------------------------
revno: 2052.1.110.2.5
revision-id: bialix at ukr.net-20061207123036-ueqfwwnzorrt7s81
parent: bialix at ukr.net-20061205084157-uny1hev9uj6xfdus
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Thu 2006-12-07 14:30:36 +0200
message:
Expand test_win32_unc_path_to_url to check unicode
------------------------------------------------------------
revno: 2052.1.110.2.4
revision-id: bialix at ukr.net-20061205084157-uny1hev9uj6xfdus
parent: bialix at ukr.net-20061205083934-u1gwfs3lgun65zma
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Tue 2006-12-05 10:41:57 +0200
message:
Update NEWS
------------------------------------------------------------
revno: 2052.1.110.2.3
revision-id: bialix at ukr.net-20061205083934-u1gwfs3lgun65zma
parent: bialix at ukr.net-20061205082554-q20iann59if299hf
parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Tue 2006-12-05 10:39:34 +0200
message:
merge bzr.dev (post 0.13)
------------------------------------------------------------
revno: 2052.1.110.2.2
revision-id: bialix at ukr.net-20061205082554-q20iann59if299hf
parent: bialix at ukr.net-20061205082542-75u09rv7dee41mhh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Tue 2006-12-05 10:25:54 +0200
message:
Support for win32 UNC path (like: \\HOST\path)
------------------------------------------------------------
revno: 2052.1.110.2.1
revision-id: bialix at ukr.net-20061205082542-75u09rv7dee41mhh
parent: pqm at pqm.ubuntu.com-20061202044519-b51893edd371d01d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.unc-path
timestamp: Tue 2006-12-05 10:25:42 +0200
message:
Testing UNC path conversion
------------------------------------------------------------
revno: 2052.1.119
revision-id: pqm at pqm.ubuntu.com-20061207213919-1cc5d101c30fda65
parent: pqm at pqm.ubuntu.com-20061207174618-7064db4cb4611ab9
parent: john at arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 21:39:19 +0000
message:
(Keir Mierle) Add support for 'bzr status --short'
------------------------------------------------------------
revno: 2052.1.116.1.3
revision-id: john at arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
parent: john at arbash-meinel.com-20061207183055-h2snud1gnlgqe8x1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-07 14:25:00 -0600
message:
The logic for when to display 'C' for conflicts was inverted.
------------------------------------------------------------
revno: 2052.1.116.1.2
revision-id: john at arbash-meinel.com-20061207183055-h2snud1gnlgqe8x1
parent: john at arbash-meinel.com-20061207171528-sf21rpho9q4eprjl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-07 12:30:55 -0600
message:
The texts expected 2 blank spaces after P, so give it to them.
------------------------------------------------------------
revno: 2052.1.116.1.1
revision-id: john at arbash-meinel.com-20061207171528-sf21rpho9q4eprjl
parent: pqm at pqm.ubuntu.com-20061207171034-52cf2b54efbbcb45
parent: keir at cs.utoronto.ca-20061201103121-hm378qglop3v07w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-07 11:15:28 -0600
message:
(Keir Mierle) Add support for 'bzr status --short'
------------------------------------------------------------
revno: 2052.1.95.2.4
revision-id: keir at cs.utoronto.ca-20061201103121-hm378qglop3v07w9
parent: keir at cs.utoronto.ca-20061201102613-1k4mlkve9sducabw
committer: Keir Mierle <keir at cs.utoronto.ca>
branch nick: bzr.shortstatus
timestamp: Fri 2006-12-01 05:31:21 -0500
message:
Make changes suggested by Aaron Bently
------------------------------------------------------------
revno: 2052.1.95.2.3
revision-id: keir at cs.utoronto.ca-20061201102613-1k4mlkve9sducabw
parent: keir at cs.utoronto.ca-20061123185625-ndto53ylcb8zo1y6
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
committer: Keir Mierle <keir at cs.utoronto.ca>
branch nick: bzr.shortstatus
timestamp: Fri 2006-12-01 05:26:13 -0500
message:
Merge from upstream
------------------------------------------------------------
revno: 2052.1.95.2.2
revision-id: keir at cs.utoronto.ca-20061123185625-ndto53ylcb8zo1y6
parent: keir at cs.utoronto.ca-20061122083620-jsqvusdnnxfmmvd3
committer: Keir Mierle <keir at cs.utoronto.ca>
branch nick: bzr.shortstatus
timestamp: Thu 2006-11-23 13:56:25 -0500
message:
Fix spacing error and add tests for status --short command flag.
------------------------------------------------------------
revno: 2052.1.95.2.1
revision-id: keir at cs.utoronto.ca-20061122083620-jsqvusdnnxfmmvd3
parent: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
committer: Keir Mierle <keir at cs.utoronto.ca>
branch nick: bzr.shortstatus
timestamp: Wed 2006-11-22 03:36:20 -0500
message:
Add a --short flag to status to get svn-style status
------------------------------------------------------------
revno: 2052.1.118
revision-id: pqm at pqm.ubuntu.com-20061207174618-7064db4cb4611ab9
parent: pqm at pqm.ubuntu.com-20061207172051-43fe52677c8dfb85
parent: abentley at panoramicfeedback.com-20061207161825-bg1cl9ji1mwpluqo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 17:46:18 +0000
message:
Fix pulling bundles over http
------------------------------------------------------------
revno: 2052.1.115.2.2
revision-id: abentley at panoramicfeedback.com-20061207161825-bg1cl9ji1mwpluqo
parent: abentley at panoramicfeedback.com-20061207153026-443kh4znfmeoo3bg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: pull-bundle
timestamp: Thu 2006-12-07 11:18:25 -0500
message:
Update safe character list
------------------------------------------------------------
revno: 2052.1.115.2.1
revision-id: abentley at panoramicfeedback.com-20061207153026-443kh4znfmeoo3bg
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: pull-bundle
timestamp: Thu 2006-12-07 10:30:26 -0500
message:
Fix reading bundles from http URLs
------------------------------------------------------------
revno: 2052.1.117
revision-id: pqm at pqm.ubuntu.com-20061207172051-43fe52677c8dfb85
parent: pqm at pqm.ubuntu.com-20061207171034-52cf2b54efbbcb45
parent: aaron.bentley at utoronto.ca-20061207040634-4j6dz1bpkqcue0tb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 17:20:51 +0000
message:
Fix bugs in execute bit handling by revert
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.10
revision-id: aaron.bentley at utoronto.ca-20061207040634-4j6dz1bpkqcue0tb
parent: aaron.bentley at utoronto.ca-20061207031048-hvrjcf2a32lys8l9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-12-06 23:06:34 -0500
message:
Fix bugs in execute bit handling by revert
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.9
revision-id: aaron.bentley at utoronto.ca-20061207031048-hvrjcf2a32lys8l9
parent: abentley at panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-12-06 22:10:48 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.116
revision-id: pqm at pqm.ubuntu.com-20061207171034-52cf2b54efbbcb45
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
parent: john at arbash-meinel.com-20061207162650-3q502gu2qlxyro4u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 17:10:34 +0000
message:
(James Henstridge) Add support for per-entry configuration policy.
------------------------------------------------------------
revno: 2052.1.115.1.2
revision-id: john at arbash-meinel.com-20061207162650-3q502gu2qlxyro4u
parent: john at arbash-meinel.com-20061207162139-c2jh91j00430ij9p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-07 10:26:50 -0600
message:
Add a reasonable NEWS entry for the new feature.
------------------------------------------------------------
revno: 2052.1.115.1.1
revision-id: john at arbash-meinel.com-20061207162139-c2jh91j00430ij9p
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
parent: james at jamesh.id.au-20061207154536-dlb8iffz100euegp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-12-07 10:21:39 -0600
message:
(James Henstridge) Add support for per-entry configuration policy.
------------------------------------------------------------
revno: 2052.1.68.6.11
revision-id: james at jamesh.id.au-20061207154536-dlb8iffz100euegp
parent: james at jamesh.id.au-20061117210806-84bc78c735ad2d30
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Thu 2006-12-07 23:45:36 +0800
message:
s/0.13/0.14/ in deprecation warning
------------------------------------------------------------
revno: 2052.1.68.6.10
revision-id: james at jamesh.id.au-20061117210806-84bc78c735ad2d30
parent: james at jamesh.id.au-20061117204930-818596a2e57befcb
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Fri 2006-11-17 13:08:06 -0800
message:
Catch another deprecation warning, and more cleanup
------------------------------------------------------------
revno: 2052.1.68.6.9
revision-id: james at jamesh.id.au-20061117204930-818596a2e57befcb
parent: james at jamesh.id.au-20061110090802-74a368649fd1415a
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Fri 2006-11-17 12:49:30 -0800
message:
Fixes for issues brought up in John's review
------------------------------------------------------------
revno: 2052.1.68.6.8
revision-id: james at jamesh.id.au-20061110090802-74a368649fd1415a
parent: james at jamesh.id.au-20061107095118-050f4b31332ff5ef
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Fri 2006-11-10 17:08:02 +0800
message:
Change syntax for setting config option policies. Rather than
"policy_foo = option_name", we have "option_name:policy = foo"
------------------------------------------------------------
revno: 2052.1.68.6.7
revision-id: james at jamesh.id.au-20061107095118-050f4b31332ff5ef
parent: james at jamesh.id.au-20061107091701-d2cee0129b0317c6
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 17:51:18 +0800
message:
Fix GlobalConfig.set_user_option() call
------------------------------------------------------------
revno: 2052.1.68.6.6
revision-id: james at jamesh.id.au-20061107091701-d2cee0129b0317c6
parent: james at jamesh.id.au-20061107073720-fe76e52153d57318
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 17:17:01 +0800
message:
fix test_set_push_location test
------------------------------------------------------------
revno: 2052.1.68.6.5
revision-id: james at jamesh.id.au-20061107073720-fe76e52153d57318
parent: james at jamesh.id.au-20061107071558-f39bb86f8ef5de7c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 15:37:20 +0800
message:
remove commented out code from _get_matching_sections()
------------------------------------------------------------
revno: 2052.1.68.6.4
revision-id: james at jamesh.id.au-20061107071558-f39bb86f8ef5de7c
parent: james at jamesh.id.au-20061107061937-030710a0d283ff77
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 15:15:58 +0800
message:
add support for specifying policy when storing options
------------------------------------------------------------
revno: 2052.1.68.6.3
revision-id: james at jamesh.id.au-20061107061937-030710a0d283ff77
parent: james at jamesh.id.au-20061107040540-124a18aa9b6a8488
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 14:19:37 +0800
message:
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies
------------------------------------------------------------
revno: 2052.1.68.6.2
revision-id: james at jamesh.id.au-20061107040540-124a18aa9b6a8488
parent: james at jamesh.id.au-20061107035242-feb01ebb49de1b30
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 12:05:40 +0800
message:
remove get_matching_sections() norecurse tests, since that feature is handled in the config policy code now
------------------------------------------------------------
revno: 2052.1.68.6.1
revision-id: james at jamesh.id.au-20061107035242-feb01ebb49de1b30
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.config-policy
timestamp: Tue 2006-11-07 11:52:42 +0800
message:
add support for norecurse and appendpath policies when reading configuration files
------------------------------------------------------------
revno: 2052.1.115
revision-id: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
parent: pqm at pqm.ubuntu.com-20061207003914-bf8654bb0efe51df
parent: john at arbash-meinel.com-20061207002908-85o7wr6y18vyj0r6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 00:51:13 +0000
message:
(Robert Collins) Support a real unicode revision id, and add tests that it will work.
------------------------------------------------------------
revno: 2052.1.112.1.2
revision-id: john at arbash-meinel.com-20061207002908-85o7wr6y18vyj0r6
parent: john at arbash-meinel.com-20061207001939-1oq378it4xlqtenq
parent: robertc at robertcollins.net-20061128015631-a8dc1a6660276b9a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-12-06 18:29:08 -0600
message:
[merge] Robert Collins: Add tests for unicode revision id support.
------------------------------------------------------------
revno: 2052.1.98.2.2
revision-id: robertc at robertcollins.net-20061128015631-a8dc1a6660276b9a
parent: robertc at robertcollins.net-20061128010415-b004ee4bfebfad9c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: stricter-repository-unicode-tests
timestamp: Tue 2006-11-28 12:56:31 +1100
message:
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr.
------------------------------------------------------------
revno: 2052.1.114
revision-id: pqm at pqm.ubuntu.com-20061207003914-bf8654bb0efe51df
parent: pqm at pqm.ubuntu.com-20061207002721-e05ac84b7a1822d1
parent: john at arbash-meinel.com-20061207001939-1oq378it4xlqtenq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 00:39:14 +0000
message:
(Robert Collins) Knit Indices should decode their revision ids
------------------------------------------------------------
revno: 2052.1.112.1.1
revision-id: john at arbash-meinel.com-20061207001939-1oq378it4xlqtenq
parent: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
parent: robertc at robertcollins.net-20061128010415-b004ee4bfebfad9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-12-06 18:19:39 -0600
message:
[merge] Robert Collins: knits should decode their revision ids.
------------------------------------------------------------
revno: 2052.1.98.2.1
revision-id: robertc at robertcollins.net-20061128010415-b004ee4bfebfad9c
parent: pqm at pqm.ubuntu.com-20061126153508-40a2ce4d019aefea
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-index
timestamp: Tue 2006-11-28 12:04:15 +1100
message:
Correctly decode utf8 revision ids from knits when parsing, fixes a regression where a unicode revision id is stored correctly, but then indexed by the utf8 value on the next invocation of bzr, rather than the unicode value.
------------------------------------------------------------
revno: 2052.1.113
revision-id: pqm at pqm.ubuntu.com-20061207002721-e05ac84b7a1822d1
parent: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
parent: john at arbash-meinel.com-20061207001500-c321azsrfj051wvh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 00:27:21 +0000
message:
(John Arbash Meinel) Fix iter_lines_added... to speed up fetch times.
------------------------------------------------------------
revno: 2052.1.111.1.4
revision-id: john at arbash-meinel.com-20061207001500-c321azsrfj051wvh
parent: john at arbash-meinel.com-20061206233319-7u4to4uhrfu7poxj
parent: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Wed 2006-12-06 18:15:00 -0600
message:
[merge] bzr.dev 2164
------------------------------------------------------------
revno: 2052.1.111.1.3
revision-id: john at arbash-meinel.com-20061206233319-7u4to4uhrfu7poxj
parent: john at arbash-meinel.com-20061206203055-sxf30mwnwdl0wbi9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered_merged
timestamp: Wed 2006-12-06 17:33:19 -0600
message:
NEWS
------------------------------------------------------------
revno: 2052.1.111.1.2
revision-id: john at arbash-meinel.com-20061206203055-sxf30mwnwdl0wbi9
parent: john at arbash-meinel.com-20061206202041-wjwerfp3528zakv0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 14:30:55 -0600
message:
Don't modify the list during parse_line_delta
------------------------------------------------------------
revno: 2052.1.111.1.1
revision-id: john at arbash-meinel.com-20061206202041-wjwerfp3528zakv0
parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fileids_altered
timestamp: Wed 2006-12-06 14:20:41 -0600
message:
Use a set to make iter_lines_added_or_present *much* faster
------------------------------------------------------------
revno: 2052.1.112
revision-id: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
parent: abentley at panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-06 02:15:29 +0000
message:
Add --text parameter to conflicts
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.8
revision-id: abentley at panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
parent: abentley at panoramicfeedback.com-20061205220514-elno4ql3b8b6thr3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-12-05 17:15:51 -0500
message:
Add --text parameter to conflicts
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.7
revision-id: abentley at panoramicfeedback.com-20061205220514-elno4ql3b8b6thr3
parent: abentley at panoramicfeedback.com-20061128215647-h3eshzyuchz6q1p1
parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-12-05 17:05:14 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.111
revision-id: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
parent: pqm at pqm.ubuntu.com-20061202044519-b51893edd371d01d
parent: larstiq at larstiq.dyndns.org-20061205001738-q8si9mhrypk5d78e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-05 00:31:50 +0000
message:
(Wouter van Heyst) Update bzr.dev for 0.13.0-final.
------------------------------------------------------------
revno: 2052.1.110.1.1
revision-id: larstiq at larstiq.dyndns.org-20061205001738-q8si9mhrypk5d78e
parent: pqm at pqm.ubuntu.com-20061202044519-b51893edd371d01d
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Tue 2006-12-05 01:17:38 +0100
message:
Merge 0.13 NEWS entry.
------------------------------------------------------------
revno: 2052.1.110
revision-id: pqm at pqm.ubuntu.com-20061202044519-b51893edd371d01d
parent: pqm at pqm.ubuntu.com-20061201214905-0b9aa95ca507ed20
parent: aaron.bentley at utoronto.ca-20061202043116-dqm7f6nvybi03sj2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-12-02 04:45:19 +0000
message:
New low-level interface for determining differences between trees
------------------------------------------------------------
revno: 2012.1.18
revision-id: aaron.bentley at utoronto.ca-20061202043116-dqm7f6nvybi03sj2
parent: aaron.bentley at utoronto.ca-20061128062625-qht3d2a686fzo7xc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Fri 2006-12-01 23:31:16 -0500
message:
rename fs param to stat_value
------------------------------------------------------------
revno: 2012.1.17
revision-id: aaron.bentley at utoronto.ca-20061128062625-qht3d2a686fzo7xc
parent: aaron.bentley at utoronto.ca-20061128054325-gkhwgmkpg128evxu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Tue 2006-11-28 01:26:25 -0500
message:
Use inventory for comparison, to avoid unwanted stats
------------------------------------------------------------
revno: 2012.1.16
revision-id: aaron.bentley at utoronto.ca-20061128054325-gkhwgmkpg128evxu
parent: aaron.bentley at utoronto.ca-20061128045203-qnki9vf702jnb0gr
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Tue 2006-11-28 00:43:25 -0500
message:
Support progress bars in iter_changes
------------------------------------------------------------
revno: 2012.1.15
revision-id: aaron.bentley at utoronto.ca-20061128045203-qnki9vf702jnb0gr
parent: aaron.bentley at utoronto.ca-20061128040535-akirmje66cdnsclg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Mon 2006-11-27 23:52:03 -0500
message:
Minor tweaks
------------------------------------------------------------
revno: 2012.1.14
revision-id: aaron.bentley at utoronto.ca-20061128040535-akirmje66cdnsclg
parent: aaron.bentley at utoronto.ca-20061128040421-3ofogqnfzecou99p
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Mon 2006-11-27 23:05:35 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2012.1.13
revision-id: aaron.bentley at utoronto.ca-20061128040421-3ofogqnfzecou99p
parent: aaron.bentley at utoronto.ca-20061128022527-aud33onhz3oq3zf4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Mon 2006-11-27 23:04:21 -0500
message:
Optimize revert
------------------------------------------------------------
revno: 2012.1.12
revision-id: aaron.bentley at utoronto.ca-20061128022527-aud33onhz3oq3zf4
parent: aaron.bentley at utoronto.ca-20061117070638-ujbzfnqwi43gc6ef
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Mon 2006-11-27 21:25:27 -0500
message:
Use iter_changes for revert
------------------------------------------------------------
revno: 2012.1.11
revision-id: aaron.bentley at utoronto.ca-20061117070638-ujbzfnqwi43gc6ef
parent: aaron.bentley at utoronto.ca-20061117065959-x81f1iu6uxar1iar
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Fri 2006-11-17 02:06:38 -0500
message:
Remove unused function
------------------------------------------------------------
revno: 2012.1.10
revision-id: aaron.bentley at utoronto.ca-20061117065959-x81f1iu6uxar1iar
parent: aaron.bentley at utoronto.ca-20061117051445-h2bspw0ejtb8rnfe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Fri 2006-11-17 01:59:59 -0500
message:
Make iter_changes private, so it can be changed freely
------------------------------------------------------------
revno: 2012.1.9
revision-id: aaron.bentley at utoronto.ca-20061117051445-h2bspw0ejtb8rnfe
parent: aaron.bentley at utoronto.ca-20061117040603-pgebxndswvwk26tt
parent: pqm at pqm.ubuntu.com-20061117041115-edacd4c4482528f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Fri 2006-11-17 00:14:45 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2012.1.8
revision-id: aaron.bentley at utoronto.ca-20061117040603-pgebxndswvwk26tt
parent: abentley at panoramicfeedback.com-20060920140305-7726fe3eb92690b1
parent: pqm at pqm.ubuntu.com-20061116183333-5f56523d7b44e564
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: tree-compare
timestamp: Thu 2006-11-16 23:06:03 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2012.1.7
revision-id: abentley at panoramicfeedback.com-20060920140305-7726fe3eb92690b1
parent: abentley at panoramicfeedback.com-20060919162617-e6099afb05b6a9ef
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Wed 2006-09-20 10:03:05 -0400
message:
Get tree._iter_changed down to ~ 1 stat per file
------------------------------------------------------------
revno: 2012.1.6
revision-id: abentley at panoramicfeedback.com-20060919162617-e6099afb05b6a9ef
parent: abentley at panoramicfeedback.com-20060919161731-4a099268251f858c
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Tue 2006-09-19 12:26:17 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2012.1.5
revision-id: abentley at panoramicfeedback.com-20060919161731-4a099268251f858c
parent: abentley at panoramicfeedback.com-20060919150819-fe949d51643d9d7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Tue 2006-09-19 12:17:31 -0400
message:
Implement specific file id and dangling id handling
------------------------------------------------------------
revno: 2012.1.4
revision-id: abentley at panoramicfeedback.com-20060919150819-fe949d51643d9d7c
parent: abentley at panoramicfeedback.com-20060919135808-4187174fc93b3d10
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Tue 2006-09-19 11:08:19 -0400
message:
Simplify add/remove code
------------------------------------------------------------
revno: 2012.1.3
revision-id: abentley at panoramicfeedback.com-20060919135808-4187174fc93b3d10
parent: abentley at panoramicfeedback.com-20060915220621-169e0e9be092e01e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Tue 2006-09-19 09:58:08 -0400
message:
Always generate tuples (because kind is always used, even when not different)
------------------------------------------------------------
revno: 2012.1.2
revision-id: abentley at panoramicfeedback.com-20060915220621-169e0e9be092e01e
parent: abentley at panoramicfeedback.com-20060915200208-407b811fb0b99145
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Fri 2006-09-15 18:06:21 -0400
message:
reimplement compare_trees
------------------------------------------------------------
revno: 2012.1.1
revision-id: abentley at panoramicfeedback.com-20060915200208-407b811fb0b99145
parent: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: tree-compare
timestamp: Fri 2006-09-15 16:02:08 -0400
message:
Implement change iterator
------------------------------------------------------------
revno: 2052.1.109
revision-id: pqm at pqm.ubuntu.com-20061201214905-0b9aa95ca507ed20
parent: pqm at pqm.ubuntu.com-20061201213707-a6b853f35f573c57
parent: v.ladeuil+lp at free.fr-20061130145534-6y3j6mxxutplpkyx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-01 21:49:05 +0000
message:
(Vincent Ladeuil) Win32 fixes for ChrootDecoratorTransportTest
------------------------------------------------------------
revno: 2052.1.104.2.1
revision-id: v.ladeuil+lp at free.fr-20061130145534-6y3j6mxxutplpkyx
parent: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
committer: v.ladeuil+lp at free.fr
branch nick: bzrw3
timestamp: Thu 2006-11-30 15:55:34 +0100
message:
Make the tests windows compatible.
* bzrlib/tests/test_transport.py:
(ChrootDecoratorTransportTest): Use a memory transport isntead of
a file one, but this stills seems a bit of a workaround for
windows.
------------------------------------------------------------
revno: 2052.1.108
revision-id: pqm at pqm.ubuntu.com-20061201213707-a6b853f35f573c57
parent: pqm at pqm.ubuntu.com-20061201202902-33d3262fdef929e8
parent: v.ladeuil+lp at free.fr-20061130143223-3g0rtx2icgw51iug
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-01 21:37:07 +0000
message:
(Vincent Ladeuil) Fix a test to pass on win32
------------------------------------------------------------
revno: 2052.1.104.1.1
revision-id: v.ladeuil+lp at free.fr-20061130143223-3g0rtx2icgw51iug
parent: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
committer: v.ladeuil+lp at free.fr
branch nick: bzrw2
timestamp: Thu 2006-11-30 15:32:23 +0100
message:
Make the test compatible with windows.
* bzrlib/tests/blackbox/test_selftest.py:
(TestBzrSubprocess.test_start_and_stop_working_dir): Make windows
produce universal newlines.
------------------------------------------------------------
revno: 2052.1.107
revision-id: pqm at pqm.ubuntu.com-20061201202902-33d3262fdef929e8
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
parent: john at arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-01 20:29:02 +0000
message:
(John Arbash Meinel) Clean up several imports to ensure modules are imported before they are used.
------------------------------------------------------------
revno: 2052.1.42.2.6
revision-id: john at arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
parent: john at arbash-meinel.com-20061110210611-ee346404477ecb86
parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: audit_imports
timestamp: Fri 2006-12-01 13:41:16 -0600
message:
[merge] bzr.dev 2158
------------------------------------------------------------
revno: 2052.1.42.2.5
revision-id: john at arbash-meinel.com-20061110210611-ee346404477ecb86
parent: pqm at pqm.ubuntu.com-20061110203829-b23b986f699765d4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: audit_imports
timestamp: Fri 2006-11-10 15:06:11 -0600
message:
Fix imports to ensure modules are loaded before they are used
------------------------------------------------------------
revno: 2052.1.42.2.4
revision-id: pqm at pqm.ubuntu.com-20061110203829-b23b986f699765d4
parent: pqm at pqm.ubuntu.com-20061030165314-9e3e163fe7452adf
parent: john at arbash-meinel.com-20061110202632-5008c0a9e7b4ac95
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.12
timestamp: Fri 2006-11-10 20:38:29 +0000
message:
backport regression fix for bug #70716
------------------------------------------------------------
revno: 2052.1.42.2.3.1.1
revision-id: john at arbash-meinel.com-20061110202632-5008c0a9e7b4ac95
parent: pqm at pqm.ubuntu.com-20061030165314-9e3e163fe7452adf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.12.1
timestamp: Fri 2006-11-10 14:26:32 -0600
message:
backport regression fix for bug #70716
------------------------------------------------------------
revno: 2052.1.42.2.3
revision-id: pqm at pqm.ubuntu.com-20061030165314-9e3e163fe7452adf
parent: pqm at pqm.ubuntu.com-20061030164228-4e6fd0c101dc3ce3
parent: john at arbash-meinel.com-20061030163702-4c281890482ba4f5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.12
timestamp: Mon 2006-10-30 16:53:14 +0000
message:
(John Arbash Meinel) 0.12.0-final
------------------------------------------------------------
revno: 2052.1.42.2.1.1.4
revision-id: john at arbash-meinel.com-20061030163702-4c281890482ba4f5
parent: john at arbash-meinel.com-20061030162244-7689df50183ab812
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 0.12rc2
timestamp: Mon 2006-10-30 10:37:02 -0600
message:
(John Arbash Meinel) Update NEWS and version for 0.12-final
------------------------------------------------------------
revno: 2052.1.42.2.2
revision-id: pqm at pqm.ubuntu.com-20061030164228-4e6fd0c101dc3ce3
parent: pqm at pqm.ubuntu.com-20061024015709-70bc08c47bd6e3e1
parent: john at arbash-meinel.com-20061030162244-7689df50183ab812
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.12
timestamp: Mon 2006-10-30 16:42:28 +0000
message:
(John Arbash Meinel) Backport copyright and bundle fixes
------------------------------------------------------------
revno: 2052.1.42.2.1.1.3
revision-id: john at arbash-meinel.com-20061030162244-7689df50183ab812
parent: john at arbash-meinel.com-20061027151748-c7a4dbc8d424cbce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 0.12rc2
timestamp: Mon 2006-10-30 10:22:44 -0600
message:
(John Arbash Meinel) Stop running expensive bundle benchmarks
------------------------------------------------------------
revno: 2052.1.42.2.1.1.2
revision-id: john at arbash-meinel.com-20061027151748-c7a4dbc8d424cbce
parent: john at arbash-meinel.com-20061027150444-6154c0c574c7287c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 0.12rc2
timestamp: Fri 2006-10-27 10:17:48 -0500
message:
Backport fixes for bundle benchmarks
------------------------------------------------------------
revno: 2052.1.42.2.1.1.1
revision-id: john at arbash-meinel.com-20061027150444-6154c0c574c7287c
parent: pqm at pqm.ubuntu.com-20061024015709-70bc08c47bd6e3e1
parent: wang at ubuntu-20061018061653-779801c9baa493ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 0.12rc2
timestamp: Fri 2006-10-27 10:04:44 -0500
message:
(Cheuksan Edward Wang) Fix copyright notice
------------------------------------------------------------
revno: 2052.1.42.2.1
revision-id: pqm at pqm.ubuntu.com-20061024015709-70bc08c47bd6e3e1
parent: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
parent: john at arbash-meinel.com-20061024001351-ad264afadd2231d6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.12
timestamp: Tue 2006-10-24 02:57:09 +0100
message:
(John Arbash Meinel) Release 0.12rc1
------------------------------------------------------------
revno: 2052.1.42.3.1
revision-id: john at arbash-meinel.com-20061024001351-ad264afadd2231d6
parent: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr.0.12
timestamp: Mon 2006-10-23 19:13:51 -0500
message:
(John Arbash Meinel) Release 0.12rc1
------------------------------------------------------------
revno: 2052.1.106
revision-id: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
parent: pqm at pqm.ubuntu.com-20061130154348-f58a36f38e37b896
parent: larstiq at larstiq.dyndns.org-20061130180423-jzwkjlcupk741oiy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-30 18:17:53 +0000
message:
(vila) Fix oversight in the previous curl connection sharing merge.
------------------------------------------------------------
revno: 2052.1.105.1.1
revision-id: larstiq at larstiq.dyndns.org-20061130180423-jzwkjlcupk741oiy
parent: pqm at pqm.ubuntu.com-20061130154348-f58a36f38e37b896
parent: v.ladeuil+lp at free.fr-20061130174947-gsx0zu8d50jdy0j2
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Thu 2006-11-30 19:04:23 +0100
message:
(vila) Fix oversight in the previous curl connection sharing merge.
------------------------------------------------------------
revno: 2000.3.8
revision-id: v.ladeuil+lp at free.fr-20061130174947-gsx0zu8d50jdy0j2
parent: v.ladeuil+lp at free.fr-20061130141141-dw2q0etk307ypkdv
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Thu 2006-11-30 18:49:47 +0100
message:
The heart of the modification.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged): A hunk was lost in a merge...
------------------------------------------------------------
revno: 2052.1.105
revision-id: pqm at pqm.ubuntu.com-20061130154348-f58a36f38e37b896
parent: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
parent: v.ladeuil+lp at free.fr-20061130141141-dw2q0etk307ypkdv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-30 15:43:48 +0000
message:
(vila) Better curl connection sharing.
------------------------------------------------------------
revno: 2000.3.7
revision-id: v.ladeuil+lp at free.fr-20061130141141-dw2q0etk307ypkdv
parent: v.ladeuil+lp at free.fr-20061023103712-8a81343d81385a19
parent: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Thu 2006-11-30 15:11:41 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2000.3.6
revision-id: v.ladeuil+lp at free.fr-20061023103712-8a81343d81385a19
parent: v.ladeuil+lp at free.fr-20061017072959-a4731591023553a6
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Mon 2006-10-23 12:37:12 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2000.3.5
revision-id: v.ladeuil+lp at free.fr-20061017072959-a4731591023553a6
parent: v.ladeuil+lp at free.fr-20061016155257-ff02a774a4314899
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Tue 2006-10-17 09:29:59 +0200
message:
Fix spacing
------------------------------------------------------------
revno: 2000.3.4
revision-id: v.ladeuil+lp at free.fr-20061016155257-ff02a774a4314899
parent: v.ladeuil+lp at free.fr-20061016151306-02b8a6b71ddf7386
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Mon 2006-10-16 17:52:57 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2000.3.3
revision-id: v.ladeuil+lp at free.fr-20061016151306-02b8a6b71ddf7386
parent: v.ladeuil+lp at free.fr-20060920114541-bb77d2fb5a8ba48d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Mon 2006-10-16 17:13:06 +0200
message:
Update NEWS.
------------------------------------------------------------
revno: 2000.3.2
revision-id: v.ladeuil+lp at free.fr-20060920114541-bb77d2fb5a8ba48d
parent: v.ladeuil+lp at free.fr-20060912094022-e7bb1b804d76efd0
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Wed 2006-09-20 13:45:41 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2000.3.1
revision-id: v.ladeuil+lp at free.fr-20060912094022-e7bb1b804d76efd0
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
committer: v.ladeuil+lp at free.fr
branch nick: bzr.curl.persistence
timestamp: Tue 2006-09-12 11:40:22 +0200
message:
Better connection sharing by using only one curl object.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__, PyCurlTransport.has,
PyCurlTransport._get_full): Use only one curl object.
(PyCurlTransport._get_ranged): Use only one curl object. Specify
'Range' as an additional header.
(PyCurlTransport._curl_perform): Take additional headers into
account.
(PyCurlTransport._set_curl_options): Leave _perform do the header
setting.
(PyCurlTransport._curl_perform): Set all headers just before
issuing the request.
------------------------------------------------------------
revno: 2052.1.104
revision-id: pqm at pqm.ubuntu.com-20061129172920-73da105328ff3c06
parent: pqm at pqm.ubuntu.com-20061128231925-6a90ea4334844dc4
parent: john at arbash-meinel.com-20061129171658-uwphkz5ntsb7bv0r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-11-29 17:29:20 +0000
message:
(Dmitry Vasiliev) pre-lookup encoders to improve performance
------------------------------------------------------------
revno: 2052.1.103.1.1
revision-id: john at arbash-meinel.com-20061129171658-uwphkz5ntsb7bv0r
parent: pqm at pqm.ubuntu.com-20061128231925-6a90ea4334844dc4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-11-29 11:16:58 -0600
message:
(Dmitry Vasiliev) pre-lookup encoders to improve performance
------------------------------------------------------------
revno: 2052.1.103
revision-id: pqm at pqm.ubuntu.com-20061128231925-6a90ea4334844dc4
parent: pqm at pqm.ubuntu.com-20061128230319-936ac7a925a6860b
parent: abentley at panoramicfeedback.com-20061128192500-3kvy8ex5k6e7td8y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-28 23:19:25 +0000
message:
Defer the commit message until commit is virtually certain to succeed
------------------------------------------------------------
revno: 2052.1.97.1.6
revision-id: abentley at panoramicfeedback.com-20061128192500-3kvy8ex5k6e7td8y
parent: abentley at panoramicfeedback.com-20061128192306-3os154koexc4hwrn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Tue 2006-11-28 14:25:00 -0500
message:
Add NEWS entry
------------------------------------------------------------
revno: 2052.1.97.1.5
revision-id: abentley at panoramicfeedback.com-20061128192306-3os154koexc4hwrn
parent: abentley at panoramicfeedback.com-20061128191915-c6ccc0a12jqylok2
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Tue 2006-11-28 14:23:06 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.97.1.4
revision-id: abentley at panoramicfeedback.com-20061128191915-c6ccc0a12jqylok2
parent: abentley at panoramicfeedback.com-20061127161424-kc3b780vnb6tm6yk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Tue 2006-11-28 14:19:15 -0500
message:
Add additional test that callback is called with a Commit instance
------------------------------------------------------------
revno: 2052.1.97.1.3
revision-id: abentley at panoramicfeedback.com-20061127161424-kc3b780vnb6tm6yk
parent: abentley at panoramicfeedback.com-20061123214827-2prm1yibnnxoutgo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Mon 2006-11-27 11:14:24 -0500
message:
Updates from review comments
------------------------------------------------------------
revno: 2052.1.97.1.2
revision-id: abentley at panoramicfeedback.com-20061123214827-2prm1yibnnxoutgo
parent: abentley at panoramicfeedback.com-20061123213724-pbn0jfgtwg3cln9h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Thu 2006-11-23 16:48:27 -0500
message:
Defer getting the commit message until the revision is almost-committed
------------------------------------------------------------
revno: 2052.1.97.1.1
revision-id: abentley at panoramicfeedback.com-20061123213724-pbn0jfgtwg3cln9h
parent: pqm at pqm.ubuntu.com-20061123070038-57f13b951191257e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: commit-callback
timestamp: Thu 2006-11-23 16:37:24 -0500
message:
Provide a message_callback parameter to tree.commit
------------------------------------------------------------
revno: 2052.1.102
revision-id: pqm at pqm.ubuntu.com-20061128230319-936ac7a925a6860b
parent: pqm at pqm.ubuntu.com-20061128161159-225935f3ccf3da2f
parent: abentley at panoramicfeedback.com-20061128215647-h3eshzyuchz6q1p1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-28 23:03:19 +0000
message:
Optimize annotate by retrieving all revisions at once
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.6
revision-id: abentley at panoramicfeedback.com-20061128215647-h3eshzyuchz6q1p1
parent: abentley at panoramicfeedback.com-20061122161643-bhjxtxe0btydd50b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-11-28 16:56:47 -0500
message:
Optimize annotate by retrieving all revisions at once
------------------------------------------------------------
revno: 2052.1.101
revision-id: pqm at pqm.ubuntu.com-20061128161159-225935f3ccf3da2f
parent: pqm at pqm.ubuntu.com-20061128152420-80408ac88968dc81
parent: john at arbash-meinel.com-20061128160017-cac6j7952jlersoe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-28 16:11:59 +0000
message:
(Dmitry Vasiliev) Update and improve benchmarks for cache_utf8
------------------------------------------------------------
revno: 2052.1.100.1.1
revision-id: john at arbash-meinel.com-20061128160017-cac6j7952jlersoe
parent: pqm at pqm.ubuntu.com-20061128152420-80408ac88968dc81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-11-28 10:00:17 -0600
message:
(Dmitry Vasiliev) Update and improve benchmarks for cache_utf8
------------------------------------------------------------
revno: 2052.1.100
revision-id: pqm at pqm.ubuntu.com-20061128152420-80408ac88968dc81
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
parent: john at arbash-meinel.com-20061128151137-1f1z1a0qgdg3yas1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-28 15:24:20 +0000
message:
(Dmitry Vasiliev) Tune KnitContent and add tests
------------------------------------------------------------
revno: 2052.1.99.1.1
revision-id: john at arbash-meinel.com-20061128151137-1f1z1a0qgdg3yas1
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-11-28 09:11:37 -0600
message:
(Dmitry Vasiliev) Tune KnitContent and add tests
------------------------------------------------------------
revno: 2052.1.99
revision-id: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
parent: pqm at pqm.ubuntu.com-20061126153508-40a2ce4d019aefea
parent: larstiq at larstiq.dyndns.org-20061127231154-jvaee1n240m8gop2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-27 23:30:27 +0000
message:
0.13rc1 has branch, bump bzr.dev version to 0.14
------------------------------------------------------------
revno: 2052.1.98.1.1
revision-id: larstiq at larstiq.dyndns.org-20061127231154-jvaee1n240m8gop2
parent: pqm at pqm.ubuntu.com-20061126153508-40a2ce4d019aefea
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.dev
timestamp: Tue 2006-11-28 00:11:54 +0100
message:
bzr 0.13rc1 has branch, bump bzr.dev version to 0.14
------------------------------------------------------------
revno: 2052.1.98
revision-id: pqm at pqm.ubuntu.com-20061126153508-40a2ce4d019aefea
parent: pqm at pqm.ubuntu.com-20061123070038-57f13b951191257e
parent: john at arbash-meinel.com-20061126150920-swwzjx6l9phmch75
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-11-26 15:35:08 +0000
message:
(John Arbash Meinel) Cache fulltexts when the size of the deltas reaches the size of a fulltext
------------------------------------------------------------
revno: 2052.1.95.1.4
revision-id: john at arbash-meinel.com-20061126150920-swwzjx6l9phmch75
parent: john at arbash-meinel.com-20061124185427-w22ez7zgqp143ikf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dynamic-fulltext-cache
timestamp: Sun 2006-11-26 09:09:20 -0600
message:
NEWS
------------------------------------------------------------
revno: 2052.1.95.1.3
revision-id: john at arbash-meinel.com-20061124185427-w22ez7zgqp143ikf
parent: john at arbash-meinel.com-20061124183555-u05ssr07pzt61b0b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dynamic-fulltext-cache
timestamp: Fri 2006-11-24 12:54:27 -0600
message:
In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.
------------------------------------------------------------
revno: 2052.1.95.1.2
revision-id: john at arbash-meinel.com-20061124183555-u05ssr07pzt61b0b
parent: john at arbash-meinel.com-20061122050741-k0b3vk2d15z9z8uj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dynamic-fulltext-cache
timestamp: Fri 2006-11-24 12:35:55 -0600
message:
Simplify the knit max-chain detection code.
------------------------------------------------------------
revno: 2052.1.95.1.1
revision-id: john at arbash-meinel.com-20061122050741-k0b3vk2d15z9z8uj
parent: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dynamic-fulltext-cache
timestamp: Tue 2006-11-21 23:07:41 -0600
message:
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
------------------------------------------------------------
revno: 2052.1.97
revision-id: pqm at pqm.ubuntu.com-20061123070038-57f13b951191257e
parent: pqm at pqm.ubuntu.com-20061122192426-5111c73e16322a33
parent: abentley at panoramicfeedback.com-20061122161643-bhjxtxe0btydd50b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-23 07:00:38 +0000
message:
Revert broken save-commit-message code
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.5
revision-id: abentley at panoramicfeedback.com-20061122161643-bhjxtxe0btydd50b
parent: abentley at panoramicfeedback.com-20061122155112-vy2ns3j82veoj8a4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-11-22 11:16:43 -0500
message:
Revert broken save-commit-message code
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.4
revision-id: abentley at panoramicfeedback.com-20061122155112-vy2ns3j82veoj8a4
parent: aaron.bentley at utoronto.ca-20061117055317-1wlrph7uug33p0tv
parent: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-11-22 10:51:12 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.96
revision-id: pqm at pqm.ubuntu.com-20061122192426-5111c73e16322a33
parent: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
parent: bialix at ukr.net-20061121112903-2qjj0e8eqvacdpiv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-11-22 19:24:26 +0000
message:
(bialix) win32-specific fix to selftest (HttpServer.py)
------------------------------------------------------------
revno: 2052.1.94.1.1
revision-id: bialix at ukr.net-20061121112903-2qjj0e8eqvacdpiv
parent: pqm at pqm.ubuntu.com-20061121073543-06ca44391ff18200
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: urlparse.for.win32
timestamp: Tue 2006-11-21 13:29:03 +0200
message:
fixes for test suite: forgotten imports in HttpServer.py
------------------------------------------------------------
revno: 2052.1.95
revision-id: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
parent: pqm at pqm.ubuntu.com-20061121073543-06ca44391ff18200
parent: aaron.bentley at utoronto.ca-20061117055317-1wlrph7uug33p0tv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-21 12:34:18 +0000
message:
Revert buggy apport changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.3
revision-id: aaron.bentley at utoronto.ca-20061117055317-1wlrph7uug33p0tv
parent: aaron.bentley at utoronto.ca-20061117035745-ovcrn4resw2if6xf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-11-17 00:53:17 -0500
message:
Revert buggy apport changes
------------------------------------------------------------
revno: 2052.1.94
revision-id: pqm at pqm.ubuntu.com-20061121073543-06ca44391ff18200
parent: pqm at pqm.ubuntu.com-20061120225523-9a6692bea52007b0
parent: mbp at sourcefrog.net-20061121010852-838b560632acc36c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-21 07:35:43 +0000
message:
(vincent) urllib keepalive improvements
------------------------------------------------------------
revno: 2052.1.93.1.1
revision-id: mbp at sourcefrog.net-20061121010852-838b560632acc36c
parent: pqm at pqm.ubuntu.com-20061120225523-9a6692bea52007b0
parent: v.ladeuil+lp at free.fr-20061108082209-e02a8d718670dcb8
committer: mbp at sourcefrog.net
branch nick: keepalive
timestamp: Tue 2006-11-21 12:08:52 +1100
message:
merge urllib keepalive etc
------------------------------------------------------------
revno: 2004.1.42
revision-id: v.ladeuil+lp at free.fr-20061108082209-e02a8d718670dcb8
parent: v.ladeuil+lp at free.fr-20061108074430-a9c08d4a475bd97f
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-11-08 09:22:09 +0100
message:
Fix #70803 by catching the httplib exception.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ConnectionHandler.create_connection): Catch httplib.InvalidURL
and translate it into errors.InvalidURL.
* bzrlib/tests/test_http.py:
(TestHttpUrls.test_invalid_http_urls): Test one more invalid URL.
------------------------------------------------------------
revno: 2004.1.41
revision-id: v.ladeuil+lp at free.fr-20061108074430-a9c08d4a475bd97f
parent: v.ladeuil+lp at free.fr-20061025174710-b8bea783ced1169f
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-11-08 08:44:30 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.40
revision-id: v.ladeuil+lp at free.fr-20061025174710-b8bea783ced1169f
parent: v.ladeuil+lp at free.fr-20061025124039-ee626546953e0f95
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-25 19:47:10 +0200
message:
Fix the race condition again and correct some small typos to be in
line with the incremental patches to be proposed.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): Why not inverting them ?
* bzrlib/tests/test_http.py:
(TestWallServer.test_http_has): Whatever we try, httplib still may
raise BadStatusLine, which will be translated to
InvalidHttpResponse, so catch that too.
* bzrlib/tests/HTTPTestUtil.py:
(WallRequestHandler.handle_one_request): Previous fix was not
enough, revert it.
------------------------------------------------------------
revno: 2004.1.39
revision-id: v.ladeuil+lp at free.fr-20061025124039-ee626546953e0f95
parent: v.ladeuil+lp at free.fr-20061025090343-f6f9b3d88c1b987b
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-25 14:40:39 +0200
message:
Fix a race condition that make selftest fail once in a while.
* HTTPTestUtil.py:
(WallRequestHandler.handle_one_request): Be more strict to close
the connection to avoid a race condition with a client able to
read before we really close.
------------------------------------------------------------
revno: 2004.1.38
revision-id: v.ladeuil+lp at free.fr-20061025090343-f6f9b3d88c1b987b
parent: v.ladeuil+lp at free.fr-20061024103202-6018a2aa4d25c96d
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-25 11:03:43 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.37
revision-id: v.ladeuil+lp at free.fr-20061024103202-6018a2aa4d25c96d
parent: v.ladeuil+lp at free.fr-20061024090014-55377d873850e11b
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-24 12:32:02 +0200
message:
Small refactoring.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response._body_ignored_responses): Add 403 and 404.
(AbstractHTTPHandler.retry_or_raise): Isolate the 'retry or raise'
part, do_open is still too big but that helps.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Delete FIXME.
------------------------------------------------------------
revno: 2004.1.36
revision-id: v.ladeuil+lp at free.fr-20061024090014-55377d873850e11b
parent: v.ladeuil+lp at free.fr-20061024084459-a42bda199905b626
parent: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-24 11:00:14 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.35
revision-id: v.ladeuil+lp at free.fr-20061024084459-a42bda199905b626
parent: v.ladeuil+lp at free.fr-20061023110446-1fddf0ae083c0c1d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-24 10:44:59 +0200
message:
Cosmetic enhancement for bug #41436.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractHTTPHandler.do_open): Handle socket.gaierror specifically.
------------------------------------------------------------
revno: 2004.1.34
revision-id: v.ladeuil+lp at free.fr-20061023110446-1fddf0ae083c0c1d
parent: v.ladeuil+lp at free.fr-20061023105209-46dd4a74da1130f1
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Mon 2006-10-23 13:04:46 +0200
message:
Cosmetic fix for bug #57644.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._raise_curl_http_error): Mention url in aerror
message.
------------------------------------------------------------
revno: 2004.1.33
revision-id: v.ladeuil+lp at free.fr-20061023105209-46dd4a74da1130f1
parent: v.ladeuil+lp at free.fr-20061019084455-89d30e66e82b1e52
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Mon 2006-10-23 12:52:09 +0200
message:
Cosmetic fixes.
* bzrlib/tests/HttpServer.py:
Fix copyright test detected error.
* NEWS:
Include bug fixes comment at the right place.
------------------------------------------------------------
revno: 2004.1.32
revision-id: v.ladeuil+lp at free.fr-20061019084455-89d30e66e82b1e52
parent: v.ladeuil+lp at free.fr-20061017140112-8ae6aac456429ccf
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-19 10:44:55 +0200
message:
Merge bzr,dev
------------------------------------------------------------
revno: 2004.1.31
revision-id: v.ladeuil+lp at free.fr-20061017140112-8ae6aac456429ccf
parent: v.ladeuil+lp at free.fr-20061017135801-3fb63746e0ea8fcf
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-17 16:01:12 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.30
revision-id: v.ladeuil+lp at free.fr-20061017135801-3fb63746e0ea8fcf
parent: v.ladeuil+lp at free.fr-20061013155316-163e2bef7fa42490
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-17 15:58:01 +0200
message:
Fix #62276 and #62029 by providing a more robust http range handling.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Forget about _accept_ranges, the
base class handles that.
(HttpTransport_urllib._get): Takes _range_hint into account.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport): Doc fix. Hey ! Urllib had shrunk the gap here !
(PyCurlTransport._get_ranged): Takes _range_hint into account.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.__init__): Add _range_hint attribute. Give it
to the clones too.
(HttpTransportBase.readv): If we don't get the data we need, try
simpler requests.
(HttpTransportBase.attempted_range_header): Build the range header
taking into account what we had learned from the server
capabilites in previous requests.
(HttpTransportBase.range_header): Small doc fix.
* bzrlib/tests/test_http.py:
(TestPost._test_post_body_is_received): Oops, miss that one during
the merge. UnsupportedProtocol should be prefixed by 'errors.'.
(TestRangeRequestServer.setUp): Use build_tree_contents, not
build_tree or we don't end up with the content we need.
------------------------------------------------------------
revno: 2004.1.29
revision-id: v.ladeuil+lp at free.fr-20061013155316-163e2bef7fa42490
parent: v.ladeuil+lp at free.fr-20061013105033-7e091ff8dcc0ed0c
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-10-13 17:53:16 +0200
message:
New tests for http range requests handling.
* bzrlib/tests/test_http.py:
(TestRangeRequestServer): New class implementing tests involving
range requests.
(TestSingleRangeRequestServer,
TestSingleRangeRequestServer_urllib,
TestSingleRangeRequestServer_pycurl, TestNoRangeRequestServer,
TestNoRangeRequestServer_urllib,
TestNoRangeRequestServer_pycurl):New classes testing http
transports behavior against bogus range request handling servers.
* bzrlib/tests/__init__.py:
(TestCase.assertListRaises): Gratefully accepted from
bzrlib/tests/test_transport_implementations.py
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_has.assertListRaises): Generously given to
bzrlib/tests/__init__.py.
* bzrlib/tests/HTTPTestUtil.py:
(SingleRangeRequestHandler): New class implementing a server that
handle only range requests by bogusly returning only the first
requested range.
(NoRangeRequestHandler): New class implementing a server that
silently ignores range requests.
------------------------------------------------------------
revno: 2004.1.28
revision-id: v.ladeuil+lp at free.fr-20061013105033-7e091ff8dcc0ed0c
parent: v.ladeuil+lp at free.fr-20061013085334-e216654a3e842ff9
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-10-13 12:50:33 +0200
message:
Merge bzr.dev. Including http modifications by "smart" related code
------------------------------------------------------------
revno: 2004.1.27
revision-id: v.ladeuil+lp at free.fr-20061013085334-e216654a3e842ff9
parent: v.ladeuil+lp at free.fr-20061013083619-502b7eed9abc3473
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-10-13 10:53:34 +0200
message:
Fix bug #57644 by issuing an explicit error message.
* bzrlib/tests/test_http.py:
Fix some doc strings.
(TestForbiddenServer, TestForbiddenServer_urllib,
TestForbiddenServer_pycurl): Tests for correct handling of 403
error code.
* bzrlib/transport/http/_urllib2_wrappers.py:
Cleanup errors import and uses.
(HTTPDefaultErrorHandler.http_error_default): Handles 403 error code.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._raise_curl_http_error): Handles 403 error code.
* bzrlib/tests/HTTPTestUtil.py:
(ForbiddenRequestHandler): New class. An http server where
everything is forbidden.
------------------------------------------------------------
revno: 2004.1.26
revision-id: v.ladeuil+lp at free.fr-20061013083619-502b7eed9abc3473
parent: v.ladeuil+lp at free.fr-20061012142932-7221fe16d2b48fa3
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-10-13 10:36:19 +0200
message:
Cleaning.
* bzrlib/tests/test_http.py:
Oops, deleted dead code.
------------------------------------------------------------
revno: 2004.1.25
revision-id: v.ladeuil+lp at free.fr-20061012142932-7221fe16d2b48fa3
parent: v.ladeuil+lp at free.fr-20061012111753-046120af9558c11b
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-12 16:29:32 +0200
message:
Shuffle http related test code. Hopefully it ends up at the right place :)
* bzrlib/tests/HttpServer.py:
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).
* bzrlib/transport/http/_urllib.py:
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.
* bzrlib/transport/http/_pycurl.py:
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.
* bzrlib/transport/http/__init__.py:
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.
* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.
* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.
* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.
* bzrlib/tests/test_repository.py:
Does *not* use HttpServer.
* bzrlib/tests/test_http.py:
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.
* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.
* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.
* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.
* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.
------------------------------------------------------------
revno: 2004.1.24
revision-id: v.ladeuil+lp at free.fr-20061012111753-046120af9558c11b
parent: v.ladeuil+lp at free.fr-20061012073329-854608f3287dcdd1
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-12 13:17:53 +0200
message:
Trivial cleaning.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): Delete obsolete comment.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.__init__): Delete obsolete comment.
(TestingHTTPRequestHandler.get_single_range): Fix typo in header
name.
------------------------------------------------------------
revno: 2004.1.23
revision-id: v.ladeuil+lp at free.fr-20061012073329-854608f3287dcdd1
parent: v.ladeuil+lp at free.fr-20061006170758-dcfe0c203afa330c
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-12 09:33:29 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.22
revision-id: v.ladeuil+lp at free.fr-20061006170758-dcfe0c203afa330c
parent: v.ladeuil+lp at free.fr-20061005095728-b4912c27b3d3baec
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-10-06 19:07:58 +0200
message:
Implements Range header handling for GET requests. Fix a test.
* bzrlib/transport/http/__init__.py:
(TestingHTTPRequestHandler.parse_ranges,
TestingHTTPRequestHandler.send_range_content,
TestingHTTPRequestHandler.get_single_range,
TestingHTTPRequestHandler.get_multiple_ranges,
TestingHTTPRequestHandler.do_GET): New methods. Implements the Range
header handling for GET request.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv): Add a test with a single range.
* bzrlib/tests/test_fetch.py:
(TestHttpFetch._count_log_matches): GET can succeeds with a 206 code.
(TestHttpFetch.test_weaves_are_retrieved_once): log_pattern was not
used here.
------------------------------------------------------------
revno: 2004.1.21
revision-id: v.ladeuil+lp at free.fr-20061005095728-b4912c27b3d3baec
parent: v.ladeuil+lp at free.fr-20061005093155-bb311bc6ebf11994
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-05 11:57:28 +0200
message:
Trivial cleanup.
------------------------------------------------------------
revno: 2004.1.20
revision-id: v.ladeuil+lp at free.fr-20061005093155-bb311bc6ebf11994
parent: v.ladeuil+lp at free.fr-20061005092948-585bd3d003d5db82
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-05 11:31:55 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.19
revision-id: v.ladeuil+lp at free.fr-20061005092948-585bd3d003d5db82
parent: v.ladeuil+lp at free.fr-20061004164821-5c058eb8f6ec9d16
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Thu 2006-10-05 11:29:48 +0200
message:
Test protocol version in http responses.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractHTTPHandler.do_open): Catch httplib.UnknownProtocol. Add some
comments.
* bzrlib/transport/http/__init__.py:
(BadProtocolRequestHandler): New class testing protocol validity.
* bzrlib/tests/test_http.py:
(TestWallServer, TestBadStatusServer.create_transport_readonly_server,
TestInvalidStatusServer): Use a readonly server.
(TestBadProtocolServer, TestBadProtocolServer_urllib): New classes
testing protocol version validity.
* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport.create_transport_readonly_server): New
hook allowing daughter classes to create specialized servers.
------------------------------------------------------------
revno: 2004.1.18
revision-id: v.ladeuil+lp at free.fr-20061004164821-5c058eb8f6ec9d16
parent: v.ladeuil+lp at free.fr-20061004164523-75d31921c8e6c62e
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-04 18:48:21 +0200
message:
Protect bad http status tests against broken pipes.
* bzrlib/transport/http/__init__.py:
(BadStatusRequestHandler.parse_request): Catch broken pipe.
------------------------------------------------------------
revno: 2004.1.17
revision-id: v.ladeuil+lp at free.fr-20061004164523-75d31921c8e6c62e
parent: v.ladeuil+lp at free.fr-20061004144205-6a7496410b893ab1
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-04 18:45:23 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.16
revision-id: v.ladeuil+lp at free.fr-20061004144205-6a7496410b893ab1
parent: v.ladeuil+lp at free.fr-20061004094003-4a058914ddf1401a
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-04 16:42:05 +0200
message:
Add tests against erroneous http status lines.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response.begin): In some subtle cases we MUST not try to read the
response body.
(AbstractHTTPConnection.strict): Do not try to support HTTP/0.9 or we
may fail to detect bad status lines.
(AbstractHTTPHandler.do_open): Translate BasStatusLine into
InvalidHttpResponse and don't retry in that case.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.has):
* bzrlib/transport/http/__init__.py:
(BadStatusRequestHandler, InvalidStatusRequestHandler): New classes.
* bzrlib/tests/test_http.py:
(TestBadStatusServer.create_transport_server,
TestBadStatusServer_urllib, TestBadStatusServer_pycurl,
TestInvalidStatusServer, TestInvalidStatusServer_urllib,
TestInvalidStatusServer_pycurl): New classes.
------------------------------------------------------------
revno: 2004.1.15
revision-id: v.ladeuil+lp at free.fr-20061004094003-4a058914ddf1401a
parent: v.ladeuil+lp at free.fr-20061003141947-c6bd6f8878e09f27
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-10-04 11:40:03 +0200
message:
Better design for bogus servers. Both urllib and pycurl pass tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ConnectionHandler.create_connection): Raise InvalidURL instead of
urllib2.URLError.
(AbstractHTTPHandler.http_request): New method to override default
urllib2 headers.
* bzrlib/tests/test_http.py:
(TestHttpConnections): Renamed from HttpMixins. Note that this class
should be inherited by a class that also inherit from
TestCaseWithWebserver, this was already the case, but that's now
mentioned in the doc string.
(TestHttpConnections.test_has_on_bogus_host): Moved from
TestHttpConnections_urllib to TestHttpConnections so that pycurl get
tested too.
(TestWithTransport_pycurl): New class to share the pycurl dependency
testing when creating test cases for pycurl.
(TestHttpConnections_urllib, TestHttpConnections_pycurl): Simplified
accordingly.
(TestWallServer, TestWallServer_urllib, TestWallServer_pycurl): Use the
same pattern as TestHttpConnections to share tests between urllib and
pycurl.
* bzrlib/errors.py:
(ConnectionError): Yes, the 'Connection error' part seems redundant
with the leading ConnectionError in the message, but so far, at least
one test (SSHVendorBadConnection.test_bad_connection_ssh) relies on it
and I don't know if suppressing this redundancy is the best way to
solve the problem.
------------------------------------------------------------
revno: 2004.1.14
revision-id: v.ladeuil+lp at free.fr-20061003141947-c6bd6f8878e09f27
parent: v.ladeuil+lp at free.fr-20061003141808-934f801ccbdb2f55
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-03 16:19:47 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.13
revision-id: v.ladeuil+lp at free.fr-20061003141808-934f801ccbdb2f55
parent: v.ladeuil+lp at free.fr-20060925072900-1d3c53855a28aa31
parent: v.ladeuil+lp at free.fr-20061001191254-7a6886c1cf46a1c6
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Tue 2006-10-03 16:18:08 +0200
message:
Merge bzr.urllib.keepalive
------------------------------------------------------------
revno: 2004.1.10.1.4
revision-id: v.ladeuil+lp at free.fr-20061001191254-7a6886c1cf46a1c6
parent: v.ladeuil+lp at free.fr-20061001190803-04ca220a1cbc15f3
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-10-01 21:12:54 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.10.1.3
revision-id: v.ladeuil+lp at free.fr-20061001190803-04ca220a1cbc15f3
parent: v.ladeuil+lp at free.fr-20060924214355-9068e9a43ff9ac38
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-10-01 21:08:03 +0200
message:
Better (but still incomplete) design for bogus servers.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractHTTPHandler): Add 'Accept: */*' again to default headers
until I fully understand why and when it's needed or not (curl add
it if no Accept header is present).
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): CURLE_GOT_NOTHING may be
considered as a ConnectionError, inspection of curl code reveals
that the case is sufficiently rare and low level related to not be
considered an http error per se.
* bzrlib/transport/http/__init__.py:
(WallHttpServer): Deleted.
* bzrlib/tests/test_http.py:
(TestBogusServer): Factor out the tests common to the bogus
servers.
* bzrlib/tests/__init__.py:
(TestCaseWithTransport.create_transport_server,
TestCaseWithTransport.create_transport_readonly_server): New
methods, allows test cases to specify the transport servers
without defining useless classes.
(TestCaseWithTransport.get_readonly_server): Use
create_transport_readonly_server.
(TestCaseWithTransport.get_server): Use create_transport_server.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithWebserver): Fix typo in doc string.
(TestCaseWithWallserver): Deleted.
------------------------------------------------------------
revno: 2004.1.12
revision-id: v.ladeuil+lp at free.fr-20060925072900-1d3c53855a28aa31
parent: v.ladeuil+lp at free.fr-20060920151639-744cac2535cbe84d
parent: v.ladeuil+lp at free.fr-20060924214355-9068e9a43ff9ac38
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Mon 2006-09-25 09:29:00 +0200
message:
Merge bzr.urllib.keepalive
------------------------------------------------------------
revno: 2004.1.10.1.2
revision-id: v.ladeuil+lp at free.fr-20060924214355-9068e9a43ff9ac38
parent: v.ladeuil+lp at free.fr-20060924214027-d5e363af4c38cc93
parent: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-09-24 23:43:55 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.10.1.1
revision-id: v.ladeuil+lp at free.fr-20060924214027-d5e363af4c38cc93
parent: v.ladeuil+lp at free.fr-20060917081600-8ab9edf1bb2ff400
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-09-24 23:40:27 +0200
message:
Test ConnectionError exceptions.
* bzrlib/transport/http/_urllib2_wrappers.py
(AbstractHTTPConnection.getresponse): Not needed anymore.
(AbstractHTTPHandler.do_open): Better exception handling.
(HTTPBasicAuthHandler): Not yet implemented.
* bzrlib/transport/http/_urllib.py:
Fix spurious spaces.
* bzrlib/transport/http/__init__.py:
(WallRequestHandler, WallHttpServer): A http server closing
connections as soon as a request arrives.
* bzrlib/tests/test_http.py:
(TestWallServer): Check exceptions during connection.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithWallserver): New class. A server which close
connections as soon as possible.
------------------------------------------------------------
revno: 2004.1.11
revision-id: v.ladeuil+lp at free.fr-20060920151639-744cac2535cbe84d
parent: v.ladeuil+lp at free.fr-20060917081600-8ab9edf1bb2ff400
parent: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
committer: v.ladeuil+lp at free.fr
branch nick: bzr.urllib.keepalive
timestamp: Wed 2006-09-20 17:16:39 +0200
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2004.1.10
revision-id: v.ladeuil+lp at free.fr-20060917081600-8ab9edf1bb2ff400
parent: v.ladeuil+lp at free.fr-20060917081038-fe924dd78c0944f7
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-09-17 10:16:00 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.9
revision-id: v.ladeuil+lp at free.fr-20060917081038-fe924dd78c0944f7
parent: v.ladeuil+lp at free.fr-20060916144646-7952cef9960f90c2
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.urllib.keepalive
timestamp: Sun 2006-09-17 10:10:38 +0200
message:
Takes jam's remarks into account when possible, add TODOs for the rest.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ConnectionHandler): No more need to attempt caching, the cloning
process is enough.
(Opener): Use one password manager by instance.
(HTTPDefaultErrorHandler.http_error_default): Oops, provide right
parameters to InvalidHttpResponse.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): An Opener is created for new
transports only, cloned transports reuse it.
* bzrlib/transport/http/__init__.py:
Add a TODO.
------------------------------------------------------------
revno: 2004.1.8
revision-id: v.ladeuil+lp at free.fr-20060916144646-7952cef9960f90c2
parent: v.ladeuil+lp at free.fr-20060916143536-891a1c6ac0613450
parent: john at arbash-meinel.com-20060915214016-1ddfd21056a5e711
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Sat 2006-09-16 16:46:46 +0200
message:
Merge jam's cleanup
------------------------------------------------------------
revno: 2004.1.6.1.1
revision-id: john at arbash-meinel.com-20060915214016-1ddfd21056a5e711
parent: v.ladeuil+lp at free.fr-20060915090221-af6bc3d947b03ec9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr.urllib.keepalive
timestamp: Fri 2006-09-15 16:40:16 -0500
message:
Cleanup of urllib functions
------------------------------------------------------------
revno: 2004.1.7
revision-id: v.ladeuil+lp at free.fr-20060916143536-891a1c6ac0613450
parent: v.ladeuil+lp at free.fr-20060915090221-af6bc3d947b03ec9
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Sat 2006-09-16 16:35:36 +0200
message:
Better handling of passwords (user should be queried only once).
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.ask_password): Avoid requesting password
from user by querying the password manager for already typed
password.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response, Response.begin): Makes the body ignored responses
extensible by daughter classes.
------------------------------------------------------------
revno: 2004.1.6
revision-id: v.ladeuil+lp at free.fr-20060915090221-af6bc3d947b03ec9
parent: v.ladeuil+lp at free.fr-20060915065912-413c9a47708da63f
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Fri 2006-09-15 11:02:21 +0200
message:
Connection sharing between cloned transports.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.clone): <cough> We can't decide for the class
daughters how the cloning occurs. We just give them the hint.
------------------------------------------------------------
revno: 2004.1.5
revision-id: v.ladeuil+lp at free.fr-20060915065912-413c9a47708da63f
parent: v.ladeuil+lp at free.fr-20060915065708-d3b21fd1735056ab
parent: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Fri 2006-09-15 08:59:12 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.4
revision-id: v.ladeuil+lp at free.fr-20060915065708-d3b21fd1735056ab
parent: v.ladeuil+lp at free.fr-20060914225535-e035b00b930fec1e
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Fri 2006-09-15 08:57:08 +0200
message:
Fix user handling.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Add (commented out) some traces
for transport creation avoiding cloning process.
(HttpTransport_urllib._perform): Don't handle user if there is
none, duh.
------------------------------------------------------------
revno: 2004.1.3
revision-id: v.ladeuil+lp at free.fr-20060914225535-e035b00b930fec1e
parent: v.ladeuil+lp at free.fr-20060914225342-44ea70fa1ad3433e
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Fri 2006-09-15 00:55:35 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2004.1.2
revision-id: v.ladeuil+lp at free.fr-20060914225342-44ea70fa1ad3433e
parent: v.ladeuil+lp at free.fr-20060913233907-6f23b59df5fc6105
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Fri 2006-09-15 00:53:42 +0200
message:
Implements a BasicAuthManager.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response.begin): Calls httplib.HTTPResponse.begin directly. 401
have a response body too.
(AbstractHTTPConnection.getresponse): Calls
httplib.HTTPConnection.getresponse directly.
(Request.__init__): Acquire user and password from url.
(Request.extract_auth): New method.
(Response.begin, Opener.__init__): Use an
urllib2.HTTPBasicAuthHandler.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.ask_password): New method.
(HttpTransport_urllib.__init__): Propagate user and pasword.
(HttpTransport_urllib._perform): Acquire/propagate user and password.
------------------------------------------------------------
revno: 2004.1.1
revision-id: v.ladeuil+lp at free.fr-20060913233907-6f23b59df5fc6105
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
committer: vila <v.ladeuil+lp at free.fr>
branch nick: bzr.webdav
timestamp: Thu 2006-09-14 01:39:07 +0200
message:
Connection sharing, with redirection. without authentification.
* bzrlib/transport/http/_urllib.py:
(Request): Deleted. The _urllib2 version is shiniest.
(HttpTransport_urllib): Share connections.
(HttpTransport_urllib._perform): New method.
(HttpTransport_urllib._get): Takes the _urllib2_wrappers into
account.
(HttpTransport_urllib._get_url_impl): Deleted.
(HttpTransport_urllib._head): New method.
(HttpTransport_urllib.has): Takes the _urllib2_wrappers into
account.
(HttpTransport_urllib.copy_to, HttpTransport_urllib.move,
HttpTransport_urllib.delete): Deleted. Were carbon copies of
HttpTransportBase.
* bzrlib/tests/test_http.py:
(TestHttpConnections_urllib.test_has_on_bogus_host): The timeout
was too high, at least on Mac OS X 10.3 the test was taking a
whole *minute*. Also, the new implementation raise a nice
ConnectionError.
* bzrlib/errors.py:
(ConnectionError): Don't don't repeat ConnectionError.
* bzrlib/transport/http/_urllib2_wrappers.py:
New file. Wrappers around urllib2 framework.
------------------------------------------------------------
revno: 2052.1.93
revision-id: pqm at pqm.ubuntu.com-20061120225523-9a6692bea52007b0
parent: pqm at pqm.ubuntu.com-20061120224410-8a8116b29a11c1ff
parent: andrew.bennetts at canonical.com-20061110170432-d33d520c0346b6ee
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-20 22:55:23 +0000
message:
(Andrew Bennetts) Provide wsgi support for the bzr smart server over http.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.14
revision-id: andrew.bennetts at canonical.com-20061110170432-d33d520c0346b6ee
parent: andrew.bennetts at canonical.com-20061018060759-6a590c7a6c04b360
parent: andrew.bennetts at canonical.com-20061110165308-c4194a4c961a3590
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Sat 2006-11-11 04:04:32 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13
revision-id: andrew.bennetts at canonical.com-20061018060759-6a590c7a6c04b360
parent: andrew.bennetts at canonical.com-20061013090154-173d035818dcfa75
parent: andrew.bennetts at canonical.com-20061017130359-8e216acd1a757fbf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Wed 2006-10-18 16:07:59 +1000
message:
Merge from smart server unicode.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.12
revision-id: andrew.bennetts at canonical.com-20061013090154-173d035818dcfa75
parent: andrew.bennetts at canonical.com-20061013063029-46bcfb5e8dfc5c29
parent: andrew.bennetts at canonical.com-20061013090107-2ba0614ab9774376
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Fri 2006-10-13 19:01:54 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.11
revision-id: andrew.bennetts at canonical.com-20061013063029-46bcfb5e8dfc5c29
parent: andrew.bennetts at canonical.com-20061013062144-a8c39b2a44f923ca
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Fri 2006-10-13 16:30:29 +1000
message:
Use ChrootTransportDecorator so that the WSGI server won't let you access the entire filesystem.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.10
revision-id: andrew.bennetts at canonical.com-20061013062144-a8c39b2a44f923ca
parent: andrew.bennetts at canonical.com-20061013054520-1e0b2c217d46ccd0
parent: andrew.bennetts at canonical.com-20061013062134-446cdabcf228b78c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Fri 2006-10-13 16:21:44 +1000
message:
Merge hpss HTTP support
------------------------------------------------------------
revno: 2018.1.11.1.25.1.9
revision-id: andrew.bennetts at canonical.com-20061013054520-1e0b2c217d46ccd0
parent: andrew.bennetts at canonical.com-20061013020321-80dc9b7d8cb54f53
parent: andrew.bennetts at canonical.com-20061013054511-40737c52be0aa712
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Fri 2006-10-13 15:45:20 +1000
message:
Merge from 'memory transport abspath'.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.8
revision-id: andrew.bennetts at canonical.com-20061013020321-80dc9b7d8cb54f53
parent: andrew.bennetts at canonical.com-20061012063102-f09afa428265dec4
parent: andrew.bennetts at canonical.com-20061012085943-220c54b5ae219365
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Fri 2006-10-13 12:03:21 +1000
message:
Merge smart server unicode
------------------------------------------------------------
revno: 2018.1.11.1.25.1.7
revision-id: andrew.bennetts at canonical.com-20061012063102-f09afa428265dec4
parent: andrew.bennetts at canonical.com-20061011071830-f136f8d48bbf3d6c
parent: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Thu 2006-10-12 16:31:02 +1000
message:
Merge chroot decorator
------------------------------------------------------------
revno: 2018.1.11.1.25.1.6
revision-id: andrew.bennetts at canonical.com-20061011071830-f136f8d48bbf3d6c
parent: andrew.bennetts at canonical.com-20061011065421-03b649dd2e31fd63
parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Wed 2006-10-11 17:18:30 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.5
revision-id: andrew.bennetts at canonical.com-20061011065421-03b649dd2e31fd63
parent: andrew.bennetts at canonical.com-20061011060151-e46783c84b518f8e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Wed 2006-10-11 16:54:21 +1000
message:
Improvement thanks to John's review.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.4
revision-id: andrew.bennetts at canonical.com-20061011060151-e46783c84b518f8e
parent: andrew.bennetts at canonical.com-20061009074623-41a597fcabdde73e
parent: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Wed 2006-10-11 16:01:51 +1000
message:
Merge from http-smart-server.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.3
revision-id: andrew.bennetts at canonical.com-20061009074623-41a597fcabdde73e
parent: andrew.bennetts at canonical.com-20061009033222-74cd705e085cc2c3
parent: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Mon 2006-10-09 17:46:23 +1000
message:
Merge from bzr.dev, http-smart-server.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.2
revision-id: andrew.bennetts at canonical.com-20061009033222-74cd705e085cc2c3
parent: andrew.bennetts at canonical.com-20061005102320-bafcb3559c224458
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Mon 2006-10-09 13:32:22 +1000
message:
Add security warning to http_smart_server.txt.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.1
revision-id: andrew.bennetts at canonical.com-20061005102320-bafcb3559c224458
parent: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: FastCGI
timestamp: Thu 2006-10-05 20:23:20 +1000
message:
Add WSGI smart server.
------------------------------------------------------------
revno: 2052.1.92
revision-id: pqm at pqm.ubuntu.com-20061120224410-8a8116b29a11c1ff
parent: pqm at pqm.ubuntu.com-20061120223208-fc69d003f4c4a7ac
parent: andrew.bennetts at canonical.com-20061110165308-c4194a4c961a3590
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-20 22:44:10 +0000
message:
(Andrew Bennetts) Fix some bzr smart server tests, support sending/receiving byte strings for the smart server
------------------------------------------------------------
revno: 2018.1.11.1.37
revision-id: andrew.bennetts at canonical.com-20061110165308-c4194a4c961a3590
parent: andrew.bennetts at canonical.com-20061017130359-8e216acd1a757fbf
parent: andrew.bennetts at canonical.com-20061110164431-fdc166350477cfc0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Sat 2006-11-11 03:53:08 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.11.1.30.1.4
revision-id: andrew.bennetts at canonical.com-20061110164431-fdc166350477cfc0
parent: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
parent: andrew.bennetts at canonical.com-20061110163300-407c8f248e493e00
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Sat 2006-11-11 03:44:31 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.11.1.36
revision-id: andrew.bennetts at canonical.com-20061017130359-8e216acd1a757fbf
parent: andrew.bennetts at canonical.com-20061013090107-2ba0614ab9774376
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Tue 2006-10-17 23:03:59 +1000
message:
Don't UTF-8 decode paths in requests. They should be url-quoted (and thus
ASCII) already.
Instead, change _encode_tuple and _decode_tuple to work with tuples of
bytestrings rather than unicode objects.
------------------------------------------------------------
revno: 2018.1.11.1.35
revision-id: andrew.bennetts at canonical.com-20061013090107-2ba0614ab9774376
parent: andrew.bennetts at canonical.com-20061013062134-446cdabcf228b78c
parent: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Fri 2006-10-13 19:01:07 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.30.1.3
revision-id: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
parent: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
parent: andrew.bennetts at canonical.com-20061013085657-7e2e97b73277150a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-10-13 19:00:52 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.34
revision-id: andrew.bennetts at canonical.com-20061013062134-446cdabcf228b78c
parent: andrew.bennetts at canonical.com-20061013054511-40737c52be0aa712
parent: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Fri 2006-10-13 16:21:34 +1000
message:
Merge hpss HTTP support
------------------------------------------------------------
revno: 2018.1.11.1.30.1.2
revision-id: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
parent: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-10-13 16:07:17 +1000
message:
Ensure that a request's next_read_size() is 0 once an error response is sent.
This is done by setting the finished flag in _send_response, and removing
sync_with_request entirely.
Also s/_finished_reading/_finished/ in SmartServerRequestProtocolOne.
------------------------------------------------------------
revno: 2018.1.11.1.33
revision-id: andrew.bennetts at canonical.com-20061013054511-40737c52be0aa712
parent: andrew.bennetts at canonical.com-20061012085943-220c54b5ae219365
parent: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Fri 2006-10-13 15:45:11 +1000
message:
Merge from 'memory transport abspath'.
------------------------------------------------------------
revno: 2018.1.11.1.30.1.1
revision-id: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
parent: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
parent: andrew.bennetts at canonical.com-20061013054424-f5728f4a9d1dd739
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-10-13 15:44:45 +1000
message:
Merge from 'memory transport abspath'.
------------------------------------------------------------
revno: 2018.1.11.1.32
revision-id: andrew.bennetts at canonical.com-20061012085943-220c54b5ae219365
parent: andrew.bennetts at canonical.com-20061012085801-36b60463388ea0e7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Thu 2006-10-12 18:59:43 +1000
message:
Add a NEWS entry for this fix.
------------------------------------------------------------
revno: 2018.1.11.1.31
revision-id: andrew.bennetts at canonical.com-20061012085801-36b60463388ea0e7
parent: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart server unicode
timestamp: Thu 2006-10-12 18:58:01 +1000
message:
Fix dispatching of smart server requests involving unicode paths.
------------------------------------------------------------
revno: 2018.1.11.1.30
revision-id: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
parent: andrew.bennetts at canonical.com-20061012060928-e387650ef98b70f5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-10-12 16:30:51 +1000
message:
Merge chroot decorator
------------------------------------------------------------
revno: 2052.1.91
revision-id: pqm at pqm.ubuntu.com-20061120223208-fc69d003f4c4a7ac
parent: pqm at pqm.ubuntu.com-20061120222017-87b0960a1ad1ed22
parent: andrew.bennetts at canonical.com-20061110163300-407c8f248e493e00
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-20 22:32:08 +0000
message:
(Andrew Bennetts) And chroot+ decorator for transports
------------------------------------------------------------
revno: 2052.1.18.5.4
revision-id: andrew.bennetts at canonical.com-20061110163300-407c8f248e493e00
parent: andrew.bennetts at canonical.com-20061013085657-7e2e97b73277150a
parent: pqm at pqm.ubuntu.com-20061109155425-7f9ebe1d71457b6e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: chroot decorator
timestamp: Sat 2006-11-11 03:33:00 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2052.1.18.5.3
revision-id: andrew.bennetts at canonical.com-20061013085657-7e2e97b73277150a
parent: andrew.bennetts at canonical.com-20061013054424-f5728f4a9d1dd739
parent: andrew.bennetts at canonical.com-20061013085623-ddfddab29f5f4e16
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: chroot decorator
timestamp: Fri 2006-10-13 18:56:57 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.18.5.2
revision-id: andrew.bennetts at canonical.com-20061013054424-f5728f4a9d1dd739
parent: andrew.bennetts at canonical.com-20061012060928-e387650ef98b70f5
parent: andrew.bennetts at canonical.com-20061013052902-60a2d663ee8d494b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: chroot decorator
timestamp: Fri 2006-10-13 15:44:24 +1000
message:
Merge from 'memory transport abspath'.
------------------------------------------------------------
revno: 2052.1.18.5.1
revision-id: andrew.bennetts at canonical.com-20061012060928-e387650ef98b70f5
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: chroot decorator
timestamp: Thu 2006-10-12 16:09:28 +1000
message:
Add ChrootTransportDecorator.
------------------------------------------------------------
revno: 2052.1.90
revision-id: pqm at pqm.ubuntu.com-20061120222017-87b0960a1ad1ed22
parent: pqm at pqm.ubuntu.com-20061118223816-98bad5e152872c81
parent: john at arbash-meinel.com-20061120220811-2bbqygt770x1uhjv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-20 22:20:17 +0000
message:
(Henri Wiechers) Fix TextTestResult report methods to avoid problems with % chars
------------------------------------------------------------
revno: 2052.1.89.1.1
revision-id: john at arbash-meinel.com-20061120220811-2bbqygt770x1uhjv
parent: pqm at pqm.ubuntu.com-20061118223816-98bad5e152872c81
parent: hwiechers at gmail.com-20061111173335-d7ce214babe3e9eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-11-20 16:08:11 -0600
message:
(Henri Wiechers) Fix TextTestResult report methods to avoid problems with % chars
------------------------------------------------------------
revno: 2052.1.82.1.1
revision-id: hwiechers at gmail.com-20061111173335-d7ce214babe3e9eb
parent: pqm at pqm.ubuntu.com-20061111010134-ead5a1dce74d0836
committer: Henri Wiechers <hwiechers at gmail.com>
branch nick: winfix_report_failure
timestamp: Sat 2006-11-11 19:33:35 +0200
message:
Changed TextTestResult's report methods to avoid % formatting in calls to ProgressBar.note(), instead args are passed and note() handles the formatting. This prevents bugs where note() might be passed a string with %'s in it because one of the args contain %'s.
------------------------------------------------------------
revno: 2052.1.89
revision-id: pqm at pqm.ubuntu.com-20061118223816-98bad5e152872c81
parent: pqm at pqm.ubuntu.com-20061117041115-edacd4c4482528f6
parent: bialix at ukr.net-20061118103254-m3o1jc1s9m5dvlqs
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-11-18 22:38:16 +0000
message:
Whitebox test for Config.get_nickname (req. by Aaron Bentley)
------------------------------------------------------------
revno: 2052.1.68.5.4
revision-id: bialix at ukr.net-20061118103254-m3o1jc1s9m5dvlqs
parent: bialix at ukr.net-20061118100709-vb1pduxdzy3130kb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: autonick.fix
timestamp: Sat 2006-11-18 12:32:54 +0200
message:
Whitebox test for Config.get_nickname (req. by Aaron Bentley)
------------------------------------------------------------
revno: 2052.1.68.5.3
revision-id: bialix at ukr.net-20061118100709-vb1pduxdzy3130kb
parent: bialix at ukr.net-20061105143045-10c03a2d89530bde
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: autonick.fix
timestamp: Sat 2006-11-18 12:07:09 +0200
message:
Fix year in copyrights
------------------------------------------------------------
revno: 2052.1.68.5.2
revision-id: bialix at ukr.net-20061105143045-10c03a2d89530bde
parent: bialix at ukr.net-20061105142238-0b077eae35d8bf31
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: autonick.fix
timestamp: Sun 2006-11-05 16:30:45 +0200
message:
(jam) Fix for bug #66857
------------------------------------------------------------
revno: 2052.1.68.5.1
revision-id: bialix at ukr.net-20061105142238-0b077eae35d8bf31
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: autonick.fix
timestamp: Sun 2006-11-05 16:22:38 +0200
message:
Added test for bug #66857 (autonick is urlencoded)
------------------------------------------------------------
revno: 2052.1.88
revision-id: pqm at pqm.ubuntu.com-20061117041115-edacd4c4482528f6
parent: pqm at pqm.ubuntu.com-20061116183333-5f56523d7b44e564
parent: aaron.bentley at utoronto.ca-20061117035745-ovcrn4resw2if6xf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-17 04:11:15 +0000
message:
Fix bug in paramiko usage
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.2
revision-id: aaron.bentley at utoronto.ca-20061117035745-ovcrn4resw2if6xf
parent: aaron.bentley at utoronto.ca-20061117035530-o1s25daibe0t3p1t
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-11-16 22:57:45 -0500
message:
Bugfix for paramiko connections
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.1
revision-id: aaron.bentley at utoronto.ca-20061117035530-o1s25daibe0t3p1t
parent: aaron.bentley at utoronto.ca-20061018024451-4314e738314f7c91
parent: pqm at pqm.ubuntu.com-20061116183333-5f56523d7b44e564
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-11-16 22:55:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.87
revision-id: pqm at pqm.ubuntu.com-20061116183333-5f56523d7b44e564
parent: pqm at pqm.ubuntu.com-20061116175907-57fe66263308d365
parent: larstiq at larstiq.dyndns.org-20061116181759-pu74jhf3rackvjdn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-16 18:33:33 +0000
message:
(Dmitry Vasiliev) Robuster external diff output handling.
------------------------------------------------------------
revno: 2052.1.86.1.1
revision-id: larstiq at larstiq.dyndns.org-20061116181759-pu74jhf3rackvjdn
parent: pqm at pqm.ubuntu.com-20061116175907-57fe66263308d365
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: robuster.external.diff
timestamp: Thu 2006-11-16 19:17:59 +0100
message:
Robuster external diff output handling.
------------------------------------------------------------
revno: 2052.1.86
revision-id: pqm at pqm.ubuntu.com-20061116175907-57fe66263308d365
parent: pqm at pqm.ubuntu.com-20061116174758-027120b87fb7564d
parent: bialix at ukr.net-20061111104339-de73f7adf2172978
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-16 17:59:07 +0000
message:
(jam, bialix) Workaround for cp0 console encoding on Windows.
------------------------------------------------------------
revno: 2052.1.75.4.1
revision-id: bialix at ukr.net-20061111104339-de73f7adf2172978
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win.console.cp0
timestamp: Sat 2006-11-11 12:43:39 +0200
message:
(jam, bialix) Workaround for cp0 console encoding on Windows
------------------------------------------------------------
revno: 2052.1.85
revision-id: pqm at pqm.ubuntu.com-20061116174758-027120b87fb7564d
parent: pqm at pqm.ubuntu.com-20061116155638-13adbf977ff0301b
parent: bialix at ukr.net-20061111133203-279b1c8d029761b9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-16 17:47:58 +0000
message:
(Alexander Belchenko) Fix paramiko HostKeys incompatibility.
------------------------------------------------------------
revno: 2052.1.75.3.1
revision-id: bialix at ukr.net-20061111133203-279b1c8d029761b9
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: paramiko.hostkeys
timestamp: Sat 2006-11-11 15:32:03 +0200
message:
Use BZR_HOSTKEYS.add instead of deprecated dict-like paramiko interface
------------------------------------------------------------
revno: 2052.1.84
revision-id: pqm at pqm.ubuntu.com-20061116155638-13adbf977ff0301b
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
parent: fullermd at over-yonder.net-20061111192525-2as2mi0h2m6id0wd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-16 15:56:38 +0000
message:
(Matthew D. Fuller) Document usage of VISUAL environment variable for message editor
------------------------------------------------------------
revno: 2052.1.83.1.3
revision-id: fullermd at over-yonder.net-20061111192525-2as2mi0h2m6id0wd
parent: fullermd at over-yonder.net-20061111192147-sqtlv0erti2o54t9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: fix-visual
timestamp: Sat 2006-11-11 13:25:25 -0600
message:
Include $VISUAL in the list of env variables when we can't start an
editor.
------------------------------------------------------------
revno: 2052.1.83.1.2
revision-id: fullermd at over-yonder.net-20061111192147-sqtlv0erti2o54t9
parent: fullermd at over-yonder.net-20061111192008-klzw8naola7mde0f
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: fix-visual
timestamp: Sat 2006-11-11 13:21:47 -0600
message:
Mention $VISUAL here, and play with the wording of the other ways of
setting the editor to make it flow better.
------------------------------------------------------------
revno: 2052.1.83.1.1
revision-id: fullermd at over-yonder.net-20061111192008-klzw8naola7mde0f
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: fix-visual
timestamp: Sat 2006-11-11 13:20:08 -0600
message:
Correct statement about the precedence of $EDITOR, and mention
$VISUAL.
------------------------------------------------------------
revno: 2052.1.83
revision-id: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
parent: pqm at pqm.ubuntu.com-20061111010134-ead5a1dce74d0836
parent: dsilvers at digital-scurf.org-20061111162708-fb545d8a5b913f04
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-11-11 17:03:13 +0000
message:
(Daniel Silverstone) Add 'bzr remove-tree'
------------------------------------------------------------
revno: 2052.1.75.2.3
revision-id: dsilvers at digital-scurf.org-20061111162708-fb545d8a5b913f04
parent: dsilvers at digital-scurf.org-20061111130454-12fc35cbbf0a331f
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Sat 2006-11-11 16:27:08 +0000
message:
Oops, fix the message up
------------------------------------------------------------
revno: 2052.1.75.2.2
revision-id: dsilvers at digital-scurf.org-20061111130454-12fc35cbbf0a331f
parent: dsilvers at digital-scurf.org-20061110193026-773bf69678268da9
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Sat 2006-11-11 13:04:54 +0000
message:
Refactor the remove-tree stuff after review from J-A-M
------------------------------------------------------------
revno: 2052.1.75.2.1
revision-id: dsilvers at digital-scurf.org-20061110193026-773bf69678268da9
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Fri 2006-11-10 19:30:26 +0000
message:
Add remove-tree and its blackbox tests
------------------------------------------------------------
revno: 2052.1.82
revision-id: pqm at pqm.ubuntu.com-20061111010134-ead5a1dce74d0836
parent: pqm at pqm.ubuntu.com-20061110235842-b15016f7ab574f5f
parent: john at arbash-meinel.com-20061111003436-tanp2dzwynanb2w9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-11-11 01:01:34 +0000
message:
(James Westby) Remove duplicate test_cur_revno test
------------------------------------------------------------
revno: 2052.1.81.1.1
revision-id: john at arbash-meinel.com-20061111003436-tanp2dzwynanb2w9
parent: pqm at pqm.ubuntu.com-20061110235842-b15016f7ab574f5f
parent: jw+debian at jameswestby.net-20061103183529-be47e5c89dac325b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-11-10 18:34:36 -0600
message:
(James Westby) Remove duplicate test_cur_revno test
------------------------------------------------------------
revno: 2052.1.68.4.1
revision-id: jw+debian at jameswestby.net-20061103183529-be47e5c89dac325b
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.duplication
timestamp: Fri 2006-11-03 18:35:29 +0000
message:
Delete duplicate test_cur_revno test.
------------------------------------------------------------
revno: 2052.1.81
revision-id: pqm at pqm.ubuntu.com-20061110235842-b15016f7ab574f5f
parent: pqm at pqm.ubuntu.com-20061110224934-ffa87973e950982e
parent: john at arbash-meinel.com-20061110225457-e72551c15908891d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 23:58:42 +0000
message:
(Henri Wiechers) Update osutils.rmtree for changes in Windows python 2.5
------------------------------------------------------------
revno: 2052.1.79.1.1
revision-id: john at arbash-meinel.com-20061110225457-e72551c15908891d
parent: pqm at pqm.ubuntu.com-20061110223908-6965cc2d2dedfee2
parent: hwiechers at gmail.com-20061102211119-7017a1215fd5f2fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-11-10 16:54:57 -0600
message:
(Henri Wiechers) Update osutils.rmtree for changes in Windows python 2.5
------------------------------------------------------------
revno: 2052.1.64.5.1
revision-id: hwiechers at gmail.com-20061102211119-7017a1215fd5f2fa
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
committer: Henri Wiechers <hwiechers at gmail.com>
branch nick: winfix
timestamp: Thu 2006-11-02 23:11:19 +0200
message:
Fixes osutils.rmtree on Windows with Python 2.5
------------------------------------------------------------
revno: 2052.1.80
revision-id: pqm at pqm.ubuntu.com-20061110224934-ffa87973e950982e
parent: pqm at pqm.ubuntu.com-20061110223908-6965cc2d2dedfee2
parent: john at arbash-meinel.com-20061110221823-36f886d380ca8983
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 22:49:34 +0000
message:
(John Arbash Meinel) Change revision_id generator, so we don't require an email address to commit
------------------------------------------------------------
revno: 2052.1.64.4.2
revision-id: john at arbash-meinel.com-20061110221823-36f886d380ca8983
parent: john at arbash-meinel.com-20061102224849-9683d741ce3fbe38
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_no_email
timestamp: Fri 2006-11-10 16:18:23 -0600
message:
Remove a function that was never actually written
------------------------------------------------------------
revno: 2052.1.64.4.1
revision-id: john at arbash-meinel.com-20061102224849-9683d741ce3fbe38
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_no_email
timestamp: Thu 2006-11-02 16:48:49 -0600
message:
Update file and revision id generators.
Move id generation to its own file, deprecate the old functions,
make gen_revision_id() not require an email address in the
username, and use rand_chars() instead of hexlify(rand_bytes())
------------------------------------------------------------
revno: 2052.1.79
revision-id: pqm at pqm.ubuntu.com-20061110223908-6965cc2d2dedfee2
parent: pqm at pqm.ubuntu.com-20061110222827-633bf3bf822000a4
parent: john at arbash-meinel.com-20061110222315-07f2336970e50698
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 22:39:08 +0000
message:
(John Arbash Meinel) Cleanup error tests
------------------------------------------------------------
revno: 2052.1.64.3.2
revision-id: john at arbash-meinel.com-20061110222315-07f2336970e50698
parent: john at arbash-meinel.com-20061102194910-cf1f11808022c972
parent: pqm at pqm.ubuntu.com-20061110221625-10a46c366b686a21
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-11-10 16:23:15 -0600
message:
[merge] bzr.dev 2129
------------------------------------------------------------
revno: 2052.1.64.3.1
revision-id: john at arbash-meinel.com-20061102194910-cf1f11808022c972
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-11-02 13:49:10 -0600
message:
Cleanup error tests
------------------------------------------------------------
revno: 2052.1.78
revision-id: pqm at pqm.ubuntu.com-20061110222827-633bf3bf822000a4
parent: pqm at pqm.ubuntu.com-20061110221625-10a46c366b686a21
parent: john at arbash-meinel.com-20061102182724-a28db2aff58d51d2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 22:28:27 +0000
message:
(John Arbash Meinel) Allow commit --strict to work again, by ignoring bzr-commit-* files
------------------------------------------------------------
revno: 2052.1.64.2.1
revision-id: john at arbash-meinel.com-20061102182724-a28db2aff58d51d2
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_strict_message
timestamp: Thu 2006-11-02 12:27:24 -0600
message:
Add commit --strict tests, and add a default ignore so that commit --strict works again
------------------------------------------------------------
revno: 2052.1.77
revision-id: pqm at pqm.ubuntu.com-20061110221625-10a46c366b686a21
parent: pqm at pqm.ubuntu.com-20061110155224-dbb6ab1c64d5a4cf
parent: john at arbash-meinel.com-20061110153816-46acf76fc86a512b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 22:16:25 +0000
message:
(John Arbash Meinel) Use try/finally to clean up a nested progress bar in the weave code
------------------------------------------------------------
revno: 2052.1.75.1.1
revision-id: john at arbash-meinel.com-20061110153816-46acf76fc86a512b
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: weave_nested_progress
timestamp: Fri 2006-11-10 09:38:16 -0600
message:
use try/finally to clean up a nested progress bar during weave fetching
------------------------------------------------------------
revno: 2052.1.76
revision-id: pqm at pqm.ubuntu.com-20061110155224-dbb6ab1c64d5a4cf
parent: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
parent: john at arbash-meinel.com-20061107180011-80e613272a8f67b3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 15:52:24 +0000
message:
(John Arbash Meinel) import workingtree in bzrdir, fix bug #70716
------------------------------------------------------------
revno: 2052.1.71.2.1
revision-id: john at arbash-meinel.com-20061107180011-80e613272a8f67b3
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzrdir_import_workingtree
timestamp: Tue 2006-11-07 12:00:11 -0600
message:
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
------------------------------------------------------------
revno: 2052.1.75
revision-id: pqm at pqm.ubuntu.com-20061110033744-421471bcb63181ca
parent: pqm at pqm.ubuntu.com-20061109155425-7f9ebe1d71457b6e
parent: aaron.bentley at utoronto.ca-20061110023400-ee2ce6e893707008
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-10 03:37:44 +0000
message:
Implement pretty-html-docs using Kid to manipulate docutils html
------------------------------------------------------------
revno: 2052.1.2.2.16
revision-id: aaron.bentley at utoronto.ca-20061110023400-ee2ce6e893707008
parent: aaron.bentley at utoronto.ca-20061110015555-f48202744b630209
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Thu 2006-11-09 21:34:00 -0500
message:
More updates from review comments
------------------------------------------------------------
revno: 2052.1.2.2.15
revision-id: aaron.bentley at utoronto.ca-20061110015555-f48202744b630209
parent: aaron.bentley at utoronto.ca-20061110014751-e6da9027939cd42a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Thu 2006-11-09 20:55:55 -0500
message:
Ignore html docs (both kinds)
------------------------------------------------------------
revno: 2052.1.2.2.14
revision-id: aaron.bentley at utoronto.ca-20061110014751-e6da9027939cd42a
parent: aaron.bentley at utoronto.ca-20061105212058-0bfe754be572d2c1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Thu 2006-11-09 20:47:51 -0500
message:
Add 'pretty-docs' target to makefile
------------------------------------------------------------
revno: 2052.1.2.2.13
revision-id: aaron.bentley at utoronto.ca-20061105212058-0bfe754be572d2c1
parent: aaron.bentley at utoronto.ca-20061105210427-a6caac7e130180a9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Sun 2006-11-05 16:20:58 -0500
message:
Add rule to copy files to HTMLDIR
------------------------------------------------------------
revno: 2052.1.2.2.12
revision-id: aaron.bentley at utoronto.ca-20061105210427-a6caac7e130180a9
parent: aaron.bentley at utoronto.ca-20061105204445-ca99be6e2e9b56b0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Sun 2006-11-05 16:04:27 -0500
message:
Switch to HTMLTreeBuilder, so that HTML entity references are handled.
------------------------------------------------------------
revno: 2052.1.2.2.11
revision-id: aaron.bentley at utoronto.ca-20061105204445-ca99be6e2e9b56b0
parent: aaron.bentley at utoronto.ca-20061104060608-324b9a1be1fe9023
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Sun 2006-11-05 15:44:45 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.2.2.10
revision-id: aaron.bentley at utoronto.ca-20061104060608-324b9a1be1fe9023
parent: aaron.bentley at utoronto.ca-20061104060130-03d4088a0807170a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Sat 2006-11-04 01:06:08 -0500
message:
Add navigation links
------------------------------------------------------------
revno: 2052.1.2.2.9
revision-id: aaron.bentley at utoronto.ca-20061104060130-03d4088a0807170a
parent: abentley at panoramicfeedback.com-20061103222059-274e84bc160b7fed
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: kid-docs
timestamp: Sat 2006-11-04 01:01:30 -0500
message:
tweak makefile to depend on kid template
------------------------------------------------------------
revno: 2052.1.2.2.8
revision-id: abentley at panoramicfeedback.com-20061103222059-274e84bc160b7fed
parent: abentley at panoramicfeedback.com-20060929213928-9861e8b01c3f02b9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-11-03 17:20:59 -0500
message:
Add makefile for generating rest/kid docs, use .htm extension
------------------------------------------------------------
revno: 2052.1.2.2.7
revision-id: abentley at panoramicfeedback.com-20060929213928-9861e8b01c3f02b9
parent: abentley at panoramicfeedback.com-20060929204324-a3e07090dd72f030
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 17:39:28 -0400
message:
Force a name to black
------------------------------------------------------------
revno: 2052.1.2.2.6
revision-id: abentley at panoramicfeedback.com-20060929204324-a3e07090dd72f030
parent: abentley at panoramicfeedback.com-20060929200117-4623d1a42eae62ea
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 16:43:24 -0400
message:
Hide match rule
------------------------------------------------------------
revno: 2052.1.2.2.5
revision-id: abentley at panoramicfeedback.com-20060929200117-4623d1a42eae62ea
parent: abentley at panoramicfeedback.com-20060929190646-205fec57678c1272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 16:01:17 -0400
message:
Make subheadings appear correctly, hide inappropriate menu, fix search
------------------------------------------------------------
revno: 2052.1.2.2.4
revision-id: abentley at panoramicfeedback.com-20060929190646-205fec57678c1272
parent: abentley at panoramicfeedback.com-20060929185843-6841128d849c46a2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 15:06:46 -0400
message:
Remove base href
------------------------------------------------------------
revno: 2052.1.2.2.3
revision-id: abentley at panoramicfeedback.com-20060929185843-6841128d849c46a2
parent: abentley at panoramicfeedback.com-20060929182614-aad7f271ea776948
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 14:58:43 -0400
message:
Get page generation working
------------------------------------------------------------
revno: 2052.1.2.2.2
revision-id: abentley at panoramicfeedback.com-20060929182614-aad7f271ea776948
parent: abentley at panoramicfeedback.com-20060929182000-40a5529baaee5a42
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 14:26:14 -0400
message:
Run HTML tidy to convert bazaar-vcs.org to xhtml
------------------------------------------------------------
revno: 2052.1.2.2.1
revision-id: abentley at panoramicfeedback.com-20060929182000-40a5529baaee5a42
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kid-docs
timestamp: Fri 2006-09-29 14:20:00 -0400
message:
Start work on pretty rest conversion
------------------------------------------------------------
revno: 2052.1.74
revision-id: pqm at pqm.ubuntu.com-20061109155425-7f9ebe1d71457b6e
parent: pqm at pqm.ubuntu.com-20061109154315-3c7b7803b2f8f863
parent: john at arbash-meinel.com-20061109142921-0b13c8496ca298d0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-09 15:54:25 +0000
message:
(Goffredo Baroncelli, John Arbash Meinel) add 'bzr help topics' to have help for more than just commands
------------------------------------------------------------
revno: 2052.1.18.4.15
revision-id: john at arbash-meinel.com-20061109142921-0b13c8496ca298d0
parent: john at arbash-meinel.com-20061108162927-edda0731a0f1e0bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-11-09 08:29:21 -0600
message:
Fixes from Martin
------------------------------------------------------------
revno: 2052.1.18.4.14
revision-id: john at arbash-meinel.com-20061108162927-edda0731a0f1e0bc
parent: john at arbash-meinel.com-20061108162419-5b725384876fc939
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Wed 2006-11-08 10:29:27 -0600
message:
Switch revisionspec to use the help defined as help_txt rather than the doc string
------------------------------------------------------------
revno: 2052.1.18.4.13
revision-id: john at arbash-meinel.com-20061108162419-5b725384876fc939
parent: ghigo at venice-20061107194438-847bd7664bdda272
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Wed 2006-11-08 10:24:19 -0600
message:
Switch help_topics to use a Registry.
This also involves changing the API for topics so that the detail
function returns a string, rather than assuming that all uses of
help topics will be for writing to a file.
------------------------------------------------------------
revno: 2052.1.18.4.12
revision-id: ghigo at venice-20061107194438-847bd7664bdda272
parent: ghigo at venice-20061107194128-cb929b896e9282d5
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Tue 2006-11-07 20:44:38 +0100
message:
Update to bzr.dev
------------------------------------------------------------
revno: 2052.1.18.4.11
revision-id: ghigo at venice-20061107194128-cb929b896e9282d5
parent: ghigo at venice-20061106200643-fbb177de22f12ebb
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Tue 2006-11-07 20:41:28 +0100
message:
Update the NEWS file
------------------------------------------------------------
revno: 2052.1.18.4.10
revision-id: ghigo at venice-20061106200643-fbb177de22f12ebb
parent: ghigo at venice-20061022164328-da86f3a7676b06bd
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Mon 2006-11-06 21:06:43 +0100
message:
update to latest bzr.dev
------------------------------------------------------------
revno: 2052.1.18.4.9
revision-id: ghigo at venice-20061022164328-da86f3a7676b06bd
parent: ghigo at venice-20061015204439-7a8aebd09bc10639
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Sun 2006-10-22 18:43:28 +0200
message:
Update to bzr.dev
------------------------------------------------------------
revno: 2052.1.18.4.8
revision-id: ghigo at venice-20061015204439-7a8aebd09bc10639
parent: ghigo at venice-20061015202742-b43422b297ac37b5
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Sun 2006-10-15 22:44:39 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.18.4.7
revision-id: ghigo at venice-20061015202742-b43422b297ac37b5
parent: john at arbash-meinel.com-20061012010243-55bea84b7421e77b
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Sun 2006-10-15 22:27:42 +0200
message:
Updates on the basis of the Richard Wilbur suggestions
------------------------------------------------------------
revno: 2052.1.18.4.6
revision-id: john at arbash-meinel.com-20061012010243-55bea84b7421e77b
parent: john at arbash-meinel.com-20061012005747-15a4ee1130b4fbcf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 11:02:43 +1000
message:
Update NEWS for fixing bug #42714
------------------------------------------------------------
revno: 2052.1.18.4.5
revision-id: john at arbash-meinel.com-20061012005747-15a4ee1130b4fbcf
parent: john at arbash-meinel.com-20061011232049-fb72d08f35188d01
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 10:57:47 +1000
message:
cleanup copyright line
------------------------------------------------------------
revno: 2052.1.18.4.4
revision-id: john at arbash-meinel.com-20061011232049-fb72d08f35188d01
parent: john at arbash-meinel.com-20061011224303-917597a4ade5429c
parent: john at arbash-meinel.com-20060914193257-36925f08ab032c74
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 09:20:49 +1000
message:
merge in history from alternate branch
------------------------------------------------------------
revno: 1993.4.8
revision-id: john at arbash-meinel.com-20060914193257-36925f08ab032c74
parent: john at arbash-meinel.com-20060909151646-a6789590560bf05d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Thu 2006-09-14 14:32:57 -0500
message:
typo found by Lele Gaifax
------------------------------------------------------------
revno: 1993.4.7
revision-id: john at arbash-meinel.com-20060909151646-a6789590560bf05d
parent: john at arbash-meinel.com-20060909151521-9ffe131b81bd6e73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 10:16:46 -0500
message:
PEP8 cleanup
------------------------------------------------------------
revno: 1993.4.6
revision-id: john at arbash-meinel.com-20060909151521-9ffe131b81bd6e73
parent: john at arbash-meinel.com-20060909151330-e1cb502974b798a9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 10:15:21 -0500
message:
Cleanup the cmd_help class
------------------------------------------------------------
revno: 1993.4.5
revision-id: john at arbash-meinel.com-20060909151330-e1cb502974b798a9
parent: john at arbash-meinel.com-20060909150847-6e59694217ce66aa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 10:13:30 -0500
message:
Add some basic smoke tests for help topics
------------------------------------------------------------
revno: 1993.4.4
revision-id: john at arbash-meinel.com-20060909150847-6e59694217ce66aa
parent: john at arbash-meinel.com-20060909150836-fd1f62174772391f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 10:08:47 -0500
message:
cleanup help.py
------------------------------------------------------------
revno: 1993.4.3
revision-id: john at arbash-meinel.com-20060909150836-fd1f62174772391f
parent: john at arbash-meinel.com-20060909144319-e7b15cd1b7982da4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 10:08:36 -0500
message:
Update the help text for various revision specs
------------------------------------------------------------
revno: 1993.4.2
revision-id: john at arbash-meinel.com-20060909144319-e7b15cd1b7982da4
parent: john at arbash-meinel.com-20060909142456-0178875f70585f20
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 09:43:19 -0500
message:
cleanup (pep8 mostly) help_topics
------------------------------------------------------------
revno: 1993.4.1
revision-id: john at arbash-meinel.com-20060909142456-0178875f70585f20
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-text
timestamp: Sat 2006-09-09 09:24:56 -0500
message:
Goffredo Baroncelli: add help topics
------------------------------------------------------------
revno: 2052.1.18.4.3
revision-id: john at arbash-meinel.com-20061011224303-917597a4ade5429c
parent: john at arbash-meinel.com-20061011223505-88235d690643ffd7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 08:43:03 +1000
message:
code and doc cleanup
------------------------------------------------------------
revno: 2052.1.18.4.2
revision-id: john at arbash-meinel.com-20061011223505-88235d690643ffd7
parent: john at arbash-meinel.com-20061011220357-f0c99e42c69f2a17
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 08:35:05 +1000
message:
cleanup help_topics.py
------------------------------------------------------------
revno: 2052.1.18.4.1
revision-id: john at arbash-meinel.com-20061011220357-f0c99e42c69f2a17
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: ghigo at venice-20061009165532-eb90cab6912df82c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: help-topics
timestamp: Thu 2006-10-12 08:03:57 +1000
message:
[merge] (Geoffredo Baroncelli) add 'bzr help topics'
------------------------------------------------------------
revno: 2023.1.4
revision-id: ghigo at venice-20061009165532-eb90cab6912df82c
parent: ghigo at venice-20061009164614-36625980823e6b81
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Mon 2006-10-09 18:55:32 +0200
message:
the ''bzr help topics'' output is shorter
------------------------------------------------------------
revno: 2023.1.3
revision-id: ghigo at venice-20061009164614-36625980823e6b81
parent: ghigo at venice-20060920210038-6f46e04ee2de73d6
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Mon 2006-10-09 18:46:14 +0200
message:
update to bzr.dev
------------------------------------------------------------
revno: 2023.1.2
revision-id: ghigo at venice-20060920210038-6f46e04ee2de73d6
parent: ghigo at venice-20060920205927-6ae24018d7b8c33c
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Wed 2006-09-20 23:00:38 +0200
message:
add help topics module
------------------------------------------------------------
revno: 2023.1.1
revision-id: ghigo at venice-20060920205927-6ae24018d7b8c33c
parent: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
committer: ghigo <ghigo at venice>
branch nick: bzr-help-topics
timestamp: Wed 2006-09-20 22:59:27 +0200
message:
add topics help
------------------------------------------------------------
revno: 2052.1.73
revision-id: pqm at pqm.ubuntu.com-20061109154315-3c7b7803b2f8f863
parent: pqm at pqm.ubuntu.com-20061108184309-7f42d0212467bea2
parent: john at arbash-meinel.com-20061031203158-d457b5670268f172
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-09 15:43:15 +0000
message:
(John Arbash Meinel) Removed dependency on paramiko for bzr+ssh
------------------------------------------------------------
revno: 2052.1.52.5.1
revision-id: john at arbash-meinel.com-20061031203158-d457b5670268f172
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr_ssh_no_paramiko
timestamp: Tue 2006-10-31 14:31:58 -0600
message:
Remove the strict dependency on paramiko for ssh access
------------------------------------------------------------
revno: 2052.1.72
revision-id: pqm at pqm.ubuntu.com-20061108184309-7f42d0212467bea2
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
parent: robertc at robertcollins.net-20061108181955-eb8da16083292af7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-11-08 18:43:09 +0000
message:
(Robert Collins) When apport is present on a system, use it to gather more information for bug reporting, and present a less intimidating request that the user submit a bug report
------------------------------------------------------------
revno: 2052.1.71.1.2
revision-id: robertc at robertcollins.net-20061108181955-eb8da16083292af7
parent: robertc at robertcollins.net-20061108003630-feb31613c83f7096
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-11-09 05:19:55 +1100
message:
Ensure TestSkipped is present for skipping when new test dependency on apport is missing.
------------------------------------------------------------
revno: 2052.1.71.1.1
revision-id: robertc at robertcollins.net-20061108003630-feb31613c83f7096
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: apport
timestamp: Wed 2006-11-08 11:36:30 +1100
message:
(Robert Collins) Extend the problem reporting command line UI to use
apport to report more detailed diagnostics which should help in in getting
faults reported in Malone and provides the basis for capturing more
information such as detailed logging data from the current invocation of
bzr in the future (without cluttering 'bzr.log' unnecessarily).
apport is available from Ubuntu Edgy onwards.
------------------------------------------------------------
revno: 2052.1.71
revision-id: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
parent: pqm at pqm.ubuntu.com-20061106223554-ddb45c6a08929e08
parent: john at arbash-meinel.com-20061107045535-33498117d2936283
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-11-07 05:07:30 +0000
message:
(John Arbash Meinel) Fix MemoryTransport.list_dir() in the root directory
------------------------------------------------------------
revno: 2052.1.68.3.2
revision-id: john at arbash-meinel.com-20061107045535-33498117d2936283
parent: john at arbash-meinel.com-20061103210701-47426955baa7bd9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: memory_list_dir
timestamp: Mon 2006-11-06 22:55:35 -0600
message:
Add NEWS entry
------------------------------------------------------------
revno: 2052.1.68.3.1
revision-id: john at arbash-meinel.com-20061103210701-47426955baa7bd9b
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: memory_list_dir
timestamp: Fri 2006-11-03 15:07:01 -0600
message:
Fix MemoryTransport.list_dir() implementation, and update tests
------------------------------------------------------------
revno: 2052.1.70
revision-id: pqm at pqm.ubuntu.com-20061106223554-ddb45c6a08929e08
parent: pqm at pqm.ubuntu.com-20061106215935-5fa2157d07b2acde
parent: john at arbash-meinel.com-20061106210045-b88ae833b5443145
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-06 22:35:54 +0000
message:
(John Arbash Meinel) remove tabs from source files
------------------------------------------------------------
revno: 2052.1.68.2.1
revision-id: john at arbash-meinel.com-20061106210045-b88ae833b5443145
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_tabs
timestamp: Mon 2006-11-06 15:00:45 -0600
message:
Remove tabs from source files, and add a test to keep it that way.
------------------------------------------------------------
revno: 2052.1.69
revision-id: pqm at pqm.ubuntu.com-20061106215935-5fa2157d07b2acde
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
parent: john at arbash-meinel.com-20061106214737-b06f4c5c794d9f70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-06 21:59:35 +0000
message:
(John Arbash Meinel) Use time.time() not time.clock() for throttling progress updates
------------------------------------------------------------
revno: 2052.1.68.1.2
revision-id: john at arbash-meinel.com-20061106214737-b06f4c5c794d9f70
parent: john at arbash-meinel.com-20061103232949-72f71bdbde11ed6b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_time_not_clock
timestamp: Mon 2006-11-06 15:47:37 -0600
message:
Update NEWS for fixing time.clock() => time.time()
------------------------------------------------------------
revno: 2052.1.68.1.1
revision-id: john at arbash-meinel.com-20061103232949-72f71bdbde11ed6b
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_time_not_clock
timestamp: Fri 2006-11-03 17:29:49 -0600
message:
Use time.time() because time.clock() is CPU time, not wall time
------------------------------------------------------------
revno: 2052.1.68
revision-id: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
parent: pqm at pqm.ubuntu.com-20061103023548-12e702bb911c4be2
parent: mbp at sourcefrog.net-20061031043220-4bf93cffdc7044ed
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-03 02:59:29 +0000
message:
(mbp) test_source shouldn't descend into tmpdirs [r=john]
------------------------------------------------------------
revno: 2052.1.50.3.1
revision-id: mbp at sourcefrog.net-20061031043220-4bf93cffdc7044ed
parent: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
committer: mbp at sourcefrog.net
branch nick: code_tests_tmpdir
timestamp: Tue 2006-10-31 15:32:20 +1100
message:
test_source should avoid walking into tempdirs
------------------------------------------------------------
revno: 2052.1.67
revision-id: pqm at pqm.ubuntu.com-20061103023548-12e702bb911c4be2
parent: pqm at pqm.ubuntu.com-20061102234014-be7b4e5b6dac2996
parent: mbp at sourcefrog.net-20061103022332-8faa29378257aba3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-03 02:35:48 +0000
message:
(mbp) deprecate BzrNewError, change to using .internal_error on exceptions, etc
------------------------------------------------------------
revno: 2052.1.15.3.7
revision-id: mbp at sourcefrog.net-20061103022332-8faa29378257aba3
parent: mbp at sourcefrog.net-20061103022255-03efeee385b81b46
parent: pqm at pqm.ubuntu.com-20061102234014-be7b4e5b6dac2996
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Fri 2006-11-03 13:23:32 +1100
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.15.3.6
revision-id: mbp at sourcefrog.net-20061103022255-03efeee385b81b46
parent: mbp at sourcefrog.net-20061103015212-1e5f881c2152d79f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Fri 2006-11-03 13:22:55 +1100
message:
Update deprecation version
------------------------------------------------------------
revno: 2052.1.15.3.5
revision-id: mbp at sourcefrog.net-20061103015212-1e5f881c2152d79f
parent: mbp at sourcefrog.net-20061103015126-427cb97a48404f42
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Fri 2006-11-03 12:52:12 +1100
message:
Review comments
------------------------------------------------------------
revno: 2052.1.15.3.4
revision-id: mbp at sourcefrog.net-20061103015126-427cb97a48404f42
parent: mbp at sourcefrog.net-20061102102019-9a5a02f485dff6f6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Fri 2006-11-03 12:51:26 +1100
message:
Error deprecations will come in for 0.13
------------------------------------------------------------
revno: 2052.1.15.3.3
revision-id: mbp at sourcefrog.net-20061102102019-9a5a02f485dff6f6
parent: mbp at sourcefrog.net-20061102093721-b606445faedb3fb2
parent: pqm at pqm.ubuntu.com-20061102080611-5462d2713bf4bc45
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Thu 2006-11-02 21:20:19 +1100
message:
merge bzr.dev and reconcile several changes, also some test fixes
------------------------------------------------------------
revno: 2052.1.15.3.2
revision-id: mbp at sourcefrog.net-20061102093721-b606445faedb3fb2
parent: mbp at sourcefrog.net-20061015115758-041391cf08503621
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Thu 2006-11-02 20:37:21 +1100
message:
Error cleanup review comments:
Change to 'internal_error'
Migrate all builtin errors from using docstrings, but still support them.
Fix typos and layout.
------------------------------------------------------------
revno: 2052.1.15.3.1
revision-id: mbp at sourcefrog.net-20061015115758-041391cf08503621
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-errors
timestamp: Sun 2006-10-15 21:57:58 +1000
message:
Clean up BzrNewError, other exception classes and users.
This cleans up the probably-mistaken BzrNewError behaviour of using error
class docstrings as their format string. Instead errors can define a _fmt
attribute with the same meaning. The docstring is now reserved for its
regular purpose of documentation for programmers. This behaviour is added to
BzrError. BzrNewError is left in place for compatibility but no builtin
errors use it anymore and it gives a deprecation warning on construction.
BzrError now accepts either a single preformatted string, or a set of named
parameters to be substituted in to a format string for that class. This
behaviour is cleaned up and a couple of callers that depended on the
Python2.4-style exception args tuple are fixed.
Display of unprintable errors is slightly more robust.
errors.IncompatibleFormat was defined twice (shadowing the first
definition), so one use was disambiguated to IncompatibleBundleFormat.
UnsupportedEOLMarker called the wrong superclass constructor.
test_time_creates_benchmark_in_result was too dependent on benchmark
timing and has been loosened.
Some error representations changed slightly because of this (e.g. in use
of punctuation.)
------------------------------------------------------------
revno: 2052.1.66
revision-id: pqm at pqm.ubuntu.com-20061102234014-be7b4e5b6dac2996
parent: pqm at pqm.ubuntu.com-20061102222032-b4ab04d47947c45a
parent: john at arbash-meinel.com-20061031033325-5775a400c6ce9da3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 23:40:14 +0000
message:
(John Arbash Meinel) bug #64789, dict compress new revisions as they are added to knits
------------------------------------------------------------
revno: 2052.1.50.2.1
revision-id: john at arbash-meinel.com-20061031033325-5775a400c6ce9da3
parent: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: add_versions_compresses
timestamp: Mon 2006-10-30 21:33:25 -0600
message:
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
------------------------------------------------------------
revno: 2052.1.65
revision-id: pqm at pqm.ubuntu.com-20061102222032-b4ab04d47947c45a
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
parent: jw+debian at jameswestby.net-20061102214138-4395ee87ed9264ed
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 22:20:32 +0000
message:
(James Westby) Fix string for deprecation warning for 0.13
------------------------------------------------------------
revno: 2052.1.64.1.1
revision-id: jw+debian at jameswestby.net-20061102214138-4395ee87ed9264ed
parent: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.versionerror
timestamp: Thu 2006-11-02 21:41:38 +0000
message:
Fix string for deprecation warning for 0.13
------------------------------------------------------------
revno: 2052.1.64
revision-id: pqm at pqm.ubuntu.com-20061102105944-77e5667ce7540df5
parent: pqm at pqm.ubuntu.com-20061102083746-d1a3a44b1d313f3a
parent: mbp at sourcefrog.net-20061102071040-f781f7b34b4032df
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 10:59:44 +0000
message:
(mpe,mbp) #55466 remove dead scan-cache command
------------------------------------------------------------
revno: 2052.1.59.2.1
revision-id: mbp at sourcefrog.net-20061102071040-f781f7b34b4032df
parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 55466
timestamp: Thu 2006-11-02 18:10:40 +1100
message:
Remove broken scan-cache command (mpe)
------------------------------------------------------------
revno: 2052.1.63
revision-id: pqm at pqm.ubuntu.com-20061102083746-d1a3a44b1d313f3a
parent: pqm at pqm.ubuntu.com-20061102080611-5462d2713bf4bc45
parent: mbp at sourcefrog.net-20061102081838-74cf475e1f678c70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 08:37:46 +0000
message:
(mbp) optional -Derror to get tracebacks on stderr
------------------------------------------------------------
revno: 2052.1.43.5.3
revision-id: mbp at sourcefrog.net-20061102081838-74cf475e1f678c70
parent: mbp at sourcefrog.net-20061102062559-c935f73df6bf3fd0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dash-d
timestamp: Thu 2006-11-02 19:18:38 +1100
message:
Disable all debug_flags when running blackbox tests
------------------------------------------------------------
revno: 2052.1.43.5.2
revision-id: mbp at sourcefrog.net-20061102062559-c935f73df6bf3fd0
parent: mbp at sourcefrog.net-20061026143028-a4c4afcaa1778605
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dash-d
timestamp: Thu 2006-11-02 17:25:59 +1100
message:
save commit message if commit fails (#32054)
------------------------------------------------------------
revno: 2052.1.43.5.1
revision-id: mbp at sourcefrog.net-20061026143028-a4c4afcaa1778605
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dash-d
timestamp: Thu 2006-10-26 22:30:28 +0800
message:
Add new -Derror global option to always display tracebacks
------------------------------------------------------------
revno: 2052.1.62
revision-id: pqm at pqm.ubuntu.com-20061102080611-5462d2713bf4bc45
parent: pqm at pqm.ubuntu.com-20061102075126-af381cad72be3c1e
parent: mbp at sourcefrog.net-20061102074725-411568c4cb91edc3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 08:06:11 +0000
message:
(mbp) Better test progress bar
------------------------------------------------------------
revno: 2052.1.43.4.6
revision-id: mbp at sourcefrog.net-20061102074725-411568c4cb91edc3
parent: mbp at sourcefrog.net-20061031013031-da3047f0d9fb1f64
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-progress
timestamp: Thu 2006-11-02 18:47:25 +1100
message:
Fix abbreviated names for benchmark display
------------------------------------------------------------
revno: 2052.1.43.4.5
revision-id: mbp at sourcefrog.net-20061031013031-da3047f0d9fb1f64
parent: mbp at sourcefrog.net-20061031011534-105c53a11815f47b
committer: mbp at sourcefrog.net
branch nick: test-progress
timestamp: Tue 2006-10-31 12:30:31 +1100
message:
Use regular progress-bar classes, not a special mechanism
------------------------------------------------------------
revno: 2052.1.43.4.4
revision-id: mbp at sourcefrog.net-20061031011534-105c53a11815f47b
parent: mbp at sourcefrog.net-20061029070801-d282fdd88b0d3b93
committer: mbp at sourcefrog.net
branch nick: test-progress
timestamp: Tue 2006-10-31 12:15:34 +1100
message:
Truncate progress bar rather than complaining if it's too long
------------------------------------------------------------
revno: 2052.1.43.4.3
revision-id: mbp at sourcefrog.net-20061029070801-d282fdd88b0d3b93
parent: mbp at sourcefrog.net-20061029065334-bf40aba20cf20f7a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-progress
timestamp: Sun 2006-10-29 15:08:01 +0800
message:
Tweak test display a bit more
------------------------------------------------------------
revno: 2052.1.43.4.2
revision-id: mbp at sourcefrog.net-20061029065334-bf40aba20cf20f7a
parent: mbp at sourcefrog.net-20061029065311-c0db791096b06831
parent: mbp at sourcefrog.net-20061029014854-71098cfee1da5e20
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-progress
timestamp: Sun 2006-10-29 14:53:34 +0800
message:
[merge] listdir fixes
------------------------------------------------------------
revno: 2052.1.43.4.1
revision-id: mbp at sourcefrog.net-20061029065311-c0db791096b06831
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-progress
timestamp: Sun 2006-10-29 14:53:11 +0800
message:
Better progress bars during tests
This now shows by default something like::
[41/3989, 10 skipped in 0s] test_bundle.V08BundleTester.test_binary_bundle
The whole test name is generally visible, as are the number skipped or
failed so far; if there are skips, failures or errors they are printed
out above the progress bar.
Code for displaying test results in different ways was separated out
into cleaner subclasses, and the selftest builtin was cleaned up.
This introduces a new and (simpler) setup for progress bars through the UI
object. They don't nest, under the assumption that we can really only convey
one level at a time.
------------------------------------------------------------
revno: 2052.1.61
revision-id: pqm at pqm.ubuntu.com-20061102075126-af381cad72be3c1e
parent: pqm at pqm.ubuntu.com-20061102072902-8b3d43db5d36ec5b
parent: mbp at sourcefrog.net-20061102062109-68346f9f09f5edf2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 07:51:26 +0000
message:
(edward,mbp) #32054 store message if commit fails
------------------------------------------------------------
revno: 2052.1.59.1.1
revision-id: mbp at sourcefrog.net-20061102062109-68346f9f09f5edf2
parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
parent: wang at ubuntu-20061019032555-79c04af4940e8e94
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 32054
timestamp: Thu 2006-11-02 17:21:09 +1100
message:
Fix #32054, save message if commit fails.
------------------------------------------------------------
revno: 2052.1.37.1.1
revision-id: wang at ubuntu-20061019032555-79c04af4940e8e94
parent: pqm at pqm.ubuntu.com-20061019000523-3b34ef366c1b627f
committer: wang <wang at ubuntu>
branch nick: commit-message2
timestamp: Thu 2006-10-19 11:25:55 +0800
message:
If a commit fails, the commit message is stored in a file at the root of
the tree for later commit. Fixes #32054
------------------------------------------------------------
revno: 2052.1.60
revision-id: pqm at pqm.ubuntu.com-20061102072902-8b3d43db5d36ec5b
parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
parent: mbp at sourcefrog.net-20061102070158-573aa2cfee9e1c55
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 07:29:02 +0000
message:
(mbp) #45205 fix errors when running under python -O
------------------------------------------------------------
revno: 2052.1.38.2.4
revision-id: mbp at sourcefrog.net-20061102070158-573aa2cfee9e1c55
parent: mbp at sourcefrog.net-20061029014934-a5273eebfca6226d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dash-o
timestamp: Thu 2006-11-02 18:01:58 +1100
message:
Make check should run under python -O too
------------------------------------------------------------
revno: 2052.1.38.2.3
revision-id: mbp at sourcefrog.net-20061029014934-a5273eebfca6226d
parent: mbp at sourcefrog.net-20061029014915-47f151a2834f8a6d
parent: mbp at sourcefrog.net-20061029014854-71098cfee1da5e20
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dot-o
timestamp: Sun 2006-10-29 09:49:34 +0800
message:
merge listdir test fix so tests work on tmpfs
------------------------------------------------------------
revno: 2052.1.43.3.1
revision-id: mbp at sourcefrog.net-20061029014854-71098cfee1da5e20
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: listdir
timestamp: Sun 2006-10-29 09:48:54 +0800
message:
Tests shouldn't assume os.listdir returns sorted results
The manual specifically says it doesn't.
------------------------------------------------------------
revno: 2052.1.38.2.2
revision-id: mbp at sourcefrog.net-20061029014915-47f151a2834f8a6d
parent: mbp at sourcefrog.net-20061029014429-77497a4f933e6dfd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dot-o
timestamp: Sun 2006-10-29 09:49:15 +0800
message:
Fix an assertion with side effects
------------------------------------------------------------
revno: 2052.1.38.2.1
revision-id: mbp at sourcefrog.net-20061029014429-77497a4f933e6dfd
parent: pqm at pqm.ubuntu.com-20061019033052-b281d3ab3cf08c08
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dot-o
timestamp: Sun 2006-10-29 09:44:29 +0800
message:
Fix some code which relies on assertions and breaks under python -O
------------------------------------------------------------
revno: 2052.1.59
revision-id: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
parent: pqm at pqm.ubuntu.com-20061031222829-d691c81a8a20bdb0
parent: john at arbash-meinel.com-20061031231732-e49adf86f460dcd6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-11-01 00:27:36 +0000
message:
(Alexander Belchenko) fix blackbox.test_diff to work under windows by using universal newlines
------------------------------------------------------------
revno: 2052.1.58.1.2
revision-id: john at arbash-meinel.com-20061031231732-e49adf86f460dcd6
parent: john at arbash-meinel.com-20061031231657-8dea0d390c9b6fbf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bialix_diff_universal_newlines
timestamp: Tue 2006-10-31 17:17:32 -0600
message:
Cleanup patch so it only adds universal_newlines
------------------------------------------------------------
revno: 2052.1.58.1.1
revision-id: john at arbash-meinel.com-20061031231657-8dea0d390c9b6fbf
parent: pqm at pqm.ubuntu.com-20061031222829-d691c81a8a20bdb0
parent: bialix at ukr.net-20060929113526-4b3d862f6f722875
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bialix_diff_universal_newlines
timestamp: Tue 2006-10-31 17:16:57 -0600
message:
[merge] Alexander Belchenko: update blackbox.test_diff for win32
------------------------------------------------------------
revno: 2052.6.1
revision-id: bialix at ukr.net-20060929113526-4b3d862f6f722875
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: test_external_diff.fix
timestamp: Fri 2006-09-29 14:35:26 +0300
message:
blackbox.test_diff fix: don't load plugins when in test bzr run as subprocess
------------------------------------------------------------
revno: 2052.1.58
revision-id: pqm at pqm.ubuntu.com-20061031222829-d691c81a8a20bdb0
parent: pqm at pqm.ubuntu.com-20061031221823-64fb0443861befd1
parent: john at arbash-meinel.com-20061031212902-4b33920b90e9ce92
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 22:28:29 +0000
message:
(John Arbash Meinel) Fix bug #49172: nicer errors on sftp connection failure
------------------------------------------------------------
revno: 2052.5.5
revision-id: john at arbash-meinel.com-20061031212902-4b33920b90e9ce92
parent: john at arbash-meinel.com-20060929211335-9af4fcf54348644e
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-error-49172
timestamp: Tue 2006-10-31 15:29:02 -0600
message:
[merge] bzr.dev 2104
------------------------------------------------------------
revno: 2052.5.4
revision-id: john at arbash-meinel.com-20060929211335-9af4fcf54348644e
parent: john at arbash-meinel.com-20060929204144-41b2ede8960cf404
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-error-49172
timestamp: Fri 2006-09-29 16:13:35 -0500
message:
Create a SocketConnectionError to make creating nice errors easier
------------------------------------------------------------
revno: 2052.5.3
revision-id: john at arbash-meinel.com-20060929204144-41b2ede8960cf404
parent: john at arbash-meinel.com-20060929175101-0521967daf4c4fe0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-error-49172
timestamp: Fri 2006-09-29 15:41:44 -0500
message:
NEWS for closing bug #49172
------------------------------------------------------------
revno: 2052.5.2
revision-id: john at arbash-meinel.com-20060929175101-0521967daf4c4fe0
parent: john at arbash-meinel.com-20060929174353-433adc876bbe4375
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-error-49172
timestamp: Fri 2006-09-29 12:51:01 -0500
message:
Refactor all 'raise ConnectionError' into a helper function
------------------------------------------------------------
revno: 2052.5.1
revision-id: john at arbash-meinel.com-20060929174353-433adc876bbe4375
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-error-49172
timestamp: Fri 2006-09-29 12:43:53 -0500
message:
Fix all of the ConnectionError messages
------------------------------------------------------------
revno: 2052.1.57
revision-id: pqm at pqm.ubuntu.com-20061031221823-64fb0443861befd1
parent: pqm at pqm.ubuntu.com-20061031220848-2fa8b1f97a4643af
parent: john at arbash-meinel.com-20061031211327-cc0e8f995b9f5a07
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 22:18:23 +0000
message:
(Cheuksan Edward Wang) Fix bug #65714 by switching to patience diff (O(N^2) instead of O(N^3) for difflib)
------------------------------------------------------------
revno: 2052.1.52.4.2
revision-id: john at arbash-meinel.com-20061031211327-cc0e8f995b9f5a07
parent: john at arbash-meinel.com-20061031211101-78e906a4742dcb9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wang_65714
timestamp: Tue 2006-10-31 15:13:27 -0600
message:
Small cleanup and NEWS entry about fixing bug #65714
------------------------------------------------------------
revno: 2052.1.52.4.1
revision-id: john at arbash-meinel.com-20061031211101-78e906a4742dcb9d
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: wang at ubuntu-20061029134132-3d7f4216f20c4aef
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wang_65714
timestamp: Tue 2006-10-31 15:11:01 -0600
message:
(Cheuksan Edward Wang) Use patiencediff instead of difflib because of big O performance
------------------------------------------------------------
revno: 2052.1.48.2.1
revision-id: wang at ubuntu-20061029134132-3d7f4216f20c4aef
parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
committer: wang <wang at ubuntu>
branch nick: slow-branch
timestamp: Sun 2006-10-29 21:41:32 +0800
message:
Replace python's difflib by patiencediff because the worst case
performance is cubic for difflib and people commiting large data
files are often hurt by this. The worst case performance of patience is
quadratic. Fix bug 65714.
------------------------------------------------------------
revno: 2052.1.56
revision-id: pqm at pqm.ubuntu.com-20061031220848-2fa8b1f97a4643af
parent: pqm at pqm.ubuntu.com-20061031215814-a9a1857c6e196637
parent: john at arbash-meinel.com-20061031210240-5fce4b8a58cbca60
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 22:08:48 +0000
message:
Add NEWS entry about export changes
------------------------------------------------------------
revno: 2052.1.52.3.2
revision-id: john at arbash-meinel.com-20061031210240-5fce4b8a58cbca60
parent: john at arbash-meinel.com-20061031210051-07b66b340c7ffb63
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dsilvers_export_url
timestamp: Tue 2006-10-31 15:02:40 -0600
message:
Add NEWS entry about export changes
------------------------------------------------------------
revno: 2052.1.52.3.1
revision-id: john at arbash-meinel.com-20061031210051-07b66b340c7ffb63
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: daniel.silverstone at canonical.com-20061028124021-e857aec7bf24cda3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dsilvers_export_url
timestamp: Tue 2006-10-31 15:00:51 -0600
message:
[merge] Daniel Silverstone: add source branch support to export
------------------------------------------------------------
revno: 2052.1.47.1.1
revision-id: daniel.silverstone at canonical.com-20061028124021-e857aec7bf24cda3
parent: pqm at pqm.ubuntu.com-20061027165927-baf73dad8985eaa7
committer: Daniel Silverstone <daniel.silverstone at canonical.com>
branch nick: bzr.dev
timestamp: Sat 2006-10-28 13:40:21 +0100
message:
Add source branch support to export command
------------------------------------------------------------
revno: 2052.1.55
revision-id: pqm at pqm.ubuntu.com-20061031215814-a9a1857c6e196637
parent: pqm at pqm.ubuntu.com-20061031214853-e5d2dc184d12ddea
parent: john at arbash-meinel.com-20061031205647-0e85ae2afb274664
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 21:58:14 +0000
message:
(Cheuksan Edward Wang) Fix bug #30190: allow 'bzr cat' to look up paths in multiple trees
------------------------------------------------------------
revno: 2052.1.52.2.1
revision-id: john at arbash-meinel.com-20061031205647-0e85ae2afb274664
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: wang at ubuntu-20061016105443-05ed299b80702d34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wang_30190
timestamp: Tue 2006-10-31 14:56:47 -0600
message:
(Cheuksan Edward Wang) Fix bug #30190: allow 'bzr cat' to look up paths in multiple trees
------------------------------------------------------------
revno: 2052.1.21.2.4
revision-id: wang at ubuntu-20061016105443-05ed299b80702d34
parent: wang at ubuntu-20061016070533-083b9847a4b2a3d1
committer: wang <wang at ubuntu>
branch nick: bzr-cat-branch
timestamp: Mon 2006-10-16 18:54:43 +0800
message:
Fix syntax error in test.
------------------------------------------------------------
revno: 2052.1.21.2.3
revision-id: wang at ubuntu-20061016070533-083b9847a4b2a3d1
parent: wang at ubuntu-20061016040409-0fd564a13878aca6
committer: wang <wang at ubuntu>
branch nick: bzr-cat-branch
timestamp: Mon 2006-10-16 15:05:33 +0800
message:
Change option name to --name-from-revision. Always make new tree the
default. Rewrite some tests.
------------------------------------------------------------
revno: 2052.1.21.2.2
revision-id: wang at ubuntu-20061016040409-0fd564a13878aca6
parent: wang at ubuntu-20061013150913-2ff0be213f6f8a75
committer: wang <wang at ubuntu>
branch nick: bzr-cat-branch
timestamp: Mon 2006-10-16 12:04:09 +0800
message:
Make the decision tree a little clearer. Add more tests for exceptions.
------------------------------------------------------------
revno: 2052.1.21.2.1
revision-id: wang at ubuntu-20061013150913-2ff0be213f6f8a75
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: wang <wang at ubuntu>
branch nick: bzr-cat-branch
timestamp: Fri 2006-10-13 23:09:13 +0800
message:
``bzr cat`` can look up contents of removed or renamed files. If the
pathname is ambiguous, i.e. the files in the old and new trees
have different id's, the user needs to use "--old" or "--new" to
distinguish between them. If the pathname refers to a single file, the options
are unnecessary. Fixes bug #30190.
------------------------------------------------------------
revno: 2052.1.54
revision-id: pqm at pqm.ubuntu.com-20061031214853-e5d2dc184d12ddea
parent: pqm at pqm.ubuntu.com-20061031213938-414c21b74ac463b8
parent: john at arbash-meinel.com-20061031204059-237d26d0ef76875f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 21:48:53 +0000
message:
(Alexander Belchenko, Ben Finney) Use sectnum instead of manually numbering sections
------------------------------------------------------------
revno: 2052.1.46.2.4
revision-id: john at arbash-meinel.com-20061031204059-237d26d0ef76875f
parent: john at arbash-meinel.com-20061030201051-2888fc0a3afbfced
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: centralized_doc
timestamp: Tue 2006-10-31 14:40:59 -0600
message:
Include a table-of-contents.
------------------------------------------------------------
revno: 2052.1.46.2.3
revision-id: john at arbash-meinel.com-20061030201051-2888fc0a3afbfced
parent: john at arbash-meinel.com-20061027223854-d1e912b95a4f48c0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: centralized_doc
timestamp: Mon 2006-10-30 14:10:51 -0600
message:
Switch to automatic numbering for sections and sub-sections.
------------------------------------------------------------
revno: 2052.1.53
revision-id: pqm at pqm.ubuntu.com-20061031213938-414c21b74ac463b8
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: john at arbash-meinel.com-20061031193921-6d047611ba22c665
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 21:39:38 +0000
message:
(Cheuksan Edward Wang, Kent Gibson) bug fixes for 'bzr ignore' (#29488, #4559)
------------------------------------------------------------
revno: 2052.1.52.1.2
revision-id: john at arbash-meinel.com-20061031193921-6d047611ba22c665
parent: john at arbash-meinel.com-20061031193444-5625664a35654df5
parent: warthog618 at gmail.com-20061014102850-16fdc0e05ccad845
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-31 13:39:21 -0600
message:
(Kent Gibson) Fix bug #4559, strip trailing slashes from ignore patterns
------------------------------------------------------------
revno: 2052.1.25.1.2
revision-id: warthog618 at gmail.com-20061014102850-16fdc0e05ccad845
parent: warthog618 at gmail.com-20061014102436-ab2ea458158a9933
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.lp4559
timestamp: Sat 2006-10-14 18:28:50 +0800
message:
Strip trailing slashes from ignore patterns (#4559).
Complain about absolute paths in ignore patterns.
------------------------------------------------------------
revno: 2052.1.25.1.1
revision-id: warthog618 at gmail.com-20061014102436-ab2ea458158a9933
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.lp4559
timestamp: Sat 2006-10-14 18:24:36 +0800
message:
merge ignore_multiple_5.patch (Wang #29844)
------------------------------------------------------------
revno: 2052.1.52.1.1
revision-id: john at arbash-meinel.com-20061031193444-5625664a35654df5
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: wang at ubuntu-20061012094707-9716abbbe6a7a022
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-31 13:34:44 -0600
message:
(Cheuksan Edward Wang) Fix bug #29488, allow 'bzr ignore' to take multiple paths
------------------------------------------------------------
revno: 2052.1.11.5.5
revision-id: wang at ubuntu-20061012094707-9716abbbe6a7a022
parent: wang at ubuntu-20061012073426-3b56e6ed675ca36e
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: wang <wang at ubuntu>
branch nick: ignore-branch
timestamp: Thu 2006-10-12 17:47:07 +0800
message:
resolve a conflict
------------------------------------------------------------
revno: 2052.1.11.5.4
revision-id: wang at ubuntu-20061012073426-3b56e6ed675ca36e
parent: wang at ubuntu-20061010234350-f3dadeeb4006096b
committer: wang <wang at ubuntu>
branch nick: ignore-branch
timestamp: Thu 2006-10-12 15:34:26 +0800
message:
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
review comments for me.
------------------------------------------------------------
revno: 2052.1.11.5.3
revision-id: wang at ubuntu-20061010234350-f3dadeeb4006096b
parent: wang at ubuntu-20061010152001-9543f8e5b3f0f9ea
committer: wang <wang at ubuntu>
branch nick: ignore-branch
timestamp: Wed 2006-10-11 07:43:50 +0800
message:
Change error message. Use spaces instead of tabs.
------------------------------------------------------------
revno: 2052.1.11.5.2
revision-id: wang at ubuntu-20061010152001-9543f8e5b3f0f9ea
parent: wang at ubuntu-20061010073621-c17937e940897fdc
committer: wang <wang at ubuntu>
branch nick: ignore-branch
timestamp: Tue 2006-10-10 23:20:01 +0800
message:
Don't use mutable values as default argument definitions.
------------------------------------------------------------
revno: 2052.1.11.5.1
revision-id: wang at ubuntu-20061010073621-c17937e940897fdc
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: wang <wang at ubuntu>
branch nick: ignore-branch
timestamp: Tue 2006-10-10 15:36:21 +0800
message:
"bzr ignore" takes multiple arguments. Fixes bug 29488.
------------------------------------------------------------
revno: 2052.1.52
revision-id: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: pqm at pqm.ubuntu.com-20061031041404-f1bf9db09d9ee5cf
parent: abentley at panoramicfeedback.com-20061018161211-b3bb5944bd14dc4f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 17:30:33 +0000
message:
Additional fetch test case
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.43
revision-id: abentley at panoramicfeedback.com-20061018161211-b3bb5944bd14dc4f
parent: aaron.bentley at utoronto.ca-20061018024451-4314e738314f7c91
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-18 12:12:11 -0400
message:
Update from reviews
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42
revision-id: aaron.bentley at utoronto.ca-20061018024451-4314e738314f7c91
parent: aaron.bentley at utoronto.ca-20061012050733-654bec1393e53d55
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-10-17 22:44:51 -0400
message:
Ensure that fetch properly updates inventory root knit
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.41
revision-id: aaron.bentley at utoronto.ca-20061012050733-654bec1393e53d55
parent: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-10-12 01:07:33 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.51
revision-id: pqm at pqm.ubuntu.com-20061031041404-f1bf9db09d9ee5cf
parent: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
parent: mbp at sourcefrog.net-20061031040242-0e2771487f560c08
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 04:14:04 +0000
message:
(edward) fix #50793, no error for bzr log nonexistent
------------------------------------------------------------
revno: 2052.1.50.1.1
revision-id: mbp at sourcefrog.net-20061031040242-0e2771487f560c08
parent: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
parent: wang at ubuntu-20061030145633-28f9d624effbc451
committer: mbp at sourcefrog.net
branch nick: 50793
timestamp: Tue 2006-10-31 15:02:42 +1100
message:
[merge] #50793
------------------------------------------------------------
revno: 2052.1.48.1.1
revision-id: wang at ubuntu-20061030145633-28f9d624effbc451
parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
committer: wang <wang at ubuntu>
branch nick: log-branch
timestamp: Mon 2006-10-30 22:56:33 +0800
message:
Running ``bzr log`` on nonexistent file gives an error instead of the
entire log history. (bug #50793)
------------------------------------------------------------
revno: 2052.1.50
revision-id: pqm at pqm.ubuntu.com-20061030172214-1473cd30307ee189
parent: pqm at pqm.ubuntu.com-20061030170504-68c5be70ab1f6033
parent: john at arbash-meinel.com-20061030171035-60b51c31b39923f7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-30 17:22:14 +0000
message:
(John Arbash Meinel) update bzr.dev for 0.12.0-final and prepare for 0.13
------------------------------------------------------------
revno: 2052.1.49.1.2
revision-id: john at arbash-meinel.com-20061030171035-60b51c31b39923f7
parent: john at arbash-meinel.com-20061030171009-05974a3d1d734283
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-30 11:10:35 -0600
message:
Create the 0.13 deprecation symbol
------------------------------------------------------------
revno: 2052.1.49.1.1
revision-id: john at arbash-meinel.com-20061030171009-05974a3d1d734283
parent: pqm at pqm.ubuntu.com-20061030170504-68c5be70ab1f6033
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-30 11:10:09 -0600
message:
Merge 0.12 NEWS entries
------------------------------------------------------------
revno: 2052.1.49
revision-id: pqm at pqm.ubuntu.com-20061030170504-68c5be70ab1f6033
parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
parent: john at arbash-meinel.com-20061030161203-726f5a38de70b988
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-30 17:05:04 +0000
message:
(John Arbash Meinel) Skip bundle benchmarks that take longer than 10 min to run
------------------------------------------------------------
revno: 2052.1.45.1.5
revision-id: john at arbash-meinel.com-20061030161203-726f5a38de70b988
parent: john at arbash-meinel.com-20061027230305-d86805cc0247fe47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_big_bundle_tests
timestamp: Mon 2006-10-30 10:12:03 -0600
message:
NEWS
------------------------------------------------------------
revno: 2052.1.45.1.4
revision-id: john at arbash-meinel.com-20061027230305-d86805cc0247fe47
parent: john at arbash-meinel.com-20061027225349-9e64c8e7c71c1c6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_big_bundle_tests
timestamp: Fri 2006-10-27 18:03:05 -0500
message:
Remove stipple from bundle benchmarks
------------------------------------------------------------
revno: 2052.1.45.1.3
revision-id: john at arbash-meinel.com-20061027225349-9e64c8e7c71c1c6a
parent: john at arbash-meinel.com-20061027213234-016c1c2ddd2afcce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_big_bundle_tests
timestamp: Fri 2006-10-27 17:53:49 -0500
message:
Skip the big-treex100 revision tests, which take 10min each
------------------------------------------------------------
revno: 2052.1.45.1.2
revision-id: john at arbash-meinel.com-20061027213234-016c1c2ddd2afcce
parent: john at arbash-meinel.com-20061027160748-aff7c95894928840
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_big_bundle_tests
timestamp: Fri 2006-10-27 16:32:34 -0500
message:
Skip the 100x100 bundle benchmarks
------------------------------------------------------------
revno: 2052.1.45.1.1
revision-id: john at arbash-meinel.com-20061027160748-aff7c95894928840
parent: pqm at pqm.ubuntu.com-20061027152722-dff2a8edfddc5f51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no_big_bundle_tests
timestamp: Fri 2006-10-27 11:07:48 -0500
message:
Don't run 1000 revision bundle tests
------------------------------------------------------------
revno: 2052.1.48
revision-id: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
parent: pqm at pqm.ubuntu.com-20061027165927-baf73dad8985eaa7
parent: john at arbash-meinel.com-20061027223854-d1e912b95a4f48c0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 23:52:41 +0100
message:
(Alaa Salman, John Arbash Meinel) Cleanup the centralized_workflow.txt document
------------------------------------------------------------
revno: 2052.1.46.2.2
revision-id: john at arbash-meinel.com-20061027223854-d1e912b95a4f48c0
parent: john at arbash-meinel.com-20061027223446-be14889287f2a066
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: centralized_doc
timestamp: Fri 2006-10-27 17:38:54 -0500
message:
minor cleanup
------------------------------------------------------------
revno: 2052.1.46.2.1
revision-id: john at arbash-meinel.com-20061027223446-be14889287f2a066
parent: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: centralized_doc
timestamp: Fri 2006-10-27 17:34:46 -0500
message:
Apply changes recommended by Alaa Salman
------------------------------------------------------------
revno: 2052.1.47
revision-id: pqm at pqm.ubuntu.com-20061027165927-baf73dad8985eaa7
parent: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
parent: john at arbash-meinel.com-20061027164426-e39aabbcc8bc1441
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 17:59:27 +0100
message:
(Cheuksan Edward Wang) Partial fix for bug #48136, make status indicate when the tree is out of date with the branch
------------------------------------------------------------
revno: 2052.1.46.1.3
revision-id: john at arbash-meinel.com-20061027164426-e39aabbcc8bc1441
parent: john at arbash-meinel.com-20061027164319-b8d220e77bce629c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-27 11:44:26 -0500
message:
Fix NEWS to put the fix for bug #48136 in the right location
------------------------------------------------------------
revno: 2052.1.46.1.2
revision-id: john at arbash-meinel.com-20061027164319-b8d220e77bce629c
parent: john at arbash-meinel.com-20061027164148-83142c9a003ecc43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-27 11:43:19 -0500
message:
Remove changes to diff so it doesn't report out-of-date
------------------------------------------------------------
revno: 2052.1.46.1.1
revision-id: john at arbash-meinel.com-20061027164148-83142c9a003ecc43
parent: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
parent: wang at ubuntu-20061022041744-e03b72936888673c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-27 11:41:48 -0500
message:
[merge] Cheuksan Edward Wang: Report a warning if tree is out of date for diff and status
------------------------------------------------------------
revno: 2052.1.39.4.2
revision-id: wang at ubuntu-20061022041744-e03b72936888673c
parent: wang at ubuntu-20061021075957-f1fcec87b9f4275a
committer: wang <wang at ubuntu>
branch nick: push-branch
timestamp: Sun 2006-10-22 12:17:44 +0800
message:
add tests for "diff" and "status"
------------------------------------------------------------
revno: 2052.1.39.4.1
revision-id: wang at ubuntu-20061021075957-f1fcec87b9f4275a
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: wang <wang at ubuntu>
branch nick: push-branch
timestamp: Sat 2006-10-21 15:59:57 +0800
message:
Pushing to a remote branch does not currently update the remote working
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
machine now show that the working tree is out of date.
------------------------------------------------------------
revno: 2052.1.46
revision-id: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
parent: pqm at pqm.ubuntu.com-20061027152722-dff2a8edfddc5f51
parent: abentley at panoramicfeedback.com-20061027160427-da7e0a0679fd8d0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 17:14:18 +0100
message:
Fix bzr mv across symlinks
------------------------------------------------------------
revno: 2052.1.39.3.7
revision-id: abentley at panoramicfeedback.com-20061027160427-da7e0a0679fd8d0f
parent: abentley at panoramicfeedback.com-20061025163814-bb01e38c3acfbc16
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: symlink-paths
timestamp: Fri 2006-10-27 12:04:27 -0400
message:
Rename real_parent to dereferenced_path
------------------------------------------------------------
revno: 2052.1.39.3.6
revision-id: abentley at panoramicfeedback.com-20061025163814-bb01e38c3acfbc16
parent: abentley at panoramicfeedback.com-20061025160425-9ae6aadd298ae1cf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: symlink-paths
timestamp: Wed 2006-10-25 12:38:14 -0400
message:
Add symlink test guards
------------------------------------------------------------
revno: 2052.1.39.3.5
revision-id: abentley at panoramicfeedback.com-20061025160425-9ae6aadd298ae1cf
parent: abentley at panoramicfeedback.com-20061025150721-71290b10eff4e691
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: symlink-paths
timestamp: Wed 2006-10-25 12:04:25 -0400
message:
Move realpath functionality into osutils
------------------------------------------------------------
revno: 2052.1.39.3.4
revision-id: abentley at panoramicfeedback.com-20061025150721-71290b10eff4e691
parent: abentley at panoramicfeedback.com-20061025150402-70d869a222e86408
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: symlink-paths
timestamp: Wed 2006-10-25 11:07:21 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.39.3.3
revision-id: abentley at panoramicfeedback.com-20061025150402-70d869a222e86408
parent: aaron.bentley at utoronto.ca-20061020052845-6726ae2723e5633d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: symlink-paths
timestamp: Wed 2006-10-25 11:04:02 -0400
message:
Test 'is None' not '== None'
------------------------------------------------------------
revno: 2052.1.39.3.2
revision-id: aaron.bentley at utoronto.ca-20061020052845-6726ae2723e5633d
parent: aaron.bentley at utoronto.ca-20061020014622-745c98fdc87811a8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: symlink-paths
timestamp: Fri 2006-10-20 01:28:45 -0400
message:
Traverse non-terminal symlinks for mv et al
------------------------------------------------------------
revno: 2052.1.39.3.1
revision-id: aaron.bentley at utoronto.ca-20061020014622-745c98fdc87811a8
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: symlink-paths
timestamp: Thu 2006-10-19 21:46:22 -0400
message:
When 'directory' path element isn't a directory, return None from path2id
------------------------------------------------------------
revno: 2052.1.45
revision-id: pqm at pqm.ubuntu.com-20061027152722-dff2a8edfddc5f51
parent: pqm at pqm.ubuntu.com-20061027151220-276e70799d8972ee
parent: john at arbash-meinel.com-20061027151540-1fe5a39f40355478
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 16:27:22 +0100
message:
(John Arbash Meinel) Fix benchmark imports for bundles
------------------------------------------------------------
revno: 2052.1.43.2.1
revision-id: john at arbash-meinel.com-20061027151540-1fe5a39f40355478
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bench_read_bundle_fix
timestamp: Fri 2006-10-27 10:15:40 -0500
message:
Fix imports for bundles.
bundle benchmarks were importing read_bundle from the wrong place.
Fix them, and change imports to avoid people accidentally doing
that in the future.
------------------------------------------------------------
revno: 2052.1.44
revision-id: pqm at pqm.ubuntu.com-20061027151220-276e70799d8972ee
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
parent: john at arbash-meinel.com-20061027145951-5b2246cdf596eb67
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 16:12:20 +0100
message:
(Cheuksan Edward Wang) Fix copyright notice
------------------------------------------------------------
revno: 2052.1.43.1.1
revision-id: john at arbash-meinel.com-20061027145951-5b2246cdf596eb67
parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
parent: wang at ubuntu-20061018061653-779801c9baa493ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-27 09:59:51 -0500
message:
(Cheuksan Edward Wang) Fix copyright notice
------------------------------------------------------------
revno: 2052.1.32.3.1
revision-id: wang at ubuntu-20061018061653-779801c9baa493ae
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
committer: wang <wang at ubuntu>
branch nick: push-branch
timestamp: Wed 2006-10-18 14:16:53 +0800
message:
fix a copyright notice
------------------------------------------------------------
revno: 2052.1.43
revision-id: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
parent: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
parent: john at arbash-meinel.com-20061024141253-783fba812b197b70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-24 17:50:11 +0100
message:
(John Arbash Meinel) Update version information for 0.13 development
------------------------------------------------------------
revno: 2052.1.42.1.1
revision-id: john at arbash-meinel.com-20061024141253-783fba812b197b70
parent: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-24 09:12:53 -0500
message:
(John Arbash Meinel) Update version information for 0.13 development
------------------------------------------------------------
revno: 2052.1.42
revision-id: pqm at pqm.ubuntu.com-20061023225407-f38e787ee5e79957
parent: pqm at pqm.ubuntu.com-20061023181012-eec8b8e830931bfb
parent: john at arbash-meinel.com-20061023224331-aa559d3bc42024b5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-23 23:54:07 +0100
message:
(Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'
------------------------------------------------------------
revno: 2052.1.41.1.1
revision-id: john at arbash-meinel.com-20061023224331-aa559d3bc42024b5
parent: pqm at pqm.ubuntu.com-20061023181012-eec8b8e830931bfb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 17:43:31 -0500
message:
(Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'
------------------------------------------------------------
revno: 2052.1.41
revision-id: pqm at pqm.ubuntu.com-20061023181012-eec8b8e830931bfb
parent: pqm at pqm.ubuntu.com-20061023151346-d91d5ad53c0e14a6
parent: john at arbash-meinel.com-20061023172136-58165bb377eb10d6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-23 19:10:12 +0100
message:
(Andrew Bennetts): Don't smash transport_server in TestCaseWithTransport.setUp
------------------------------------------------------------
revno: 2052.1.40.1.1
revision-id: john at arbash-meinel.com-20061023172136-58165bb377eb10d6
parent: pqm at pqm.ubuntu.com-20061023151346-d91d5ad53c0e14a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 12:21:36 -0500
message:
(Andrew Bennetts): Don't smash transport_server in TestCaseWithTransport.setUp
------------------------------------------------------------
revno: 2052.1.40
revision-id: pqm at pqm.ubuntu.com-20061023151346-d91d5ad53c0e14a6
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
parent: john at arbash-meinel.com-20061023131117-e7b477cc55b5d377
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-23 16:13:46 +0100
message:
(Martin Pool) Avoid MSG_WAITALL as it doesn't exist on all platforms
------------------------------------------------------------
revno: 2052.1.39.1.4
revision-id: john at arbash-meinel.com-20061023131117-e7b477cc55b5d377
parent: john at arbash-meinel.com-20061023130923-04998f4a8447933c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 08:11:17 -0500
message:
Some ReST cleanup of NEWS
------------------------------------------------------------
revno: 2052.1.39.1.3
revision-id: john at arbash-meinel.com-20061023130923-04998f4a8447933c
parent: john at arbash-meinel.com-20061023125912-f73edbd57b6c3960
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 08:09:23 -0500
message:
Move NEWS entry to proper location
------------------------------------------------------------
revno: 2052.1.39.1.2
revision-id: john at arbash-meinel.com-20061023125912-f73edbd57b6c3960
parent: john at arbash-meinel.com-20061023125743-d5b4dc1be1c1105d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 07:59:12 -0500
message:
Update news for fixing bugs #66349, #66356
------------------------------------------------------------
revno: 2052.1.39.1.1
revision-id: john at arbash-meinel.com-20061023125743-d5b4dc1be1c1105d
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
parent: mbp at sourcefrog.net-20061021023337-e517eaadd87fc778
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-23 07:57:43 -0500
message:
[merge] Martin Pool: Avoid MSG_WAITALL
------------------------------------------------------------
revno: 2052.1.39.2.1
revision-id: mbp at sourcefrog.net-20061021023337-e517eaadd87fc778
parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: win32
timestamp: Sat 2006-10-21 12:33:37 +1000
message:
Avoid MSG_WAITALL as it doesn't work on Windows
------------------------------------------------------------
revno: 2052.1.39
revision-id: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
parent: pqm at pqm.ubuntu.com-20061019033052-b281d3ab3cf08c08
parent: mbp at sourcefrog.net-20061019060431-332d7457b8a34168
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-19 07:32:55 +0100
message:
(mbp) readme updates from adeodato
------------------------------------------------------------
revno: 2052.1.38.1.1
revision-id: mbp at sourcefrog.net-20061019060431-332d7457b8a34168
parent: pqm at pqm.ubuntu.com-20061019033052-b281d3ab3cf08c08
parent: mbp at sourcefrog.net-20060814030647-9b9c0782a1ef0ea0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: readme
timestamp: Thu 2006-10-19 16:04:31 +1000
message:
Update README again
------------------------------------------------------------
revno: 1904.1.3.1.1
revision-id: mbp at sourcefrog.net-20060814030647-9b9c0782a1ef0ea0
parent: pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
parent: dato at net.com.org.es-20060814000139-cca86a7f98954445
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.release
timestamp: Mon 2006-08-14 13:06:47 +1000
message:
Updates to README file (Adeodato)
------------------------------------------------------------
revno: 1904.1.2.1.2
revision-id: dato at net.com.org.es-20060814000139-cca86a7f98954445
parent: dato at net.com.org.es-20060811012651-47b6f9759efc25f9
parent: pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.0.9
timestamp: Mon 2006-08-14 02:01:39 +0200
message:
[merge] bzr.0.9 1907
------------------------------------------------------------
revno: 1904.1.2.1.1
revision-id: dato at net.com.org.es-20060811012651-47b6f9759efc25f9
parent: pqm at pqm.ubuntu.com-20060810013816-914bb9b7a31e8fd9
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.0.9
timestamp: Fri 2006-08-11 03:26:51 +0200
message:
Revamp README file for Bazaar 0.9.
------------------------------------------------------------
revno: 2052.1.38
revision-id: pqm at pqm.ubuntu.com-20061019033052-b281d3ab3cf08c08
parent: pqm at pqm.ubuntu.com-20061019000523-3b34ef366c1b627f
parent: mbp at sourcefrog.net-20061019025924-1af1ed4510b4e71f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-19 04:30:52 +0100
message:
(mbp) remove redundant local transport tests [r=john]
------------------------------------------------------------
revno: 1951.2.4
revision-id: mbp at sourcefrog.net-20061019025924-1af1ed4510b4e71f
parent: mbp at sourcefrog.net-20060825050430-26a4a2437986d8b7
parent: pqm at pqm.ubuntu.com-20061019000523-3b34ef366c1b627f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: local-transport-tests
timestamp: Thu 2006-10-19 12:59:24 +1000
message:
merge up bzr.dev
------------------------------------------------------------
revno: 1951.2.3
revision-id: mbp at sourcefrog.net-20060825050430-26a4a2437986d8b7
parent: mbp at sourcefrog.net-20060824083440-e278138fb2bc383c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.local-transport-tests
timestamp: Fri 2006-08-25 15:04:30 +1000
message:
Localtransport cleanup review (john)
------------------------------------------------------------
revno: 1951.2.2
revision-id: mbp at sourcefrog.net-20060824083440-e278138fb2bc383c
parent: mbp at sourcefrog.net-20060824082026-d539b3b122dc2f2a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.local-transport-tests
timestamp: Thu 2006-08-24 18:34:40 +1000
message:
Actually remove Local{Abs,Rel}pathServer
------------------------------------------------------------
revno: 1951.2.1
revision-id: mbp at sourcefrog.net-20060824082026-d539b3b122dc2f2a
parent: pqm at pqm.ubuntu.com-20060822222325-10c74ceeec1708fc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.local-transport-tests
timestamp: Thu 2006-08-24 18:20:26 +1000
message:
Change to using LocalURLServer for testing.
We used to run many transport tests three times for different
LocalServers, but in fact they all end up constructing the same transport.
So now we just test construction of local transports from urls and paths,
and run the tests once.
------------------------------------------------------------
revno: 2052.1.37
revision-id: pqm at pqm.ubuntu.com-20061019000523-3b34ef366c1b627f
parent: pqm at pqm.ubuntu.com-20061018125437-d8794b0eb9f111a7
parent: john at arbash-meinel.com-20061016064448-390e8be4a3dc3f99
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-19 01:05:23 +0100
message:
(John Arbash Meinel) avoid circular imports by properly deprecating RevisionTree
------------------------------------------------------------
revno: 2052.1.27.1.2
revision-id: john at arbash-meinel.com-20061016064448-390e8be4a3dc3f99
parent: john at arbash-meinel.com-20061016050845-a2bc6be4f3a35539
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: circular-import
timestamp: Mon 2006-10-16 16:44:48 +1000
message:
NEWS for fixing bug #63360
------------------------------------------------------------
revno: 2052.1.27.1.1
revision-id: john at arbash-meinel.com-20061016050845-a2bc6be4f3a35539
parent: pqm at pqm.ubuntu.com-20061016042107-3868eeaa654059ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: circular-import
timestamp: Mon 2006-10-16 15:08:45 +1000
message:
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
------------------------------------------------------------
revno: 2052.1.36
revision-id: pqm at pqm.ubuntu.com-20061018125437-d8794b0eb9f111a7
parent: pqm at pqm.ubuntu.com-20061018055627-b8029aa2cf6191f7
parent: aaron.bentley at utoronto.ca-20061018022635-3fd648bf19f8e56f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-18 13:54:37 +0100
message:
Support updating lightweight checkouts of readonly branches
------------------------------------------------------------
revno: 2052.1.32.2.1
revision-id: aaron.bentley at utoronto.ca-20061018022635-3fd648bf19f8e56f
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: lightweight-update
timestamp: Tue 2006-10-17 22:26:35 -0400
message:
Support updating lightweight checkouts of readonly branches
------------------------------------------------------------
revno: 2052.1.35
revision-id: pqm at pqm.ubuntu.com-20061018055627-b8029aa2cf6191f7
parent: pqm at pqm.ubuntu.com-20061018044551-2402262928119383
parent: john at arbash-meinel.com-20061018044550-f9522fe99ba15a70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-18 06:56:27 +0100
message:
(John Arbash Meinel) don't check copyright of plugins
------------------------------------------------------------
revno: 2052.1.32.1.5
revision-id: john at arbash-meinel.com-20061018044550-f9522fe99ba15a70
parent: john at arbash-meinel.com-20061017081459-fd7ca80f9ff0f4dd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-10-18 14:45:50 +1000
message:
Don't check plugins for copyright or license
------------------------------------------------------------
revno: 2052.1.34
revision-id: pqm at pqm.ubuntu.com-20061018044551-2402262928119383
parent: pqm at pqm.ubuntu.com-20061018043629-1f09a4f1ce6e4566
parent: john at arbash-meinel.com-20061017080414-2cfbe3b23bd06f33
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-18 05:45:51 +0100
message:
skip non-content conflicts during remerge
------------------------------------------------------------
revno: 2052.1.28.2.3
revision-id: john at arbash-meinel.com-20061017080414-2cfbe3b23bd06f33
parent: john at arbash-meinel.com-20061016063832-1076fda126f4429e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-warnings
timestamp: Tue 2006-10-17 18:04:14 +1000
message:
remerge only supports text or content conflicts
------------------------------------------------------------
revno: 2052.1.33
revision-id: pqm at pqm.ubuntu.com-20061018043629-1f09a4f1ce6e4566
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
parent: john at arbash-meinel.com-20061017081459-fd7ca80f9ff0f4dd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-18 05:36:29 +0100
message:
(jam) new trees should not be created with unique roots, because it breaks old clients
------------------------------------------------------------
revno: 2052.1.32.1.4
revision-id: john at arbash-meinel.com-20061017081459-fd7ca80f9ff0f4dd
parent: john at arbash-meinel.com-20061017075351-d764409f8a902f61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-17 03:14:59 -0500
message:
Fix the test that assumed unique ids were generated
------------------------------------------------------------
revno: 2052.1.32.1.3
revision-id: john at arbash-meinel.com-20061017075351-d764409f8a902f61
parent: john at arbash-meinel.com-20061017075321-122e5597a65f4a9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-17 02:53:51 -0500
message:
Small NEWS tweak
------------------------------------------------------------
revno: 2052.1.32.1.2
revision-id: john at arbash-meinel.com-20061017075321-122e5597a65f4a9b
parent: john at arbash-meinel.com-20061017074907-4ca311a15681b252
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-17 02:53:21 -0500
message:
Update NEWS to indicate they don't actually have unique roots
------------------------------------------------------------
revno: 2052.1.32.1.1
revision-id: john at arbash-meinel.com-20061017074907-4ca311a15681b252
parent: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-17 02:49:07 -0500
message:
Don't create new working trees with unique roots, because it breaks older versions of bzr
------------------------------------------------------------
revno: 2052.1.32
revision-id: pqm at pqm.ubuntu.com-20061016100321-c4951c9fc020dbd0
parent: pqm at pqm.ubuntu.com-20061016074607-30fac1cd072eef6e
parent: robertc at robertcollins.net-20061016091541-9d2aac2792172e2e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 11:03:21 +0100
message:
(Robert Collins) Output dotted decimal revision numbers during log, and accept them as revision specifiers.
------------------------------------------------------------
revno: 1988.4.6
revision-id: robertc at robertcollins.net-20061016091541-9d2aac2792172e2e
parent: robertc at robertcollins.net-20060928062930-02ab4dbb103cf477
parent: robertc at robertcollins.net-20061016091447-db8b4e07ba1dc204
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dotted-revno-input.
timestamp: Mon 2006-10-16 19:15:41 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1988.4.4.1.1
revision-id: robertc at robertcollins.net-20061016091447-db8b4e07ba1dc204
parent: robertc at robertcollins.net-20060927051254-6b2d5066416d66c6
parent: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Mon 2006-10-16 19:14:47 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1988.4.5
revision-id: robertc at robertcollins.net-20060928062930-02ab4dbb103cf477
parent: robertc at robertcollins.net-20060927051254-6b2d5066416d66c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dotted-revno-input.
timestamp: Thu 2006-09-28 16:29:30 +1000
message:
revisions can now be specified using dotted-decimal revision numbers.
For instance, ``bzr diff -r 1.2.1..1.2.3. (Robert Collins)
------------------------------------------------------------
revno: 1988.4.4
revision-id: robertc at robertcollins.net-20060927051254-6b2d5066416d66c6
parent: robertc at robertcollins.net-20060907043916-fc35c789c7307af2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Wed 2006-09-27 15:12:54 +1000
message:
Tidy up the patch.
------------------------------------------------------------
revno: 1988.4.3
revision-id: robertc at robertcollins.net-20060907043916-fc35c789c7307af2
parent: robertc at robertcollins.net-20060907042805-557a318d08ec3f89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Thu 2006-09-07 14:39:16 +1000
message:
Document API changes in NEWS.
------------------------------------------------------------
revno: 1988.4.2
revision-id: robertc at robertcollins.net-20060907042805-557a318d08ec3f89
parent: robertc at robertcollins.net-20060907022553-989d4ab173d31473
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Thu 2006-09-07 14:28:05 +1000
message:
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
rather than just showing a decimal revision number for revisions on the
mainline. These revision numbers are not yet accepted as input into bzr
commands - such as log, diff etc. (Robert Collins)
------------------------------------------------------------
revno: 1988.4.1
revision-id: robertc at robertcollins.net-20060907022553-989d4ab173d31473
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: merge_sort-creates-dotted-revnos
timestamp: Thu 2006-09-07 12:25:53 +1000
message:
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
will cause it to add another column to its output, which contains the
dotted-decimal revno for each revision, as a tuple. (Robert Collins)
------------------------------------------------------------
revno: 2052.1.31
revision-id: pqm at pqm.ubuntu.com-20061016074607-30fac1cd072eef6e
parent: pqm at pqm.ubuntu.com-20061016071810-36dcc90223d479b4
parent: andrew.bennetts at canonical.com-20061013085623-ddfddab29f5f4e16
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 08:46:07 +0100
message:
(Andrew Bennetts) fix MemoryTransport.abspath() for paths starting with /
------------------------------------------------------------
revno: 2052.1.18.3.2
revision-id: andrew.bennetts at canonical.com-20061013085623-ddfddab29f5f4e16
parent: andrew.bennetts at canonical.com-20061013052902-60a2d663ee8d494b
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: memory transport abspath
timestamp: Fri 2006-10-13 18:56:23 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2052.1.18.3.1
revision-id: andrew.bennetts at canonical.com-20061013052902-60a2d663ee8d494b
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: memory transport abspath
timestamp: Fri 2006-10-13 15:29:02 +1000
message:
Fix memory_transport.abspath('/foo')
------------------------------------------------------------
revno: 2052.1.30
revision-id: pqm at pqm.ubuntu.com-20061016071810-36dcc90223d479b4
parent: pqm at pqm.ubuntu.com-20061016062419-2dedd03ba542aeb7
parent: john at arbash-meinel.com-20061016063832-1076fda126f4429e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 08:18:10 +0100
message:
(John Arbash Meinel) teach the pqm to require no warnings, and update remerge to not use iter_conflicts
------------------------------------------------------------
revno: 2052.1.28.2.2
revision-id: john at arbash-meinel.com-20061016063832-1076fda126f4429e
parent: john at arbash-meinel.com-20061016063155-4ebed425a35c9adb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-warnings
timestamp: Mon 2006-10-16 16:38:32 +1000
message:
Teach the pqm to treat warnings as errors
------------------------------------------------------------
revno: 2052.1.28.2.1
revision-id: john at arbash-meinel.com-20061016063155-4ebed425a35c9adb
parent: pqm at pqm.ubuntu.com-20061016050503-9caf9431977a6d0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-warnings
timestamp: Mon 2006-10-16 16:31:55 +1000
message:
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
------------------------------------------------------------
revno: 2052.1.29
revision-id: pqm at pqm.ubuntu.com-20061016062419-2dedd03ba542aeb7
parent: pqm at pqm.ubuntu.com-20061016050503-9caf9431977a6d0c
parent: john at arbash-meinel.com-20061016054619-16ba53872835404c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 07:24:19 +0100
message:
(Alexander Belchenko) use a short license page, to clarify functionality
------------------------------------------------------------
revno: 2052.1.28.1.1
revision-id: john at arbash-meinel.com-20061016054619-16ba53872835404c
parent: pqm at pqm.ubuntu.com-20061016050503-9caf9431977a6d0c
parent: bialix at ukr.net-20061014085107-8dff865674eed30a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-10-16 15:46:19 +1000
message:
(Alexander Belchenko) use a short license page, to clarify functionality
------------------------------------------------------------
revno: 2052.1.18.2.2
revision-id: bialix at ukr.net-20061014085107-8dff865674eed30a
parent: bialix at ukr.net-20061011091731-eb60279135413b32
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr.dev.installer
timestamp: Sat 2006-10-14 11:51:07 +0300
message:
win32 installer: make short info page instead of full GPL license text
------------------------------------------------------------
revno: 2052.1.18.2.1
revision-id: bialix at ukr.net-20061011091731-eb60279135413b32
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr.dev.installer
timestamp: Wed 2006-10-11 12:17:31 +0300
message:
win32 installer: change license page to info page
------------------------------------------------------------
revno: 2052.1.28
revision-id: pqm at pqm.ubuntu.com-20061016050503-9caf9431977a6d0c
parent: pqm at pqm.ubuntu.com-20061016042107-3868eeaa654059ae
parent: john at arbash-meinel.com-20061016045019-58fb4e339f93b1d7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 06:05:03 +0100
message:
(John Arbash Meinel) Cleanup copyright and license statements
------------------------------------------------------------
revno: 2052.4.10
revision-id: john at arbash-meinel.com-20061016045019-58fb4e339f93b1d7
parent: john at arbash-meinel.com-20061016043820-ff374b87ac84e2df
parent: pqm at pqm.ubuntu.com-20061016042107-3868eeaa654059ae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 14:50:19 +1000
message:
[merge] bzr.dev 2079
------------------------------------------------------------
revno: 2052.4.9
revision-id: john at arbash-meinel.com-20061016043820-ff374b87ac84e2df
parent: john at arbash-meinel.com-20061016022921-bfd2e3e88b8e7cd5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 14:38:20 +1000
message:
Add an entry about copyright to HACKING
------------------------------------------------------------
revno: 2052.4.8
revision-id: john at arbash-meinel.com-20061016022921-bfd2e3e88b8e7cd5
parent: john at arbash-meinel.com-20061016021537-5539edf68b1e5b81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 12:29:21 +1000
message:
Better documentation about the exception variables
------------------------------------------------------------
revno: 2052.4.7
revision-id: john at arbash-meinel.com-20061016021537-5539edf68b1e5b81
parent: john at arbash-meinel.com-20061016015048-0f22df07e38093da
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 12:15:37 +1000
message:
Use positive lookahead to avoid extra newlines
------------------------------------------------------------
revno: 2052.4.6
revision-id: john at arbash-meinel.com-20061016015048-0f22df07e38093da
parent: john at arbash-meinel.com-20061016014743-17784d83b1949604
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 11:50:48 +1000
message:
[merge] bzr.dev 2078
------------------------------------------------------------
revno: 2052.4.5
revision-id: john at arbash-meinel.com-20061016014743-17784d83b1949604
parent: john at arbash-meinel.com-20061016012546-d01a0740671b4d73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 11:47:43 +1000
message:
Guide people to how to add files to the list of exceptions
------------------------------------------------------------
revno: 2052.4.4
revision-id: john at arbash-meinel.com-20061016012546-d01a0740671b4d73
parent: john at arbash-meinel.com-20061011233209-9ee5ee88a8ae79a2
parent: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Mon 2006-10-16 11:25:46 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
revno: 2052.4.3
revision-id: john at arbash-meinel.com-20061011233209-9ee5ee88a8ae79a2
parent: john at arbash-meinel.com-20061011230827-2bdfc45020695281
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Thu 2006-10-12 09:32:09 +1000
message:
Add (c) Canonical to files that Aaron has approved
------------------------------------------------------------
revno: 2052.4.2
revision-id: john at arbash-meinel.com-20061011230827-2bdfc45020695281
parent: john at arbash-meinel.com-20061005053725-3d2e757dab45eb94
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Thu 2006-10-12 09:08:27 +1000
message:
Change Copyright .. by Canonical to Copyright ... Canonical
------------------------------------------------------------
revno: 2052.4.1
revision-id: john at arbash-meinel.com-20061005053725-3d2e757dab45eb94
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: copyright
timestamp: Thu 2006-10-05 15:37:25 +1000
message:
Add tests to cleanup the copyright of all source files
------------------------------------------------------------
revno: 2052.1.27
revision-id: pqm at pqm.ubuntu.com-20061016042107-3868eeaa654059ae
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
parent: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-16 05:21:07 +0100
message:
(Robert Collins, John Arbash Meinel) Reduce inventory write operations during tree construction by making tree inventory writes occur at tree unlock time. This adds WorkingTree.flush() and alters set_root_id to not write the inventory.
------------------------------------------------------------
revno: 1986.1.5.1.9.1.8
revision-id: robertc at robertcollins.net-20061016011359-803135f6f6a5c793
parent: robertc at robertcollins.net-20061013073925-c5ffa47050a07d5e
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Mon 2006-10-16 11:13:59 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.9.1.7
revision-id: robertc at robertcollins.net-20061013073925-c5ffa47050a07d5e
parent: robertc at robertcollins.net-20061013071251-b49ee527c95bcacf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-13 17:39:25 +1000
message:
Merge reviews.
------------------------------------------------------------
revno: 1986.1.5.1.9.1.6
revision-id: robertc at robertcollins.net-20061013071251-b49ee527c95bcacf
parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-13 17:12:51 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.9.1.5
revision-id: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061005075224-6b7bb42ecd661206
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-06 10:31:00 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.9.1.4
revision-id: robertc at robertcollins.net-20061005075224-6b7bb42ecd661206
parent: robertc at robertcollins.net-20061005073458-f2a32fb8a43c0c34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Thu 2006-10-05 17:52:24 +1000
message:
Update comments and unlock in a better order in tree initialization (Robert Collins, John Meinel)
------------------------------------------------------------
revno: 1986.1.5.1.9.1.3
revision-id: robertc at robertcollins.net-20061005073458-f2a32fb8a43c0c34
parent: robertc at robertcollins.net-20061004074228-8ac10a23b9713335
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Thu 2006-10-05 17:34:58 +1000
message:
New method ``WorkingTree.flush()`` which will write the current memory
inventory out to disk. At the same time, read_working_inventory will
no longer trash the current tree inventory if it has been modified within
the current lock, and the tree will now ``flush()`` automatically on
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
advantage of this functionality. (Robert Collins, John Arbash Meinel)
------------------------------------------------------------
revno: 1986.1.5.1.9.1.2
revision-id: robertc at robertcollins.net-20061004074228-8ac10a23b9713335
parent: robertc at robertcollins.net-20061004070333-622180ec5423be98
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Wed 2006-10-04 17:42:28 +1000
message:
``WorkingTree.set_root_id(None)`` is now deprecated. Please
pass in inventory.ROOT_ID if you want the default root id value.
(Robert Collins, John Arbash Meinel)
------------------------------------------------------------
revno: 1986.1.5.1.9.1.1
revision-id: robertc at robertcollins.net-20061004070333-622180ec5423be98
parent: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Wed 2006-10-04 17:03:33 +1000
message:
(Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.
------------------------------------------------------------
revno: 2052.1.26
revision-id: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
parent: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-10-15 17:32:29 +0100
message:
New trees have unique root ids
------------------------------------------------------------
revno: 1731.1.67
revision-id: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
parent: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:22:42 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.66
revision-id: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:01:26 -0400
message:
add NEWS entry
------------------------------------------------------------
revno: 1731.1.65
revision-id: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
parent: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:59:57 -0400
message:
Use all-lowercase in tree root ids
------------------------------------------------------------
revno: 1731.1.64
revision-id: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
parent: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:55:32 -0400
message:
Fix up more memorytree tests
------------------------------------------------------------
revno: 1731.1.63
revision-id: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
parent: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sat 2006-10-14 12:20:16 -0400
message:
Avoid committing with None root in test_straightline_ancestry
------------------------------------------------------------
revno: 1731.1.62
revision-id: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
parent: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 23:19:14 -0400
message:
Changes from review comments
------------------------------------------------------------
revno: 1731.1.61
revision-id: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 21:50:46 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.60
revision-id: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: unique-root
timestamp: Mon 2006-10-02 09:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.59
revision-id: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Fri 2006-09-29 20:25:31 -0400
message:
Ensure the null revision has no root
------------------------------------------------------------
revno: 1731.1.58
revision-id: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
parent: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:04:13 -0400
message:
fix version_info stuff to deliberately include root
------------------------------------------------------------
revno: 1731.1.57
revision-id: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
parent: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:03:29 -0400
message:
fix repeated root in WorkingTree.list_files
------------------------------------------------------------
revno: 1731.1.56
revision-id: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
parent: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:56:04 -0400
message:
Fix EmptyTree's default include_root
------------------------------------------------------------
revno: 1731.1.55
revision-id: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
parent: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:50:18 -0400
message:
Fix bundle handling
------------------------------------------------------------
revno: 1731.1.54
revision-id: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
parent: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 22:00:45 -0400
message:
Fix revision_tree tests
------------------------------------------------------------
revno: 1731.1.53
revision-id: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
parent: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:57:43 -0400
message:
Fix testament text now that root are variable
------------------------------------------------------------
revno: 1731.1.52
revision-id: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:53:23 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.51
revision-id: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-09-26 22:28:44 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.50
revision-id: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-22 00:52:17 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.49
revision-id: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 16:12:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.48
revision-id: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 15:04:48 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.47
revision-id: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-03 16:41:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.46
revision-id: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: pqm at pqm.ubuntu.com-20060816165353-bc26ccbe32f89d60
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 20:15:23 -0400
message:
merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.45
revision-id: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: pqm at pqm.ubuntu.com-20060815031820-fde63c7ba995e484
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 19:17:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.44
revision-id: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 12:02:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.43
revision-id: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: abentley at panoramicfeedback.com-20060814154505-f7182110bfcce1bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 11:59:43 -0400
message:
Merge more checkout changes
------------------------------------------------------------
revno: 1731.1.42
revision-id: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: abentley at panoramicfeedback.com-20060814134102-f8688153405a8ac7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 10:10:12 -0400
message:
Merge create_checkout_convenience update
------------------------------------------------------------
revno: 1731.1.41
revision-id: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-08-08 00:48:19 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.40
revision-id: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 20:19:03 -0400
message:
Reject further no-special-roots change
------------------------------------------------------------
revno: 1731.1.39
revision-id: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 19:19:38 -0400
message:
Reject removing is_root
------------------------------------------------------------
revno: 1731.1.38
revision-id: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060804235649-c209f0255dc6284c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 13:12:25 -0400
message:
Merge create_checkout_convenience branch
------------------------------------------------------------
revno: 1731.1.37
revision-id: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 18:09:31 -0400
message:
Update from no-special-root
------------------------------------------------------------
revno: 1731.1.36
revision-id: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:26:23 -0400
message:
Revert removal of include_root from EmptyTree.list_files
------------------------------------------------------------
revno: 1731.1.35
revision-id: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:22:20 -0400
message:
Merge restoration of RootEntry and EmptyTree.kind
------------------------------------------------------------
revno: 1731.1.34
revision-id: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 16:23:14 -0400
message:
Merge unicode test case fixes
------------------------------------------------------------
revno: 1731.1.33
revision-id: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
parent: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-08-05 20:20:32 -0400
message:
Revert no-special-root changes
------------------------------------------------------------
revno: 2052.1.25
revision-id: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
parent: john at arbash-meinel.com-20061013074106-1c71354188ac0138
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:51:08 +0100
message:
(John Arbash Meinel) Change run_bzr_subprocess to default to supplying --no-plugins
------------------------------------------------------------
revno: 2052.1.15.2.4
revision-id: john at arbash-meinel.com-20061013074106-1c71354188ac0138
parent: john at arbash-meinel.com-20061013072223-9d1320456e7df776
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:41:06 -0500
message:
fixup one test
------------------------------------------------------------
revno: 2052.1.15.2.3
revision-id: john at arbash-meinel.com-20061013072223-9d1320456e7df776
parent: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
parent: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:22:23 -0500
message:
[merge] bzr.dev 2076
------------------------------------------------------------
revno: 2052.1.15.2.2
revision-id: john at arbash-meinel.com-20061013071527-6043c93c2d3d6c5f
parent: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Fri 2006-10-13 02:15:27 -0500
message:
Review comments from Robert
------------------------------------------------------------
revno: 2052.1.15.2.1
revision-id: john at arbash-meinel.com-20061010081138-5d27a6fd0955bde7
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_subprocess_no_plugins
timestamp: Tue 2006-10-10 03:11:38 -0500
message:
Change run_bzr_subprocess to default to supplying --no-plugins.
Tests that need it can supply allow_plugins=True to override this
behavior.
------------------------------------------------------------
revno: 2052.1.24
revision-id: pqm at pqm.ubuntu.com-20061013071706-5ef72f540f9d3fe3
parent: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:17:06 +0100
message:
(Robert Collins, John Arbash Meinel) Allow tests that require a specific branch or repository format to obtain that through TestCaseWithMemoryTree.make_branch_and_memory_tree.
------------------------------------------------------------
revno: 1986.1.5.1.11
revision-id: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-13 16:45:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.10
revision-id: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-06 10:28:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.9
revision-id: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Wed 2006-10-04 16:19:12 +1000
message:
``TestCase.make_branch_and_memory_tree`` now takes a format
option to set the BzrDir, Repository and Branch formats of the
created objects. (Robert Collins, John Arbash Meinel)
------------------------------------------------------------
revno: 2052.1.23
revision-id: pqm at pqm.ubuntu.com-20061013070838-897847ef11ecdf72
parent: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
parent: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 08:08:38 +0100
message:
(Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
------------------------------------------------------------
revno: 2052.1.21.1.3
revision-id: john at arbash-meinel.com-20061013065326-dcf8dadee82f4afe
parent: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:53:26 +1000
message:
Add NEWS entry for bzr+http://
------------------------------------------------------------
revno: 2052.1.21.1.2
revision-id: john at arbash-meinel.com-20061013064104-57dbb43c2ffa55ff
parent: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:41:04 +1000
message:
(Andrew Bennetts) Implement bzr+http which lets us tunnel the smart protocol through an http connection
------------------------------------------------------------
revno: 2018.1.11.1.29
revision-id: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
parent: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-11 17:16:15 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.11.1.28
revision-id: andrew.bennetts at canonical.com-20061011055532-47bd2039b78674d2
parent: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-11 15:55:32 +1000
message:
Changes in response to review: re-use _base_curl, rather than keeping a seperate _post_curl object; add docstring to test_http.RecordingServer, set is_user_error on some new exceptions.
------------------------------------------------------------
revno: 2018.1.11.1.27
revision-id: andrew.bennetts at canonical.com-20061009073415-636d73bf2b733bce
parent: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-10-09 17:34:15 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.26
revision-id: andrew.bennetts at canonical.com-20061009071340-87345d71fadc673f
parent: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-10-09 17:13:40 +1000
message:
Changes prompted by j-a-meinel's review.
------------------------------------------------------------
revno: 2018.1.11.1.25
revision-id: andrew.bennetts at canonical.com-20061004022735-c362213df9239f22
parent: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-04 12:27:35 +1000
message:
Tweak psuedo-EBNF to be in sync with the code.
------------------------------------------------------------
revno: 2018.1.11.1.24
revision-id: andrew.bennetts at canonical.com-20061004022448-5b5cb552e3bc7647
parent: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-10-04 12:24:48 +1000
message:
Delete some obsolete code and comments.
------------------------------------------------------------
revno: 2018.1.11.1.23
revision-id: andrew.bennetts at canonical.com-20060929062858-4516689dc8de55ec
parent: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 16:28:58 +1000
message:
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
------------------------------------------------------------
revno: 2018.1.11.1.22
revision-id: andrew.bennetts at canonical.com-20060929050436-08c49958f1752c88
parent: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 15:04:36 +1000
message:
Remove commented cruft.
------------------------------------------------------------
revno: 2018.1.11.1.21
revision-id: andrew.bennetts at canonical.com-20060929050153-ded347722daa93c8
parent: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 15:01:53 +1000
message:
Simplify do_POST, and add a comment.
------------------------------------------------------------
revno: 2018.1.11.1.20
revision-id: andrew.bennetts at canonical.com-20060929043519-3eb896e184213815
parent: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 14:35:19 +1000
message:
Tidy up _serve_one_request.
------------------------------------------------------------
revno: 2018.1.11.1.19
revision-id: andrew.bennetts at canonical.com-20060929035741-0e33d90cd7229efb
parent: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 13:57:41 +1000
message:
Add TODOs about logging server exceptions.
------------------------------------------------------------
revno: 2018.1.11.1.18
revision-id: andrew.bennetts at canonical.com-20060929035223-7f1f1e4534d423dc
parent: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 13:52:23 +1000
message:
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
------------------------------------------------------------
revno: 2018.1.11.1.17
revision-id: andrew.bennetts at canonical.com-20060929021737-e4b97746c53a3dcc
parent: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:17:37 +1000
message:
Remove old comments.
------------------------------------------------------------
revno: 2018.1.11.1.16
revision-id: andrew.bennetts at canonical.com-20060929021708-921ba155bb431d52
parent: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:17:08 +1000
message:
Simplify SmartServerPipeStreamMedium._serve_one_request, and remove _recv_bulk, _recv_trailer and a _recv_tuple.
------------------------------------------------------------
revno: 2018.1.11.1.15
revision-id: andrew.bennetts at canonical.com-20060929020944-928dfe5361c8c7ad
parent: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Fri 2006-09-29 12:09:44 +1000
message:
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
------------------------------------------------------------
revno: 2018.1.11.1.14
revision-id: andrew.bennetts at canonical.com-20060928080615-d7bc2a8e393ce711
parent: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 18:06:15 +1000
message:
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
------------------------------------------------------------
revno: 2018.1.11.1.13
revision-id: andrew.bennetts at canonical.com-20060928050227-021df4f75bca5f88
parent: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 15:02:27 +1000
message:
Update SmartClientRequestProtocolOne.read_body_bytes to use next_read_size.
------------------------------------------------------------
revno: 2018.1.11.1.12
revision-id: andrew.bennetts at canonical.com-20060928040135-c2c58bbb690acc08
parent: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 14:01:35 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.11
revision-id: andrew.bennetts at canonical.com-20060928034548-7d0a4e39d595ff17
parent: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-28 13:45:48 +1000
message:
Remove commented cruft, add a TODO comment.
------------------------------------------------------------
revno: 2018.1.11.1.10
revision-id: andrew.bennetts at canonical.com-20060927052002-5d722be0a289aa4c
parent: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Wed 2006-09-27 15:20:02 +1000
message:
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
------------------------------------------------------------
revno: 2018.1.11.1.9
revision-id: andrew.bennetts at canonical.com-20060926054631-7d63ee5c801fb098
parent: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 15:46:31 +1000
message:
(Andrew Bennetts, Robert Collins) Add test_http.RecordingServer, and use it to
test HttpTransport._post.
------------------------------------------------------------
revno: 2018.1.11.1.8
revision-id: andrew.bennetts at canonical.com-20060926022414-111422842abffe36
parent: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 12:24:14 +1000
message:
Make HttpTransportBase.get_smart_client return self again.
Move HTTP smart client code into http.py from smart.py.
------------------------------------------------------------
revno: 2018.1.11.1.7
revision-id: andrew.bennetts at canonical.com-20060925164146-200a3de7084173eb
parent: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-26 02:41:46 +1000
message:
Implement _post on HttpTransport_urllib.
------------------------------------------------------------
revno: 2018.1.11.1.6
revision-id: andrew.bennetts at canonical.com-20060925095600-c4f9252728a1f51b
parent: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-09-25 19:56:00 +1000
message:
HTTP client starting to work (pycurl for the moment).
------------------------------------------------------------
revno: 2018.1.11.1.5
revision-id: andrew.bennetts at canonical.com-20060925064320-d3a8f0493f1e29ff
parent: robertc at robertcollins.net-20060922043958-628ce589a155a56e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Mon 2006-09-25 16:43:20 +1000
message:
Clean up some pyflakes warnings, including making 'backing_transport' a required argument of SmartTCPServer.__init__.
------------------------------------------------------------
revno: 2018.1.11.1.4
revision-id: robertc at robertcollins.net-20060922043958-628ce589a155a56e
parent: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
committer: Robert Collins <robertc at robertcollins.net>
branch nick: http-smart
timestamp: Fri 2006-09-22 14:39:58 +1000
message:
separate out the client medium from the client encoding protocol for the smart server.
------------------------------------------------------------
revno: 2018.1.11.1.3
revision-id: andrew.bennetts at canonical.com-20060921091520-673c55c101a86614
parent: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Thu 2006-09-21 19:15:20 +1000
message:
Starting factoring out the smart server client "medium" from the protocol.
------------------------------------------------------------
revno: 2018.1.11.1.2
revision-id: andrew.bennetts at canonical.com-20060919111846-9853422711c0d27c
parent: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-19 21:18:46 +1000
message:
Implement HTTP smart server.
------------------------------------------------------------
revno: 2018.1.11.1.1
revision-id: andrew.bennetts at canonical.com-20060919034701-9b801d527a1261f5
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss HTTP support
timestamp: Tue 2006-09-19 13:47:01 +1000
message:
Empty BRANCH.TODO
------------------------------------------------------------
revno: 2052.1.21.1.1
revision-id: john at arbash-meinel.com-20061013063644-89370e8650ab1cd7
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-10-13 16:36:44 +1000
message:
Robert's comments: Refer to RFC2616 to explain how we handle missing Content-Type
------------------------------------------------------------
revno: 2052.1.22
revision-id: pqm at pqm.ubuntu.com-20061013064121-50dd056d490840cd
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: john at arbash-meinel.com-20061013013159-8224e911d84e438a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-13 07:41:21 +0100
message:
(John Arbash Meinel) Add a Registry class to help make registry functionality consistent
------------------------------------------------------------
revno: 1911.4.17
revision-id: john at arbash-meinel.com-20061013013159-8224e911d84e438a
parent: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 11:31:59 +1000
message:
[merge] bzr.dev 2073
------------------------------------------------------------
revno: 1911.4.16
revision-id: john at arbash-meinel.com-20061013005526-b473dbb49c269e40
parent: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 10:55:26 +1000
message:
cleanup doc strings as recommended by Aaron and Martin
------------------------------------------------------------
revno: 1911.4.15
revision-id: john at arbash-meinel.com-20061013002545-025556fc8e5b9d83
parent: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-10-13 10:25:45 +1000
message:
Updated HACKING and docstrings per Martin's suggestions
------------------------------------------------------------
revno: 1911.4.14
revision-id: john at arbash-meinel.com-20061011012122-ae8ff84cf665d7e3
parent: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-10-11 11:21:22 +1000
message:
[merge] bzr.dev 2070
------------------------------------------------------------
revno: 1911.4.13
revision-id: john at arbash-meinel.com-20061011012009-c2f60b15e4466737
parent: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-10-11 11:20:09 +1000
message:
Cleanups suggested by Richard Wilbur
------------------------------------------------------------
revno: 1911.4.12
revision-id: john at arbash-meinel.com-20060927224045-1a4a59afa58632f0
parent: john at arbash-meinel.com-20060921222519-429864b017a1629e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Wed 2006-09-27 17:40:45 -0500
message:
Use helper objects to handle lazy importing
------------------------------------------------------------
revno: 1911.4.11
revision-id: john at arbash-meinel.com-20060921222519-429864b017a1629e
parent: john at arbash-meinel.com-20060909182125-b80276593538c308
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Thu 2006-09-21 17:25:19 -0500
message:
Remove extra dict-like members, simplfying the api
------------------------------------------------------------
revno: 1911.4.10
revision-id: john at arbash-meinel.com-20060909182125-b80276593538c308
parent: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 13:21:25 -0500
message:
A test which uses the callback to return information from the object.
------------------------------------------------------------
revno: 1911.4.9
revision-id: john at arbash-meinel.com-20060909181901-93302c1b51b375ba
parent: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 13:19:01 -0500
message:
A help callable should take the registry as the first parameter
------------------------------------------------------------
revno: 1911.4.8
revision-id: john at arbash-meinel.com-20060909174443-7a3417310f453b5e
parent: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:44:43 -0500
message:
Add Registry.iterhelp and Registry.iterinfo
------------------------------------------------------------
revno: 1911.4.7
revision-id: john at arbash-meinel.com-20060909173034-fd1e7849d827dcf8
parent: john at arbash-meinel.com-20060909170355-487019ff329aea61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:30:34 -0500
message:
Add help and info parameters, and tests for them
------------------------------------------------------------
revno: 1911.4.6
revision-id: john at arbash-meinel.com-20060909170355-487019ff329aea61
parent: john at arbash-meinel.com-20060909165226-205b4911cc273230
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 12:03:55 -0500
message:
first_is_default was not a good design
------------------------------------------------------------
revno: 1911.4.5
revision-id: john at arbash-meinel.com-20060909165226-205b4911cc273230
parent: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Sat 2006-09-09 11:52:26 -0500
message:
Make a Registry look more like a dict, and allow anyone to register stuff lazily.
------------------------------------------------------------
revno: 1911.4.4
revision-id: john at arbash-meinel.com-20060901180210-3707e15493f19a8a
parent: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 13:02:10 -0500
message:
move the NEWS entry to the correct location, update for final changes
------------------------------------------------------------
revno: 1911.4.3
revision-id: john at arbash-meinel.com-20060901175934-ab40fb137c471ec0
parent: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
parent: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 12:59:34 -0500
message:
[merge] Adeodato Simó: change factory => registry
------------------------------------------------------------
revno: 1912.5.9
revision-id: dato at net.com.org.es-20060818215453-d59f041bb6d2f64d
parent: dato at net.com.org.es-20060815180015-21aac59162d04066
parent: pqm at pqm.ubuntu.com-20060818181719-90004a4648d8537a
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Fri 2006-08-18 23:54:53 +0200
message:
[merge] bzr.dev 1947
------------------------------------------------------------
revno: 1912.5.8
revision-id: dato at net.com.org.es-20060815180015-21aac59162d04066
parent: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 20:00:15 +0200
message:
Mention Registry and LazyImportRegistry in NEWS/INTERNALS.
------------------------------------------------------------
revno: 1912.5.7
revision-id: dato at net.com.org.es-20060815175745-2af07bdc1a6b5444
parent: dato at net.com.org.es-20060815175135-c8390000cdf6561a
parent: pqm at pqm.ubuntu.com-20060815131500-a6ba92a17caa4aab
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 19:57:45 +0200
message:
[merge] bzr.dev 1924
------------------------------------------------------------
revno: 1912.5.6
revision-id: dato at net.com.org.es-20060815175135-c8390000cdf6561a
parent: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 19:51:35 +0200
message:
Kill fallback_key parameter in Registry.get(), as discussed with John.
This frees up the base class from unneeded complexity, and a subclass
can implement that feature should it ever be needed (there are no known
use cases at the moment).
------------------------------------------------------------
revno: 1912.5.5
revision-id: dato at net.com.org.es-20060815020435-5972a9c8ad16b7de
parent: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 04:04:35 +0200
message:
Improve description of :param key: in Registry.get().
------------------------------------------------------------
revno: 1912.5.4
revision-id: dato at net.com.org.es-20060815020051-0571fa7ebc3fa4ae
parent: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 04:00:51 +0200
message:
Make :param key: in Registry.get() default to None, instead of _marker,
as suggested by John Arbash Meinel.
------------------------------------------------------------
revno: 1912.5.3
revision-id: dato at net.com.org.es-20060815015006-93a80d808b0ae0a9
parent: dato at net.com.org.es-20060810214727-155eb44860689725
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Tue 2006-08-15 03:50:06 +0200
message:
Rename default_key in Registry.get() to fallback_key.
------------------------------------------------------------
revno: 1912.5.2
revision-id: dato at net.com.org.es-20060810214727-155eb44860689725
parent: dato at net.com.org.es-20060810194614-4033e490fa06840e
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_class
timestamp: Thu 2006-08-10 23:47:27 +0200
message:
Morph John's LazyFactory into a generalized Registry class, and
implement LazyImportRegistry as a subclass.
------------------------------------------------------------
revno: 1912.5.1
revision-id: dato at net.com.org.es-20060810194614-4033e490fa06840e
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: registry_factory
timestamp: Thu 2006-08-10 21:46:14 +0200
message:
[merge] jam's lazy-factory
------------------------------------------------------------
revno: 1911.4.2
revision-id: john at arbash-meinel.com-20060901175610-45ac83a70f7f6794
parent: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: registry
timestamp: Fri 2006-09-01 12:56:10 -0500
message:
[merge] bzr.dev 1981
------------------------------------------------------------
revno: 1911.4.1
revision-id: john at arbash-meinel.com-20060809213743-677b61b84ed524dc
parent: pqm at pqm.ubuntu.com-20060809170522-28c918e7d93365fe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy-factory
timestamp: Wed 2006-08-09 16:37:43 -0500
message:
Creating a factory that can load modules on demand.
------------------------------------------------------------
revno: 2052.1.21
revision-id: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 02:18:08 +0100
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
revno: 2052.1.20.1.1
revision-id: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: james at jamesh.id.au-20061004071239-bb32b93e159b7899
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-10-11 20:07:42 -0500
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
revno: 1993.3.6
revision-id: james at jamesh.id.au-20061004071239-bb32b93e159b7899
parent: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Wed 2006-10-04 15:12:39 +0800
message:
get rid of the recurse argument to get_user_option()
------------------------------------------------------------
revno: 1993.3.5
revision-id: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
parent: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 21:36:02 +0800
message:
add back recurse=False option to config file
------------------------------------------------------------
revno: 1993.3.4
revision-id: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
parent: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 19:10:54 +0800
message:
merge from bzr.dev
------------------------------------------------------------
revno: 1993.3.3
revision-id: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-09-18 10:59:05 +0800
message:
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
------------------------------------------------------------
revno: 1993.3.2
revision-id: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
parent: james at jamesh.id.au-20060908031106-1b304673906dcf8f
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 12:30:02 +0800
message:
make test break again
------------------------------------------------------------
revno: 1993.3.1
revision-id: james at jamesh.id.au-20060908031106-1b304673906dcf8f
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 11:11:06 +0800
message:
first go at making location config lookup recursive
------------------------------------------------------------
revno: 2052.1.20
revision-id: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: john at arbash-meinel.com-20061011085152-65de197133d8bd41
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 01:51:31 +0100
message:
(John Arbash Meinel) Fix bug #62473
------------------------------------------------------------
revno: 2052.1.18.1.1
revision-id: john at arbash-meinel.com-20061011085152-65de197133d8bd41
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dont_require_content_type_62473
timestamp: Wed 2006-10-11 18:51:52 +1000
message:
Fix bug #62473 by not requiring content-type in range responses
------------------------------------------------------------
revno: 2052.1.19
revision-id: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-11 10:26:57 +0100
message:
(John Arbash Meinel) use lazy importing to improve startup time
------------------------------------------------------------
revno: 1996.1.20.1.37
revision-id: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
parent: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 11:17:15 +1000
message:
Update HACKING and TODO
------------------------------------------------------------
revno: 1996.1.20.1.36
revision-id: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
parent: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 10:23:23 +1000
message:
[merge] bzr.dev 2070
------------------------------------------------------------
revno: 1996.1.20.1.35
revision-id: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:50:43 +1000
message:
more lazy importing gets bzr rocks down to 116ms
------------------------------------------------------------
revno: 1996.1.20.1.34
revision-id: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
parent: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:44:57 +1000
message:
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
------------------------------------------------------------
revno: 1996.1.20.1.33
revision-id: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
parent: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:36:16 +1000
message:
make bzrlib/conflicts.py lazy
------------------------------------------------------------
revno: 1996.1.20.1.32
revision-id: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
parent: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:29:17 +1000
message:
from bzrlib.ui lazy import progress, and make progress import lazily
------------------------------------------------------------
revno: 1996.1.20.1.31
revision-id: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
parent: john at arbash-meinel.com-20061006072218-930b322b5d303872
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:25:55 +1000
message:
Make bzrlib.config use lazy importing
------------------------------------------------------------
revno: 1996.1.20.1.30
revision-id: john at arbash-meinel.com-20061006072218-930b322b5d303872
parent: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:22:18 +1000
message:
Don't import 'bzrlib.tree' directly in bzrlib.builtins
------------------------------------------------------------
revno: 1996.1.20.1.29
revision-id: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
parent: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:14:31 +1000
message:
don't import errors, and try to lazy import logging in bzrlib.trace
------------------------------------------------------------
revno: 1996.1.20.1.28
revision-id: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
parent: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:13:51 +1000
message:
lazy import revisionspec and errors for bzrlib.options
------------------------------------------------------------
revno: 1996.1.20.1.27
revision-id: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
parent: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:03:55 +1000
message:
lazy import getpass in bzrlib.ui.text
------------------------------------------------------------
revno: 1996.1.20.1.26
revision-id: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
parent: john at arbash-meinel.com-20061006070031-1206bad6a645029c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:57 +1000
message:
Make cmd_version_info.py lazy import most other modules
------------------------------------------------------------
revno: 1996.1.20.1.25
revision-id: john at arbash-meinel.com-20061006070031-1206bad6a645029c
parent: john at arbash-meinel.com-20061006064134-0716158c26306b4d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:31 +1000
message:
Make importing errors lazy for osutils
------------------------------------------------------------
revno: 1996.1.20.1.24
revision-id: john at arbash-meinel.com-20061006064134-0716158c26306b4d
parent: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:41:34 +1000
message:
NEWS about even better rocks time
------------------------------------------------------------
revno: 1996.1.20.1.23
revision-id: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
parent: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:32:11 -0500
message:
also avoid importing WorkingTree before it is needed
------------------------------------------------------------
revno: 1996.1.20.1.22
revision-id: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
parent: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:27:06 -0500
message:
shave off another 10ms by avoiding importing merge from working tree
------------------------------------------------------------
revno: 1996.1.20.1.21
revision-id: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
parent: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:24:02 +1000
message:
NEWS about improved startup times
------------------------------------------------------------
revno: 1996.1.20.1.20
revision-id: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
parent: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 15:53:44 +1000
message:
[merge] bzr.dev 2063
------------------------------------------------------------
revno: 1996.1.20.1.19
revision-id: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 10:38:46 +1000
message:
make lazy_import lazily import errors
------------------------------------------------------------
revno: 1996.1.20.1.18
revision-id: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
parent: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 08:42:09 +1000
message:
Now that mkdtemp and rmtree are lazy, they should not be directly improted.
------------------------------------------------------------
revno: 1996.1.20.1.17
revision-id: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
parent: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:21:03 -0500
message:
lazy_import plugin and transport/local
------------------------------------------------------------
revno: 1996.1.20.1.16
revision-id: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
parent: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:20:41 -0500
message:
Update output of --profile-imports to understand from foo import bar time
------------------------------------------------------------
revno: 1996.1.20.1.15
revision-id: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
parent: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:51:49 -0500
message:
lazy_import AtomicFile
------------------------------------------------------------
revno: 1996.1.20.1.14
revision-id: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
parent: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:44:23 -0500
message:
lazy_import osutils and sign_my_commits
Move doc tests into test_osutils, since lazy_import doesn't play nicely
with DocTest
------------------------------------------------------------
revno: 1996.1.20.1.13
revision-id: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
parent: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 18:17:16 -0500
message:
Fix the inventory doc tests
------------------------------------------------------------
revno: 1996.1.20.1.12
revision-id: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
parent: john at arbash-meinel.com-20060912223718-b605523794911ca9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:59:53 -0500
message:
Change how 'revision' is imported to avoid problems later
------------------------------------------------------------
revno: 1996.1.20.1.11
revision-id: john at arbash-meinel.com-20060912223718-b605523794911ca9
parent: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:37:18 -0500
message:
Hack around loading 'copy' to make startup much faster
------------------------------------------------------------
revno: 1996.1.20.1.10
revision-id: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
parent: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:25:28 -0500
message:
lazy_import inventory.py, avoids importing tarfile
------------------------------------------------------------
revno: 1996.1.20.1.9
revision-id: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
parent: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:16:38 -0500
message:
lazy_import diff.py
------------------------------------------------------------
revno: 1996.1.20.1.8
revision-id: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
parent: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:12:30 -0500
message:
lazy_import bundle and bundle.commands
------------------------------------------------------------
revno: 1996.1.20.1.7
revision-id: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
parent: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:03:29 -0500
message:
lazy import versionedfile, late-load bzrlib.merge
------------------------------------------------------------
revno: 1996.1.20.1.6
revision-id: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
parent: john at arbash-meinel.com-20060912204642-91599869cc863f07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 16:19:54 -0500
message:
Find a few places that weren't importing their dependencies.
Demandload a few more places.
------------------------------------------------------------
revno: 1996.1.20.1.5
revision-id: john at arbash-meinel.com-20060912204642-91599869cc863f07
parent: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:46:42 -0500
message:
Cleanup, deprecated, and get the tests passing again.
bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.
------------------------------------------------------------
revno: 1996.1.20.1.4
revision-id: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
parent: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:28:03 -0500
message:
lazy_import bzrlib/repository.py
------------------------------------------------------------
revno: 1996.1.20.1.3
revision-id: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
parent: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:16:43 -0500
message:
Shave off another 40ms by demand loading branch and bzrdir
------------------------------------------------------------
revno: 1996.1.20.1.2
revision-id: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
parent: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:10:32 -0500
message:
Make profile_imports aware of lazy_import stuff
------------------------------------------------------------
revno: 1996.1.20.1.1
revision-id: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:02:29 -0500
message:
Demandloading builtins.py drops our load time from 350ms to 291ms
------------------------------------------------------------
revno: 2052.1.18
revision-id: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:23:07 +0100
message:
(John Arbash Meinel) Handle exceptions while opening /dev/urandom
------------------------------------------------------------
revno: 2052.1.15.1.1
revision-id: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: urandom-56883
timestamp: Tue 2006-10-10 01:26:39 -0500
message:
Catch an exception while opening /dev/urandom rather than using os.path.exists()
------------------------------------------------------------
revno: 2052.1.17
revision-id: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: john at arbash-meinel.com-20061010064845-173353db11a009a0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:09:12 +0100
message:
(John Arbash Meinel) bzrlib.lazy_regex.lazy_compile creates regex objects that are compiled on demand
------------------------------------------------------------
revno: 2052.1.11.4.5
revision-id: john at arbash-meinel.com-20061010064845-173353db11a009a0
parent: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 16:48:45 +1000
message:
review feedback from Martin
------------------------------------------------------------
revno: 2052.1.11.4.4
revision-id: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
parent: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:06:24 +1000
message:
Install lazy compile during startup
------------------------------------------------------------
revno: 2052.1.11.4.3
revision-id: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
parent: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:01:53 +1000
message:
Update profile imports to be aware of the new compiler
------------------------------------------------------------
revno: 2052.1.11.4.2
revision-id: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
parent: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:41:01 +1000
message:
Add install and unistall functions, and tests
------------------------------------------------------------
revno: 2052.1.11.4.1
revision-id: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:17:29 +1000
message:
bzrlib.lazy_regex.lazy_compile creates a proxy object around re.compile()
This object compiles on first use, rather than compiling instantly.
------------------------------------------------------------
revno: 2052.1.16
revision-id: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 07:28:41 +0100
message:
(mbp) benchmark updates
------------------------------------------------------------
revno: 1908.3.21
revision-id: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20061004101753-20c01466441296e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: usecases-benchmarks
timestamp: Fri 2006-10-06 12:04:17 +1000
message:
merge additional fix from cfbolz
------------------------------------------------------------
revno: 1908.3.20.1.1
revision-id: cfbolz at gmx.de-20061004101753-20c01466441296e7
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-10-04 12:17:53 +0200
message:
Fix make_kernel_like_tree_committed, which does not exist any more :-(.
------------------------------------------------------------
revno: 1908.3.20
revision-id: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Tue 2006-10-03 17:34:29 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.19
revision-id: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-09-29 22:27:19 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.18
revision-id: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:54:47 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.17
revision-id: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:51:59 +0200
message:
Fix bundle benchmarks: don't do install_bundle on too many revisions: takes way
too long. Split up timing of install_bundle and write_bundle.
------------------------------------------------------------
revno: 1908.3.16
revision-id: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
parent: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: pqm at pqm.ubuntu.com-20060830143731-af84f2be15714815
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:35 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.15
revision-id: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:06 +0200
message:
Fix problems pointed out by John:
* Actually benchmark install_bundle too.
* Fix PEP 8 issues.
* Fix caching of trees by using names dependant on the parameters.
------------------------------------------------------------
revno: 1908.3.14
revision-id: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
parent: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 04:17:16 +0200
message:
Refactor the bundle benchmarks to use the existing helper functions.
------------------------------------------------------------
revno: 1908.3.13
revision-id: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
parent: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:40:18 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.12
revision-id: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:37:50 +0200
message:
Fix docstrings and other things to be PEP 8 compatible. Removed caching of
trees in preparation of using John's mechanism.
------------------------------------------------------------
revno: 1908.3.11
revision-id: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
parent: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 18:42:15 +0200
message:
Use the proper functions for constructing trees in benchmarks introduced a
while ago that are also properly cached.
------------------------------------------------------------
revno: 1908.3.10
revision-id: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
parent: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 15:16:52 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 1908.3.9
revision-id: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:57:09 +0000
message:
Don't use cache by default.
------------------------------------------------------------
revno: 1908.3.8
revision-id: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
parent: hpk at merlinux.de-20060812095539-6acc59da6be3a656
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:56:40 +0000
message:
Explicitely generate test functions.
------------------------------------------------------------
revno: 1908.3.7
revision-id: hpk at merlinux.de-20060812095539-6acc59da6be3a656
parent: hpk at merlinux.de-20060812093832-8037f88795c2685e
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:55:39 +0000
message:
Reverting mutter branch merge.
------------------------------------------------------------
revno: 1908.3.6
revision-id: hpk at merlinux.de-20060812093832-8037f88795c2685e
parent: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:38:32 +0000
message:
Minor doc fix.
------------------------------------------------------------
revno: 1908.3.5
revision-id: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
parent: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:04:38 +0000
message:
Merge bundle benchmarks and resolve conflict.
------------------------------------------------------------
revno: 1908.3.3.1.5
revision-id: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
parent: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
committer: holger krekel <hpk at merlinux.de>
branch nick: bundle_bench
timestamp: Fri 2006-08-11 17:25:00 +0000
message:
route more creation code through cached_make
and refactor so that apply bundle works from an
empty tree.
------------------------------------------------------------
revno: 1908.3.3.1.4
revision-id: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
parent: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:12:07 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.3.1.1.1.1
revision-id: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 19:53:42 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.3.1.3
revision-id: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:02:36 +0200
message:
(cfbolz, hpk): Add caching mechanism and add benchmark for bundle-reading.
------------------------------------------------------------
revno: 1908.3.3.1.2
revision-id: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 12:17:48 +0200
message:
Actually run the benchmarks.
------------------------------------------------------------
revno: 1908.3.3.1.1
revision-id: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 13:28:41 +0200
message:
low level bundle tests.
------------------------------------------------------------
revno: 1908.3.4
revision-id: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:02:27 +0000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.3.3
revision-id: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 13:03:53 +0200
message:
Add benchmark for applying a benchmark and fix some formatting/typos.
------------------------------------------------------------
revno: 1908.3.2
revision-id: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
parent: cfbolz at gmx.de-20060807163103-127425db68843779
parent: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 12:55:04 +0200
message:
Merge Jan's benchmarks.
------------------------------------------------------------
revno: 1868.1.5
revision-id: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
parent: jan at merlinux.de-20060719045812-23b43140f27fa081
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 07:54:36 +0200
message:
benchmarks for "bzr bundle --revision ..-1"
------------------------------------------------------------
revno: 1868.1.4
revision-id: jan at merlinux.de-20060719045812-23b43140f27fa081
parent: jan at merlinux.de-20060719044851-ec1047597afeafdd
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:58:12 +0200
message:
added missing file bench_info.py
somehow bzr add missed the file, probably invoked it in a wrong dir
------------------------------------------------------------
revno: 1868.1.3
revision-id: jan at merlinux.de-20060719044851-ec1047597afeafdd
parent: jan at merlinux.de-20060719042908-4f363674ac7c088e
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:48:51 +0200
message:
benchmarks for "bzr info" in a kernel like tree
------------------------------------------------------------
revno: 1868.1.2
revision-id: jan at merlinux.de-20060719042908-4f363674ac7c088e
parent: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:29:08 +0200
message:
benchmark for "bzr commit single_file" in a kernel like tree
------------------------------------------------------------
revno: 1868.1.1
revision-id: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 05:47:44 +0200
message:
benchmark for "bzr status single_file" in a kernel like tree
------------------------------------------------------------
revno: 2052.1.15
revision-id: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 04:06:28 +0100
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
revno: 2052.1.14.1.1
revision-id: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: wang at ubuntu-20061010013213-1987b53af335c1cc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 12:26:32 +1000
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
revno: 2052.1.11.3.1
revision-id: wang at ubuntu-20061010013213-1987b53af335c1cc
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: wang <wang at ubuntu>
branch nick: test-branch
timestamp: Tue 2006-10-10 09:32:13 +0800
message:
fix typos
------------------------------------------------------------
revno: 2052.1.14
revision-id: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: john at arbash-meinel.com-20061010001525-84e54e428d10addd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:18:00 +0100
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
revno: 2052.1.11.2.1
revision-id: john at arbash-meinel.com-20061010001525-84e54e428d10addd
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push-to-diverged
timestamp: Mon 2006-10-09 19:15:25 -0500
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
revno: 2052.1.13
revision-id: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:08:42 +0100
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
revno: 2052.1.5.2.1
revision-id: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 09:47:22 +1000
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
revno: 2051.2.1
revision-id: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.proxy-error
timestamp: Sat 2006-10-07 14:52:18 +0530
message:
correct handling of proxy error
------------------------------------------------------------
revno: 2052.1.12
revision-id: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 02:59:35 +0100
message:
(jam) add more startup benchmarks
------------------------------------------------------------
revno: 2052.1.11.1.1
revision-id: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: startup-benchmarks
timestamp: Mon 2006-10-09 18:44:19 -0500
message:
spin off startup benchmarks to their own branch
------------------------------------------------------------
revno: 2052.1.11
revision-id: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 05:18:29 +0100
message:
Fix diff3 merges to not indicate conflicts on clean merges
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.40
revision-id: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
parent: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-10-05 00:05:12 -0400
message:
Update test case style
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.39
revision-id: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
parent: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 14:40:24 -0400
message:
Fix diff3 conflict-reporting bug
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.38
revision-id: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 09:15:43 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2052.1.10
revision-id: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 01:14:36 +0100
message:
(John Meinel) don't require a valid email for LockDir
------------------------------------------------------------
revno: 2052.1.3.2.2
revision-id: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
parent: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:24:37 -0500
message:
Switch extract_email_address() to use a more specific exception
------------------------------------------------------------
revno: 2052.1.3.2.1
revision-id: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:12:58 -0500
message:
Make LockDir less sensitive to invalid configuration of email
------------------------------------------------------------
revno: 2052.1.9
revision-id: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 09:13:07 +0100
message:
(mbp) let bzr+ssh:// work without paramiko
------------------------------------------------------------
revno: 2039.2.4
revision-id: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
parent: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 17:57:23 +1000
message:
Fix missing import
------------------------------------------------------------
revno: 2039.2.3
revision-id: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
parent: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:43:08 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2039.2.2
revision-id: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:41:54 +1000
message:
Define SmartSSHTransport class even without paramiko
(#62727)
------------------------------------------------------------
revno: 2052.1.8
revision-id: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 06:08:07 +0100
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
------------------------------------------------------------
revno: 1986.1.5.1.8
revision-id: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
parent: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:50:23 +1000
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
------------------------------------------------------------
revno: 1986.1.5.1.7
revision-id: robertc at robertcollins.net-20061004043457-571e07d2928d75cb
parent: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Wed 2006-10-04 14:34:57 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.6
revision-id: robertc at robertcollins.net-20060928225620-dcf173e716983f3b
parent: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 08:56:20 +1000
message:
Merge fixed TestCaseWithMemoryTransport.
------------------------------------------------------------
revno: 1986.1.5.1.5
revision-id: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 07:54:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.4
revision-id: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 15:38:58 +1000
message:
Merge from TestCaseWithMemoryTransport.
------------------------------------------------------------
revno: 1986.1.5.1.3
revision-id: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 14:45:31 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.5.1.2
revision-id: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:52:09 +1000
message:
25/home/robertc/source/baz/test-performance/bzrlib/tests/test_ancestry.py performance win for tests in test_ancestry.py.
------------------------------------------------------------
revno: 1986.1.5.1.1
revision-id: robertc at robertcollins.net-20060914032812-af89ea18325d0b7f
parent: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Thu 2006-09-14 13:28:12 +1000
message:
Merge MemoryTree branch.
------------------------------------------------------------
revno: 2052.1.7
revision-id: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
parent: robertc at robertcollins.net-20061004032543-58e96ff9d0e25d9c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 04:41:15 +0100
message:
(Robert Collins) Add TestCaseWithMemoryTransport, a test class specifically for doing tests with memory transports and no disk resources.
------------------------------------------------------------
revno: 1986.1.6.1.7
revision-id: robertc at robertcollins.net-20061004032543-58e96ff9d0e25d9c
parent: robertc at robertcollins.net-20060928231059-e8d068d63b81d3f1
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-10-04 13:25:43 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.6.1.6
revision-id: robertc at robertcollins.net-20060928231059-e8d068d63b81d3f1
parent: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 09:10:59 +1000
message:
Move NEWS section for TestCaseWithMemoryTransport to the right area.
------------------------------------------------------------
revno: 1986.1.6.1.5
revision-id: robertc at robertcollins.net-20060928223654-9edbbe94712f8ce9
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 08:36:54 +1000
message:
Unbreak transport tests.
------------------------------------------------------------
revno: 1986.1.6.1.4
revision-id: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
parent: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 07:53:09 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.6.1.1.1.2
revision-id: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
parent: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Fri 2006-09-29 07:49:43 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1986.1.6.1.3
revision-id: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
parent: robertc at robertcollins.net-20060918052852-743b230325d2d4d5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Mon 2006-09-18 15:35:44 +1000
message:
New test base class TestCaseWithMemoryTransport offers memory-only
testing facilities: its not suitable for tests that need to mutate disk
state, but most tests should not need that and should be converted to
TestCaseWithMemoryTransport. (Robert Collins)
------------------------------------------------------------
revno: 1986.1.6.1.2
revision-id: robertc at robertcollins.net-20060918052852-743b230325d2d4d5
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Mon 2006-09-18 15:28:52 +1000
message:
Merge bzr.dev,
------------------------------------------------------------
revno: 1986.1.6.1.1.1.1
revision-id: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Mon 2006-09-18 14:09:11 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1986.1.6.1.1
revision-id: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Thu 2006-09-14 16:18:29 +1000
message:
Bugfix - the name of the test for make_branch_and_memory_tree was wrong.
------------------------------------------------------------
revno: 2052.1.6
revision-id: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-02 01:43:10 +0100
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
revno: 2052.1.5.1.1
revision-id: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr.dev
timestamp: Mon 2006-10-02 10:25:13 +1000
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
revno: 2052.1.5
revision-id: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:57:29 +0100
message:
(jam) Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
revno: 2052.1.3.1.2
revision-id: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 15:39:52 -0500
message:
Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
revno: 2052.1.4
revision-id: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:47:35 +0100
message:
(jam) find python2.5 if 2.4 is not available
------------------------------------------------------------
revno: 2052.1.3.1.1
revision-id: john at arbash-meinel.com-20060929174315-796535c31fa0d121
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:43:15 -0500
message:
Find python2.5 if 2.4 cannot be found
------------------------------------------------------------
revno: 2052.1.3
revision-id: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: john at arbash-meinel.com-20060929170751-15b398c539e26d21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 18:37:30 +0100
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
revno: 2052.1.2.1.1
revision-id: john at arbash-meinel.com-20060929170751-15b398c539e26d21
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:07:51 -0500
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
revno: 2052.3.1
revision-id: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: test_on_vfat.win32.fix
timestamp: Fri 2006-09-29 14:15:51 +0300
message:
test_on_vfat win32 fix: use binary line-endings
------------------------------------------------------------
revno: 2052.1.2
revision-id: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 17:34:45 +0100
message:
Implement BzrDir.destroy_tree and destroy_tree_metadata
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.37
revision-id: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-29 09:09:33 -0400
message:
Cleaner implementation of destroy_working_tree
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.36
revision-id: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
parent: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:27:36 -0400
message:
Introduce BzrDir.destroy_workingtree
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.35
revision-id: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:25:21 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 2052.1.1
revision-id: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 16:31:52 +0100
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
revno: 2052.2.1
revision-id: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 09:10:56 -0500
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
revno: 2049.1.1
revision-id: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.win32-selftest
timestamp: Thu 2006-09-28 12:31:13 +0200
message:
Windows-speficic smart server transport selftest fixes.
Diff too large for email (115239 lines, the limit is 1000).
More information about the bazaar-commits
mailing list