Rev 3285: [merge] bzr.dev 3298, clean up NEWS conflicts. in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/uncommit_local
John Arbash Meinel
john at arbash-meinel.com
Thu Mar 20 16:27:13 GMT 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/uncommit_local
------------------------------------------------------------
revno: 3285
revision-id: john at arbash-meinel.com-20080320162432-whjl8nhp3b5q0dj0
parent: john at arbash-meinel.com-20080320151005-z9lajjy69m20of17
parent: pqm at pqm.ubuntu.com-20080320074642-46bf1vcpyubnaptz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: uncommit_local
timestamp: Thu 2008-03-20 11:24:32 -0500
message:
[merge] bzr.dev 3298, clean up NEWS conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3280.1.18
revision-id: pqm at pqm.ubuntu.com-20080320074642-46bf1vcpyubnaptz
parent: pqm at pqm.ubuntu.com-20080319032243-u1uwskj36dp0i0hs
parent: aaron at aaronbentley.com-20080319193935-ni2v13574apz1yl5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-03-20 07:46:42 +0000
message:
Speed up merge by avoiding unnecessary file-existence checks
(abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 1551.19.30
revision-id: aaron at aaronbentley.com-20080319193935-ni2v13574apz1yl5
parent: aaron at aaronbentley.com-20080319193653-djj4vkouc8fc0k7m
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2008-03-19 15:39:35 -0400
message:
Accelerate merge by skipping file existence check when merging execute bit
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 1551.19.29
revision-id: aaron at aaronbentley.com-20080319193653-djj4vkouc8fc0k7m
parent: aaron at aaronbentley.com-20080319182625-au9v7jmj6i8yfi96
parent: pqm at pqm.ubuntu.com-20080319032243-u1uwskj36dp0i0hs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2008-03-19 15:36:53 -0400
message:
Merge with bzr.dev
added:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 1551.19.28
revision-id: aaron at aaronbentley.com-20080319182625-au9v7jmj6i8yfi96
parent: aaron at aaronbentley.com-20080116041003-8dxixv8mdqy0v8vd
parent: pqm at pqm.ubuntu.com-20080312073810-r3a7ot93mw7hmk1m
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2008-03-19 14:26:25 -0400
message:
Merge with bzr.dev
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
index.txt index.txt-20071121073725-0corxykv5irjal00-1
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
doc/en/user-guide/revnos.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
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/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-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/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
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_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3280.1.17
revision-id: pqm at pqm.ubuntu.com-20080319032243-u1uwskj36dp0i0hs
parent: pqm at pqm.ubuntu.com-20080318200038-jo7mqokvib9aojt9
parent: mbp at sourcefrog.net-20080319014343-uftcx516win6wqds
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-03-19 03:22:43 +0000
message:
(mbp)(trivial) Better formatting of python version number
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
------------------------------------------------------------
revno: 3280.11.2
revision-id: mbp at sourcefrog.net-20080319014343-uftcx516win6wqds
parent: mbp at sourcefrog.net-20080319014018-ihd39j2o886xmp15
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2008-03-19 12:43:43 +1100
message:
Fix formatting of other occurrences of Python version
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3280.11.1
revision-id: mbp at sourcefrog.net-20080319014018-ihd39j2o886xmp15
parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2008-03-19 12:40:18 +1100
message:
Better formatting of python version in --version
modified:
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
------------------------------------------------------------
revno: 3280.1.16
revision-id: pqm at pqm.ubuntu.com-20080318200038-jo7mqokvib9aojt9
parent: pqm at pqm.ubuntu.com-20080318091102-7qlikly0ytens0we
parent: bialix at ukr.net-20080318174156-b36d5894ia6q4xvr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 20:00:38 +0000
message:
(James Westby) Strip "bzr_" from the start of the suggested plugin
name.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3280.10.2
revision-id: bialix at ukr.net-20080318174156-b36d5894ia6q4xvr
parent: jw+debian at jameswestby.net-20080317131032-8meoti7nsremfjn3
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr.dev.plugins
timestamp: Tue 2008-03-18 19:41:56 +0200
message:
fix markup in NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.10.1
revision-id: jw+debian at jameswestby.net-20080317131032-8meoti7nsremfjn3
parent: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.plugins
timestamp: Mon 2008-03-17 13:10:32 +0000
message:
Strip "bzr_" from the start of the suggested plugin name.
When bzr tries to load a plugin from a path that isn't a valid python
module name it will suggest the user renames it to one that is.
A bzr- prefix is often not wanted, and may be a common error, so
suggest stripping it.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3280.1.15
revision-id: pqm at pqm.ubuntu.com-20080318091102-7qlikly0ytens0we
parent: pqm at pqm.ubuntu.com-20080318073347-z2ccntuesfa0c6ii
parent: bialix at ukr.net-20080318064818-3nwkj2jrf28bsive
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 09:11:02 +0000
message:
(bialix) Don't ask for a password if there is no real terminal. (re
#60851)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3260.2.3
revision-id: bialix at ukr.net-20080318064818-3nwkj2jrf28bsive
parent: bialix at ukr.net-20080317221652-gwq1ohxini63zhum
parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: stdin.isatty
timestamp: Tue 2008-03-18 08:48:18 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3260.2.2
revision-id: bialix at ukr.net-20080317221652-gwq1ohxini63zhum
parent: bialix at ukr.net-20080311221516-pmu5dnoehqujl1u8
parent: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: stdin.isatty
timestamp: Tue 2008-03-18 00:16:52 +0200
message:
merge bzr.dev
added:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3260.2.1
revision-id: bialix at ukr.net-20080311221516-pmu5dnoehqujl1u8
parent: pqm at pqm.ubuntu.com-20080310202441-q09492ma24sdzp51
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: stdin.isatty
timestamp: Wed 2008-03-12 00:15:16 +0200
message:
Don't ask a password if there is no real terminal. (#69851)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3280.1.14
revision-id: pqm at pqm.ubuntu.com-20080318073347-z2ccntuesfa0c6ii
parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
parent: mbp at sourcefrog.net-20080318055606-vwqdud0sxpgppybi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 07:33:47 +0000
message:
(mbp)(trivial) add 1.4 deprecation symbol
modified:
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3280.9.1
revision-id: mbp at sourcefrog.net-20080318055606-vwqdud0sxpgppybi
parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2008-03-18 16:56:06 +1100
message:
Add one_four deprecation
modified:
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3280.1.13
revision-id: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
parent: pqm at pqm.ubuntu.com-20080318011718-41sghr89tjcdpzc7
parent: bialix at ukr.net-20080317215847-m36yrjhb004kgi65
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 02:49:45 +0000
message:
(Lukas Lalinsky) Make 'mv a b' work for already renamed directories,
like it does for files. (#107967)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3249.4.2
revision-id: bialix at ukr.net-20080317215847-m36yrjhb004kgi65
parent: bialix at ukr.net-20080305130932-3mlfwj7bqrlitxoc
parent: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mv.dir.after
timestamp: Mon 2008-03-17 23:58:47 +0200
message:
merge bzr.dev
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3249.4.1
revision-id: bialix at ukr.net-20080305130932-3mlfwj7bqrlitxoc
parent: pqm at pqm.ubuntu.com-20080304003709-35vh1eqa8tuuq548
parent: lalinsky at gmail.com-20080127111412-qdcn8kkknzvn5l5t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mv.dir.after
timestamp: Wed 2008-03-05 15:09:32 +0200
message:
merge Lukas' patch and update it with case-insensitive rename check.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3201.2.1
revision-id: lalinsky at gmail.com-20080127111412-qdcn8kkknzvn5l5t
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: dir-mv
timestamp: Sun 2008-01-27 12:14:12 +0100
message:
Make 'mv a b' work for already renamed directories, like it does for files
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3280.1.12
revision-id: pqm at pqm.ubuntu.com-20080318011718-41sghr89tjcdpzc7
parent: pqm at pqm.ubuntu.com-20080317214818-thbkv3yfh00rj2g2
parent: mbp at sourcefrog.net-20080317044106-guta6lhn5ns9ursj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 01:17:18 +0000
message:
(mbp) Tests should not call or reimplement reduceLockdirTimeout when it's done in a base class
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
------------------------------------------------------------
revno: 3280.8.4
revision-id: mbp at sourcefrog.net-20080317044106-guta6lhn5ns9ursj
parent: mbp at sourcefrog.net-20080317043859-5sty12s95qmnjuv1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Mon 2008-03-17 15:41:06 +1100
message:
Remove one more reduceLockdirTimeout call
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3280.8.3
revision-id: mbp at sourcefrog.net-20080317043859-5sty12s95qmnjuv1
parent: mbp at sourcefrog.net-20080317043134-ok36j0eu4g4iazhx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Mon 2008-03-17 15:38:59 +1100
message:
Remove redundant reduceLockdirTimeout calls
modified:
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
------------------------------------------------------------
revno: 3280.8.2
revision-id: mbp at sourcefrog.net-20080317043134-ok36j0eu4g4iazhx
parent: mbp at sourcefrog.net-20080317041021-ph3wr90ogt411ag4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Mon 2008-03-17 15:31:34 +1100
message:
Change more tests to use reduceLockdirTimeout
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
------------------------------------------------------------
revno: 3280.8.1
revision-id: mbp at sourcefrog.net-20080317041021-ph3wr90ogt411ag4
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Mon 2008-03-17 15:10:21 +1100
message:
test_safe_master_lock should use reduceLockdirTimeout, not reimplement it
modified:
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
------------------------------------------------------------
revno: 3280.1.11
revision-id: pqm at pqm.ubuntu.com-20080317214818-thbkv3yfh00rj2g2
parent: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
parent: andrew.bennetts at canonical.com-20080317195319-jbcy9qhifps49smo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-17 21:48:18 +0000
message:
(andrew) Greatly reduce the number of recv calls made when using
urllib by forcing it to use a buffered file object.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3280.7.3
revision-id: andrew.bennetts at canonical.com-20080317195319-jbcy9qhifps49smo
parent: andrew.bennetts at canonical.com-20080317171649-n5kszez1vltj8rr1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: urllib-recv-1-hack
timestamp: Mon 2008-03-17 14:53:19 -0500
message:
A slightly neater hack for forcing buffering, thanks to John.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3280.7.2
revision-id: andrew.bennetts at canonical.com-20080317171649-n5kszez1vltj8rr1
parent: andrew.bennetts at canonical.com-20080316195309-jw6xcslc0goezghu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: urllib-recv-1-hack
timestamp: Mon 2008-03-17 12:16:49 -0500
message:
Buffer 64k, rather than just 8k.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3280.7.1
revision-id: andrew.bennetts at canonical.com-20080316195309-jw6xcslc0goezghu
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: urllib-recv-1-hack
timestamp: Sun 2008-03-16 14:53:09 -0500
message:
A hack to make urllib not call recv(1) lots and lots.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3280.1.10
revision-id: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
parent: pqm at pqm.ubuntu.com-20080317032118-1731brhtravarpa7
parent: mbp at sourcefrog.net-20080317022635-lhx25w7y9s7l16vq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-17 05:40:03 +0000
message:
Don't force gc.collect when exiting bzr script
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 3280.6.1
revision-id: mbp at sourcefrog.net-20080317022635-lhx25w7y9s7l16vq
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2008-03-17 13:26:35 +1100
message:
Don't force gc.collect when exiting bzr script
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 3280.1.9
revision-id: pqm at pqm.ubuntu.com-20080317032118-1731brhtravarpa7
parent: pqm at pqm.ubuntu.com-20080317014832-s8bbb26w0qnrklcp
parent: mbp at sourcefrog.net-20080316230200-inw4wrjt6qlx76f2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-17 03:21:18 +0000
message:
post-1.3 fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.5.2
revision-id: mbp at sourcefrog.net-20080316230200-inw4wrjt6qlx76f2
parent: mbp at sourcefrog.net-20080316230049-1ewc4zcs0rhmhfau
author: Matt Nordhoff
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Mon 2008-03-17 10:02:00 +1100
message:
Fix NEWS typo
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.5.1
revision-id: mbp at sourcefrog.net-20080316230049-1ewc4zcs0rhmhfau
parent: mbp at sourcefrog.net-20080316093156-kdb1p636vt0sb2pt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Mon 2008-03-17 10:00:49 +1100
message:
Backup directory name is a user-affecting change (Matt Nordhoff)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.1.8
revision-id: pqm at pqm.ubuntu.com-20080317014832-s8bbb26w0qnrklcp
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
parent: andrew.bennetts at canonical.com-20080316235502-fhzxpz00roqpcovl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-17 01:48:32 +0000
message:
(Andrew Bennetts) Remove duplicated NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.4.1
revision-id: andrew.bennetts at canonical.com-20080316235502-fhzxpz00roqpcovl
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: NEWS-nit
timestamp: Sun 2008-03-16 18:55:02 -0500
message:
Remove duplicated NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3280.1.7
revision-id: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
parent: pqm at pqm.ubuntu.com-20080316140120-i3yq8yr1l66m11h7
parent: mnordhoff at mattnordhoff.com-20080316110830-ap9scz4l4r2ispgd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2008-03-16 16:58:03 +0000
message:
(Matt Nordhoff) Trivial NEWS typo fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3224.3.1
revision-id: mnordhoff at mattnordhoff.com-20080316110830-ap9scz4l4r2ispgd
parent: john at arbash-meinel.com-20080306094324-pekgxn1pup9oq23g
committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
branch nick: news-typo
timestamp: Sun 2008-03-16 11:08:30 +0000
message:
Fix trivial typo in NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-03-16 10:47:37 +0000
+++ b/NEWS 2008-03-20 16:24:32 +0000
@@ -12,16 +12,37 @@
CHANGES:
+ * When a plugin cannot be loaded as the file path is not a valid
+ python module name bzr will now strip a ``bzr_`` prefix from the
+ front of the suggested name, as many plugins (e.g. bzr-svn)
+ want to be installed without this prefix. It is a common mistake
+ to have a folder named "bzr-svn" for that plugin, especially
+ as this is what bzr branch lp:bzr-svn will give you. (James Westby,
+ Andrew Cowie)
+
FEATURES:
IMPROVEMENTS:
+ * Fetching data over HTTP is a bit faster when urllib is used. This is done
+ by forcing it to recv 64k at a time when reading lines in HTTP headers,
+ rather than just 1 byte at a time. (Andrew Bennetts)
+
+ * Merge is faster. We no longer check a file's existence unnecessarily
+ when merging the execute bit. (Aaron Bentley)
+
BUGFIXES:
+ * ``bzr mv a b`` can be now used also to rename previously renamed
+ directories, not only files. (Luk???? Lalinsk??, #107967)
+
* ``bzr uncommit --local`` can now remove revisions from the local
branch to be symmetric with ``bzr commit --local``.
(John Arbash Meinel, #93412)
+ * Don't ask for a password if there is no real terminal.
+ (Alexander Belchenko, #69851)
+
DOCUMENTATION:
API BREAKS:
@@ -42,7 +63,8 @@
NOTES WHEN UPGRADING:
- No special action is required from the user for this release.
+ * The backup directory created by ``upgrade`` is now called
+ ``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
CHANGES:
@@ -69,9 +91,6 @@
* Version number is now shown as "1.2" or "1.2pr2", without zeroed or
missing final fields. (Martin Pool)
- * The backup directory created by ``upgrade`` is now called
- ``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
-
FEATURES:
* ``branch`` and ``checkout`` can hard-link working tree files, which is
@@ -113,7 +132,7 @@
performance and memory consumption for file with a lot of merges.
Also, correctly handle when a line is introduced by both parents (it
should be attributed to the first merge which notices this, and not
- too all subsequent merges.) (John Arbash Meinel)
+ to all subsequent merges.) (John Arbash Meinel)
BUGFIXES:
@@ -183,10 +202,6 @@
``Repository.get_revision_graph()`` except it includes ghosts and you can
stop part-way through. (John Arbash Meinel)
- * ``Graph.iter_ancestry`` returns the ancestry of revision ids. Similar to
- ``Repository.get_revision_graph()`` except it includes ghosts and you can
- stop part-way through. (John Arbash Meinel)
-
* New module ``tools/package_mf.py`` provide custom module finder for
python packages (improves standard python library's modulefinder.py)
used by ``setup.py`` script while building standalone bzr.exe.
=== modified file 'bzr'
--- a/bzr 2008-03-16 14:01:20 +0000
+++ b/bzr 2008-03-17 02:26:35 +0000
@@ -127,7 +127,6 @@
if bzrlib.trace._trace_file:
# this is also _bzr_log
bzrlib.trace._trace_file.flush()
- import gc; gc.collect()
os._exit(exit_val)
else:
pass # should this give an error? - it can't be used as a lib
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-03-16 10:44:11 +0000
+++ b/bzrlib/builtins.py 2008-03-20 16:24:32 +0000
@@ -534,13 +534,31 @@
if len(names_list) < 2:
raise errors.BzrCommandError("missing file argument")
tree, rel_names = tree_files(names_list)
+ tree.lock_write()
+ try:
+ self._run(tree, names_list, rel_names, after)
+ finally:
+ tree.unlock()
- dest = names_list[-1]
- isdir = os.path.isdir(dest)
- if (isdir and not tree.case_sensitive and len(rel_names) == 2
- and rel_names[0].lower() == rel_names[1].lower()):
- isdir = False
- if isdir:
+ def _run(self, tree, names_list, rel_names, after):
+ into_existing = osutils.isdir(names_list[-1])
+ if into_existing and len(names_list) == 2:
+ # special cases:
+ # a. case-insensitive filesystem and change case of dir
+ # b. move directory after the fact (if the source used to be
+ # a directory, but now doesn't exist in the working tree
+ # and the target is an existing directory, just rename it)
+ if (not tree.case_sensitive
+ and rel_names[0].lower() == rel_names[1].lower()):
+ into_existing = False
+ else:
+ inv = tree.inventory
+ from_id = tree.path2id(rel_names[0])
+ if (not osutils.lexists(names_list[0]) and
+ from_id and inv.get_file_kind(from_id) == "directory"):
+ into_existing = False
+ # move/rename
+ if into_existing:
# move into existing directory
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
self.outf.write("%s => %s\n" % pair)
@@ -2648,7 +2666,7 @@
print ' %s (%s python%s)' % (
bzrlib.__path__[0],
bzrlib.version_string,
- '.'.join(map(str, sys.version_info)),
+ bzrlib._format_version_tuple(sys.version_info),
)
print
if testspecs_list is not None:
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-03-12 05:59:01 +0000
+++ b/bzrlib/errors.py 2008-03-17 22:16:52 +0000
@@ -2582,6 +2582,11 @@
self.timezone = timezone
+class NotATerminal(BzrError):
+
+ _fmt = 'Unable to ask for a password without real terminal.'
+
+
class UnableEncodePath(BzrError):
_fmt = ('Unable to encode %(kind)s path %(path)r in '
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2008-03-14 16:23:28 +0000
+++ b/bzrlib/merge.py 2008-03-19 19:39:35 +0000
@@ -950,12 +950,6 @@
base_executable, other_executable, this_executable = executable
if file_status == "deleted":
return
- trans_id = self.tt.trans_id_file_id(file_id)
- try:
- if self.tt.final_kind(trans_id) != "file":
- return
- except NoSuchFile:
- return
winner = self._three_way(*executable)
if winner == "conflict":
# There must be a None in here, if we have a conflict, but we
@@ -964,12 +958,16 @@
winner = "this"
else:
winner = "other"
+ if winner == 'this' and file_status != "modified":
+ return
+ trans_id = self.tt.trans_id_file_id(file_id)
+ try:
+ if self.tt.final_kind(trans_id) != "file":
+ return
+ except NoSuchFile:
+ return
if winner == "this":
- if file_status == "modified":
- executability = this_executable
- if executability is not None:
- trans_id = self.tt.trans_id_file_id(file_id)
- self.tt.set_executability(executability, trans_id)
+ executability = this_executable
else:
assert winner == "other"
if file_id in self.other_tree:
@@ -978,9 +976,9 @@
executability = this_executable
elif file_id in self.base_tree:
executability = base_executable
- if executability is not None:
- trans_id = self.tt.trans_id_file_id(file_id)
- self.tt.set_executability(executability, trans_id)
+ if executability is not None:
+ trans_id = self.tt.trans_id_file_id(file_id)
+ self.tt.set_executability(executability, trans_id)
def cook_conflicts(self, fs_conflicts):
"""Convert all conflicts into a form that doesn't depend on trans_id"""
=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py 2008-02-20 10:36:15 +0000
+++ b/bzrlib/plugin.py 2008-03-17 13:10:32 +0000
@@ -199,9 +199,11 @@
## import pdb; pdb.set_trace()
if re.search('\.|-| ', name):
sanitised_name = re.sub('[-. ]', '_', name)
- warning("Unable to load %r in %r as a plugin because file path"
- " isn't a valid module name; try renaming it to %r."
- % (name, d, sanitised_name))
+ if sanitised_name.startswith('bzr_'):
+ sanitised_name = sanitised_name[len('bzr_'):]
+ warning("Unable to load %r in %r as a plugin because the "
+ "file path isn't a valid module name; try renaming "
+ "it to %r." % (name, d, sanitised_name))
else:
warning('Unable to load plugin %r from %r' % (name, d))
log_exception_quietly()
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2008-02-13 03:25:53 +0000
+++ b/bzrlib/symbol_versioning.py 2008-03-18 05:56:06 +0000
@@ -71,6 +71,7 @@
one_one = "%s was deprecated in version 1.1."
one_two = "%s was deprecated in version 1.2."
one_three = "%s was deprecated in version 1.3."
+one_four = "%s was deprecated in version 1.4."
def set_warning_method(method):
"""Set the warning method to be used by this module.
=== modified file 'bzrlib/tests/blackbox/test_mv.py'
--- a/bzrlib/tests/blackbox/test_mv.py 2008-03-03 23:04:47 +0000
+++ b/bzrlib/tests/blackbox/test_mv.py 2008-03-05 13:09:32 +0000
@@ -407,3 +407,26 @@
self.failUnlessExists('sub/a2')
self.assertInWorkingTree('sub/a1')
self.assertInWorkingTree('sub/a2')
+
+ def test_mv_already_moved_directory(self):
+ """Use `bzr mv a b` to mark a directory as renamed.
+
+ https://bugs.launchpad.net/bzr/+bug/107967/
+ """
+ self.build_tree(['a/', 'c/'])
+ tree = self.make_branch_and_tree('.')
+ tree.add(['a', 'c'])
+ osutils.rename('a', 'b')
+ osutils.rename('c', 'd')
+ # mv a b should work just like it does for already renamed files
+ self.run_bzr('mv a b')
+ self.failIfExists('a')
+ self.assertNotInWorkingTree('a')
+ self.failUnlessExists('b')
+ self.assertInWorkingTree('b')
+ # and --after should work, too (technically it's ignored)
+ self.run_bzr('mv --after c d')
+ self.failIfExists('c')
+ self.assertNotInWorkingTree('c')
+ self.failUnlessExists('d')
+ self.assertInWorkingTree('d')
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2007-12-19 13:20:40 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2008-03-17 04:41:06 +0000
@@ -1582,12 +1582,7 @@
# its still held by the explicit lock we took, and the break
# lock should not have touched it.
repo = thisdir.open_repository()
- orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
- try:
- lockdir._DEFAULT_TIMEOUT_SECONDS = 1
- self.assertRaises(errors.LockContention, repo.lock_write)
- finally:
- lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
+ self.assertRaises(errors.LockContention, repo.lock_write)
finally:
unused_repo.unlock()
self.assertRaises(errors.LockBroken, master.unlock)
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py 2007-12-21 06:34:27 +0000
+++ b/bzrlib/tests/test_commit.py 2008-03-17 04:38:59 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005, 2006, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -444,14 +444,10 @@
bound = master.sprout('bound')
wt = bound.open_workingtree()
wt.branch.set_bound_location(os.path.realpath('master'))
-
- orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
master_branch.lock_write()
try:
- lockdir._DEFAULT_TIMEOUT_SECONDS = 1
self.assertRaises(LockContention, wt.commit, 'silly')
finally:
- lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
master_branch.unlock()
def test_commit_bound_merge(self):
=== modified file 'bzrlib/tests/test_plugins.py'
--- a/bzrlib/tests/test_plugins.py 2008-02-20 10:36:15 +0000
+++ b/bzrlib/tests/test_plugins.py 2008-03-17 13:10:32 +0000
@@ -191,7 +191,7 @@
def test_plugin_with_bad_name_does_not_load(self):
# Create badly-named plugin
- file('bad plugin-name..py', 'w').close()
+ file('bzr-bad plugin-name..py', 'w').close()
# Capture output
stream = StringIO()
@@ -207,9 +207,9 @@
log.removeHandler(handler)
self.assertContainsRe(stream.getvalue(),
- r"Unable to load 'bad plugin-name\.' in '\.' as a plugin because"
- " file path isn't a valid module name; try renaming it to"
- " 'bad_plugin_name_'\.")
+ r"Unable to load 'bzr-bad plugin-name\.' in '\.' as a plugin "
+ "because the file path isn't a valid module name; try renaming "
+ "it to 'bad_plugin_name_'\.")
stream.close()
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2008-02-12 04:52:18 +0000
+++ b/bzrlib/tests/test_smart.py 2008-03-17 04:38:59 +0000
@@ -424,7 +424,6 @@
def setUp(self):
tests.TestCaseWithTransport.setUp(self)
- self.reduceLockdirTimeout()
def test_lock_write_on_unlocked_branch(self):
backing = self.get_transport()
@@ -508,7 +507,6 @@
def setUp(self):
tests.TestCaseWithTransport.setUp(self)
- self.reduceLockdirTimeout()
def test_unlock_on_locked_branch_and_repo(self):
backing = self.get_transport()
@@ -752,7 +750,6 @@
def setUp(self):
tests.TestCaseWithTransport.setUp(self)
- self.reduceLockdirTimeout()
def test_lock_write_on_unlocked_repo(self):
backing = self.get_transport()
@@ -790,7 +787,6 @@
def setUp(self):
tests.TestCaseWithTransport.setUp(self)
- self.reduceLockdirTimeout()
def test_unlock_on_locked_repo(self):
backing = self.get_transport()
=== modified file 'bzrlib/tests/workingtree_implementations/test_locking.py'
--- a/bzrlib/tests/workingtree_implementations/test_locking.py 2006-10-13 07:39:25 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_locking.py 2008-03-17 04:38:59 +0000
@@ -228,13 +228,7 @@
branch_copy.lock_write()
try:
try:
- orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
- try:
- lockdir._DEFAULT_TIMEOUT_SECONDS = 1
- self.assertRaises(errors.LockError, wt.lock_write)
- finally:
- lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
-
+ self.assertRaises(errors.LockError, wt.lock_write)
self.assertFalse(wt.is_locked())
self.assertFalse(wt.branch.is_locked())
finally:
=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py 2008-02-16 10:03:17 +0000
+++ b/bzrlib/trace.py 2008-03-19 01:43:43 +0000
@@ -437,7 +437,7 @@
err_file.write('\n')
err_file.write('bzr %s on python %s (%s)\n' % \
(bzrlib.__version__,
- '.'.join(map(str, sys.version_info)),
+ bzrlib._format_version_tuple(sys.version_info),
sys.platform))
err_file.write('arguments: %r\n' % sys.argv)
err_file.write(
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2008-01-03 16:26:32 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2008-03-17 19:53:19 +0000
@@ -64,6 +64,18 @@
)
+class _BufferedMakefileSocket(object):
+
+ def __init__(self, sock):
+ self.sock = sock
+
+ def makefile(self, mode='r', bufsize=-1):
+ return self.sock.makefile(mode, 65536)
+
+ def __getattr__(self, name):
+ return getattr(self.sock, name)
+
+
# We define our own Response class to keep our httplib pipe clean
class Response(httplib.HTTPResponse):
"""Custom HTTPResponse, to avoid the need to decorate.
@@ -81,6 +93,14 @@
# 8k chunks should be fine.
_discarded_buf_size = 8192
+ def __init__(self, sock, *args, **kwargs):
+ # httplib creates a fileobject that doesn't do buffering, which
+ # makes fp.readline() very expensive because it only reads one byte
+ # at a time. So we wrap the socket in an object that forces
+ # sock.makefile to make a buffered file.
+ sock = _BufferedMakefileSocket(sock)
+ httplib.HTTPResponse.__init__(self, sock, *args, **kwargs)
+
def begin(self):
"""Begin to read the response from the server.
@@ -534,7 +554,7 @@
req = request
r = response
r.recv = r.read
- fp = socket._fileobject(r)
+ fp = socket._fileobject(r, bufsize=65536)
resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
resp.code = r.status
resp.msg = r.reason
=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py 2007-08-15 04:33:34 +0000
+++ b/bzrlib/ui/__init__.py 2008-03-11 22:15:16 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
"""UI abstraction.
This tells the library how to display things to the user. Through this
@@ -35,6 +33,7 @@
import getpass
from bzrlib import (
+ errors,
osutils,
progress,
trace,
@@ -125,6 +124,8 @@
return False
def get_non_echoed_password(self, prompt):
+ if not sys.stdin.isatty():
+ raise errors.NotATerminal()
encoding = osutils.get_terminal_encoding()
return getpass.getpass(prompt.encode(encoding, 'replace'))
=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py 2007-10-16 17:37:43 +0000
+++ b/bzrlib/version.py 2008-03-19 01:40:18 +0000
@@ -57,7 +57,7 @@
python_dll = "python%d%d.dll" % sys.version_info[:2]
to_file.write(os.path.join(basedir, python_dll) + ' ')
# and now version of python interpreter
- to_file.write('.'.join(map(str, sys.version_info)))
+ to_file.write(bzrlib._format_version_tuple(sys.version_info))
to_file.write('\n')
to_file.write(" Python standard library:" + ' ')
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2008-03-07 14:15:10 +0000
+++ b/bzrlib/workingtree_4.py 2008-03-17 21:58:47 +0000
@@ -662,8 +662,8 @@
if self._inventory is not None:
update_inventory = True
inv = self.inventory
+ to_dir_id = to_entry[0][2]
to_dir_ie = inv[to_dir_id]
- to_dir_id = to_entry[0][2]
else:
update_inventory = False
More information about the bazaar-commits
mailing list